seade 2004/08/23 19:05:04 Modified: xdocs changes.xml src/java/org/apache/torque/adapter DBHypersonicSQL.java src/generator/src/templates/sql/base/hypersonic primarykey.vm foreignkey.vm Log: HSQL adapter enhancements/fixes: added support for case-insensitive queries, added support for cascading deletes, correction to the generated CREATE TABLE DDL when using IDENTITY columns. Thanks to Partick Carl for the patch. Revision Changes Path 1.133 +8 -0 db-torque/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- changes.xml 23 Aug 2004 11:54:21 -0000 1.132 +++ changes.xml 24 Aug 2004 02:05:03 -0000 1.133 @@ -9,6 +9,14 @@ <body> <release version="3.2-alpha" date="in CVS"> + <action dev='seade' type='add'> + HSQL adapter enhancements: added support for case-insensitive queries + and cascading deletes. Thanks to Partick Carl for the patch. + </action> + <action dev='seade' type='fix'> + HSQL adapter fix: correction to the generated CREATE TABLE DDL when + using IDENTITY columns. Thanks to Partick Carl for the patch. + </action> <action dev='seade' type='fix'> TRQS185: Corrected handling of BIT with PostgreSQL. Note that the solution implemented has been tested under MySLQ and PostgreSQL only. 1.10 +4 -3 db-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java Index: DBHypersonicSQL.java =================================================================== RCS file: /home/cvs/db-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DBHypersonicSQL.java 22 Feb 2004 06:19:07 -0000 1.9 +++ DBHypersonicSQL.java 24 Aug 2004 02:05:04 -0000 1.10 @@ -45,7 +45,8 @@ */ public String toUpperCase(String in) { - return in; + String s = new StringBuffer("UPPER(").append(in).append(")").toString(); + return s; } /** @@ -56,7 +57,7 @@ */ public String ignoreCase(String in) { - return in; + return toUpperCase(in); } /** 1.2 +1 -1 db-torque/src/generator/src/templates/sql/base/hypersonic/primarykey.vm Index: primarykey.vm =================================================================== RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/hypersonic/primarykey.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- primarykey.vm 10 Feb 2003 13:18:48 -0000 1.1 +++ primarykey.vm 24 Aug 2004 02:05:04 -0000 1.2 @@ -1,3 +1,3 @@ -#if ($table.hasPrimaryKey()) +#if ($table.hasPrimaryKey() && $table.IdMethod != "native") PRIMARY KEY($table.printPrimaryKey()), #end 1.2 +5 -1 db-torque/src/generator/src/templates/sql/base/hypersonic/foreignkey.vm Index: foreignkey.vm =================================================================== RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/hypersonic/foreignkey.vm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- foreignkey.vm 10 Feb 2003 13:18:48 -0000 1.1 +++ foreignkey.vm 24 Aug 2004 02:05:04 -0000 1.2 @@ -1,5 +1,9 @@ #foreach ($fk in $table.ForeignKeys) ALTER TABLE $table.Name ADD CONSTRAINT $fk.Name FOREIGN KEY ($fk.LocalColumnNames) - REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames); + REFERENCES $fk.ForeignTableName ($fk.ForeignColumnNames) +#if ($fk.hasOnDelete()) +ON DELETE $fk.OnDelete +#end +; #end
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]