You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2003/06/29 16:30:03 UTC
cvs commit: db-torque/src/rttest test-schema.xml
mpoeschl 2003/06/29 07:30:03
Modified: src/generator/src/templates/sql/base/hypersonic table.vm
xdocs changes.xml
profile hsqldb.profile
src/rttest test-schema.xml
Log:
TRQS159: Invalid syntaxes for Hypersonic when using indexes.
Revision Changes Path
1.2 +2 -2 db-torque/src/generator/src/templates/sql/base/hypersonic/table.vm
Index: table.vm
===================================================================
RCS file: /home/cvs/db-torque/src/generator/src/templates/sql/base/hypersonic/table.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table.vm 10 Feb 2003 13:18:48 -0000 1.1
+++ table.vm 29 Jun 2003 14:30:02 -0000 1.2
@@ -10,8 +10,8 @@
##set ( $fk = $generator.parse("$basepath/foreignkey.vm", "", "table", $tbl) )
#set ( $unique = $generator.parse("$basepath/unique.vm", "", "table", $tbl) )
#set ( $index = $generator.parse("$basepath/index.vm", "", "table", $tbl) )
-#if($strings.allEmpty([$pk,$fk,$unique,$index]))$strings.chop($cols,2)#else$cols#end
-#if($strings.allEmpty([$fk,$unique,$index]) && $pk.length()>0)$strings.chop($pk,2)#else$pk#end
+#if($strings.allEmpty([$pk,$fk,$unique]))$strings.chop($cols,2)#else$cols#end
+#if($strings.allEmpty([$fk,$unique]) && $pk.length()>0)$strings.chop($pk,2)#else$pk#end
##if($strings.allEmpty([$unique,$index]) && $fk.length() >0)$strings.chop($fk,2)#else$fk#end
#if($unique.length()>0)$strings.chop($unique,2)#else$unique#end
1.92 +3 -0 db-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- changes.xml 29 Jun 2003 13:40:23 -0000 1.91
+++ changes.xml 29 Jun 2003 14:30:02 -0000 1.92
@@ -74,6 +74,9 @@
without offset and limit.
</li>
<li>
+ TRQS159: Invalid syntaxes for Hypersonic when using indexes.
+ </li>
+ <li>
TRQS165: columns in an external schema caused Manager imports to be
generated
</li>
1.8 +1 -1 db-torque/profile/hsqldb.profile
Index: hsqldb.profile
===================================================================
RCS file: /home/cvs/db-torque/profile/hsqldb.profile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hsqldb.profile 8 Jan 2003 16:43:54 -0000 1.7
+++ hsqldb.profile 29 Jun 2003 14:30:03 -0000 1.8
@@ -1,7 +1,7 @@
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
-torque.testDatabaseJar = ${maven.home}/repository/hsqldb/jars/hsqldb.jar
+torque.testDatabaseJar = ${maven.home}/repository/hsqldb/jars/hsqldb-1.7.1.jar
torque.idMethod = idbroker
torque.defaultDatabase = bookstore
1.14 +12 -0 db-torque/src/rttest/test-schema.xml
Index: test-schema.xml
===================================================================
RCS file: /home/cvs/db-torque/src/rttest/test-schema.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- test-schema.xml 20 Jun 2003 18:50:01 -0000 1.13
+++ test-schema.xml 29 Jun 2003 14:30:03 -0000 1.14
@@ -112,4 +112,16 @@
<column name="FK_ID" required="true" type="INTEGER"/>
</table>
+ <!-- TRQS159 Invalid syntaxes for Hypersonic when using indexes. -->
+ <table name="payment_invoice_map"
+ description="maps the many-to-many relationship between payments and invoices">
+ <column name="payment_id" required="false" type="INTEGER"/>
+ <column name="invoice_id" required="false" type="INTEGER"/>
+
+ <index name="ix_uq_payment_invoice_map_pa_in">
+ <index-column name="payment_id"/>
+ <index-column name="invoice_id"/>
+ </index>
+ </table>
+
</database>