seade 2004/08/23 19:00:57
Modified: src/generator/src/templates/sql/base/hypersonic Tag:
TORQUE_3_1_BRANCH primarykey.vm foreignkey.vm
src/java/org/apache/torque/adapter Tag: TORQUE_3_1_BRANCH
DBHypersonicSQL.java
xdocs Tag: TORQUE_3_1_BRANCH release-changes.xml
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
No revision
No revision
1.1.2.1 +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.1.2.1
diff -u -r1.1 -r1.1.2.1
--- primarykey.vm 10 Feb 2003 13:18:48 -0000 1.1
+++ primarykey.vm 24 Aug 2004 02:00:56 -0000 1.1.2.1
@@ -1,3 +1,3 @@
-#if ($table.hasPrimaryKey())
+#if ($table.hasPrimaryKey() && $table.IdMethod != "native")
PRIMARY KEY($table.printPrimaryKey()),
#end
1.1.2.1 +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.1.2.1
diff -u -r1.1 -r1.1.2.1
--- foreignkey.vm 10 Feb 2003 13:18:48 -0000 1.1
+++ foreignkey.vm 24 Aug 2004 02:00:56 -0000 1.1.2.1
@@ -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
No revision
No revision
1.8.4.3 +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.8.4.2
retrieving revision 1.8.4.3
diff -u -r1.8.4.2 -r1.8.4.3
--- DBHypersonicSQL.java 20 May 2004 04:35:15 -0000 1.8.4.2
+++ DBHypersonicSQL.java 24 Aug 2004 02:00:56 -0000 1.8.4.3
@@ -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);
}
/**
No revision
No revision
1.3.2.17 +6 -0 db-torque/xdocs/release-changes.xml
Index: release-changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/release-changes.xml,v
retrieving revision 1.3.2.16
retrieving revision 1.3.2.17
diff -u -r1.3.2.16 -r1.3.2.17
--- release-changes.xml 23 Aug 2004 11:54:10 -0000 1.3.2.16
+++ release-changes.xml 24 Aug 2004 02:00:56 -0000 1.3.2.17
@@ -18,6 +18,12 @@
<p>
<ul>
<li>
+ 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.
+ </li>
+ <li>
The <code>adapter</code> property is now used in preference to
<code>driver</code> when building the database map. This allows Torque
to work when the driver setting is not what it expects - e.g. if using
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
