db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r935661 - /db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
Date Mon, 19 Apr 2010 16:42:33 GMT
Author: tfischer
Date: Mon Apr 19 16:42:32 2010
New Revision: 935661

URL: http://svn.apache.org/viewvc?rev=935661&view=rev
Log:
- added idMethod=none to tables with a non-number primary key. This allows the tables to be
created e.g. in derby.
- uncommented external schema tests. They should now work.

Modified:
    db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml

Modified: db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml?rev=935661&r1=935660&r2=935661&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml (original)
+++ db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml Mon Apr 19 16:42:32
2010
@@ -25,12 +25,12 @@
   <external-schema filename="ext-schema.xml" />
 
   <!-- TRQS15 -->
-  <table name="varchar_pk">
+  <table name="varchar_pk" idMethod="none">
     <column name="test_key" required="true" primaryKey="true" type="VARCHAR" size="30"
/>
   </table>
 
   <!-- TRQS17 -->
-  <table name="timestamp_pk">
+  <table name="timestamp_pk" idMethod="none">
     <column name="test_key" required="true" primaryKey="true" type="TIMESTAMP" />
     <column name="col_a" type="TIMESTAMP" />
     <!-- TRQS28 -->
@@ -76,8 +76,7 @@
   </table>
 
   <!-- reference to external schema -->
-  <!-- TODO: uncomment once external schemata are working -->
-  <!-- table name="ext_schema">
+  <table name="ext_schema">
     <column name="ext_schema_id" required="true" primaryKey="true" type="INTEGER"/>
     <column name="ext_id" type="INTEGER"/>
     <column name="test" required="true" type="INTEGER"/>
@@ -98,15 +97,15 @@
     <foreign-key foreignTable="extext">
       <reference local="extext_id" foreign="extext_id"/>
     </foreign-key>
-  </table-->
+  </table>
 
   <!-- TRQS118 primary key of type FLOAT -->
-  <table name="float_pk">
+  <table name="float_pk" idMethod="none">
     <column name="test_key" required="true" primaryKey="true" type="FLOAT" />
   </table>
 
   <!-- TRQS143 Generated OM will not compile if table name is Base -->
-  <table name="BASE" javaName="BaseTable">
+  <table name="BASE" javaName="BaseTable" idMethod="none">
     <column name="BASE_ID_CODE" primaryKey="true" required="true"
             size="22" type="DECIMAL" javaName="Id"/>
     <column name="BASE_NAME" size="100" type="VARCHAR" javaName="Title"/>
@@ -372,12 +371,12 @@
   </table>
 
   <!-- Torque OM generated code did not compile if bean generation is activated and a
table references an other table several times -->
-  <table name="referenced" javaName="Referenced" description="Table referenced by several
columns of an other table">
+  <table name="referenced" javaName="Referenced" description="Table referenced by several
columns of an other table"  idMethod="none">
     <column name="referenced_pk" javaName="referencedPK" required="true" primaryKey="true"
type="VARCHAR" size="12"/>
     <column name="other_information" javaName="otherInformation" type="VARCHAR" size="255"/>
   </table>
 
-  <table name="multi_ref_same_table"  description="Table to test multi references to a
same table">
+  <table name="multi_ref_same_table"  description="Table to test multi references to a
same table" idMethod="none">
     <column name="multi_ref_same_table_pk" required="true" primaryKey="true" type="VARCHAR"
size="12"/>
     <column name="an_information" required="true" type="VARCHAR" size="128"/>
     <column name="reference_1" type="VARCHAR" size="12"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message