db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: db-torque/src/rttest extext-schema.xml ext-schema.xml test-schema.xml id-table-schema.xml bookstore-schema.xml
Date Tue, 27 May 2003 20:05:43 GMT
mpoeschl    2003/05/27 13:05:43

  Modified:    src/rttest Tag: TORQUE_3_0_BRANCH test-schema.xml
                        id-table-schema.xml bookstore-schema.xml
  Added:       src/rttest Tag: TORQUE_3_0_BRANCH extext-schema.xml
                        ext-schema.xml
  Log:
  update rttests
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +116 -59   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.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- test-schema.xml	19 Nov 2002 19:12:46 -0000	1.5
  +++ test-schema.xml	27 May 2003 20:05:42 -0000	1.5.2.1
  @@ -1,59 +1,116 @@
  -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  -<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
  -<!-- this schema is used to test problems users reported -->
  -
  -<database name="@DATABASE_DEFAULT@" defaultIdMethod="idbroker">
  -  <!-- TRQS15 -->
  -  <table name="varchar_pk">
  -    <column name="test_key" required="true" primaryKey="true" type="VARCHAR" size="30"
/>
  -  </table>
  -
  -  <!-- TRQS17 -->
  -  <table name="timestamp_pk">
  -    <column name="test_key" required="true" primaryKey="true" type="TIMESTAMP" />
  -    <column name="col_a" type="TIMESTAMP" />
  -    <!-- TRQS28 -->
  -    <column name="col_b" type="BOOLEANINT" javaType="object" />
  -    <column name="col_c" type="BOOLEANCHAR" javaType="object" />
  -    <!-- TRQ2 -->
  -    <column name="remote" type="CHAR" size="10"/>
  -  </table>
  -
  -  <!-- TRQ12 with multiple pks, combo key parse fails -->
  -  <table name="multi_pk" idMethod="none">
  -    <column name="pk1" required="true" primaryKey="true" type="VARCHAR" size="30" />
  -    <column name="pk2" required="true" primaryKey="true" type="INTEGER" />
  -    <column name="pk3" required="true" primaryKey="true" type="CHAR" size="5" />
  -    <column name="col_a" type="BOOLEANINT" />
  -    <column name="col_b" type="BOOLEANINT" javaType="object" />
  -  </table>
  -
  -  <!-- TRQS77 -->
  -  <table name="course">
  -    <column name="id" required="true" primaryKey="true" type="INTEGER" />
  -    <column name="col_a" type="CHAR" size="5" />
  -  </table>
  -
  -  <table name="course_number" description="Number for a course">
  -    <column name="course_id" required="true" type="INTEGER"/>
  -    <column name="number" required="true" type="INTEGER"/>
  -
  -    <foreign-key foreignTable="course"
  -     onDelete="cascade" onUpdate="cascade">
  -      <reference local="course_id" foreign="id"/>
  -    </foreign-key>
  -  </table>
  -
  -  <table name="course_number1" description="Number for a course">
  -    <column name="number" required="true" type="INTEGER"/>
  -    <column name="course_id" required="true" type="INTEGER"/>
  -
  -    <foreign-key foreignTable="course"
  -     onDelete="cascade" onUpdate="cascade">
  -      <reference local="course_id" foreign="id"/>
  -    </foreign-key>
  -  </table>
  -
  -
  -</database>
  -
  +<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  +<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_0_1.dtd">
  +<!-- this schema is used to test problems users reported -->
  +
  +<database name="@DATABASE_DEFAULT@" defaultIdMethod="idbroker" package="org.apache.torque.test">
  +
  +  <external-schema filename="ext-schema.xml" />
  +
  +  <!-- TRQS15 -->
  +  <table name="varchar_pk">
  +    <column name="test_key" required="true" primaryKey="true" type="VARCHAR" size="30"
/>
  +  </table>
  +
  +  <!-- TRQS17 -->
  +  <table name="timestamp_pk">
  +    <column name="test_key" required="true" primaryKey="true" type="TIMESTAMP" />
  +    <column name="col_a" type="TIMESTAMP" />
  +    <!-- TRQS28 -->
  +    <column name="col_b" type="BOOLEANINT" javaType="object" />
  +    <column name="col_c" type="BOOLEANCHAR" javaType="object" />
  +    <!-- TRQ2 -->
  +    <column name="remote" type="CHAR" size="10"/>
  +  </table>
  +
  +  <!-- TRQ12 with multiple pks, combo key parse fails -->
  +  <table name="multi_pk" idMethod="none">
  +    <column name="pk1" required="true" primaryKey="true" type="VARCHAR" size="30" />
  +    <column name="pk2" required="true" primaryKey="true" type="INTEGER" />
  +    <column name="pk3" required="true" primaryKey="true" type="CHAR" size="5" />
  +    <column name="col_a" type="BOOLEANINT" />
  +    <column name="col_b" type="BOOLEANINT" javaType="object" />
  +  </table>
  +
  +  <!-- TRQS77 -->
  +  <table name="course">
  +    <column name="id" required="true" primaryKey="true" type="INTEGER" />
  +    <column name="col_a" type="CHAR" size="5" />
  +  </table>
  +
  +  <table name="course_number" description="Number for a course">
  +    <column name="course_id" required="true" type="INTEGER"/>
  +    <column name="course_num" required="true" type="INTEGER"/>
  +
  +    <foreign-key foreignTable="course"
  +     onDelete="cascade" onUpdate="cascade">
  +      <reference local="course_id" foreign="id"/>
  +    </foreign-key>
  +  </table>
  +
  +  <table name="course_number1" description="Number for a course">
  +    <column name="course_num" required="true" type="INTEGER"/>
  +    <column name="course_id" required="true" type="INTEGER"/>
  +
  +    <foreign-key foreignTable="course"
  +     onDelete="cascade" onUpdate="cascade">
  +      <reference local="course_id" foreign="id"/>
  +    </foreign-key>
  +  </table>
  +
  +  <!-- reference to external 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"/>
  +
  +    <foreign-key foreignTable="ext">
  +      <reference local="ext_id" foreign="ext_id"/>
  +    </foreign-key>
  +  </table>
  +
  +  <table name="extext_schema">
  +    <column name="extext_schema_id" required="true" primaryKey="true" type="INTEGER"/>
  +    <column name="extext_id" type="INTEGER"/>
  +    <column name="test" required="true" type="INTEGER"/>
  +
  +    <foreign-key foreignTable="extext">
  +      <reference local="extext_id" foreign="extext_id"/>
  +    </foreign-key>
  +  </table>
  +
  +  <!-- TRQS118 primary key of type FLOAT -->
  +  <table name="float_pk">
  +    <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">
  +    <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"/>
  +    <column name="BASE_STATE_CODE" size="2" type="VARCHAR"/>
  +    <column name="BASE_ZIP_CODE" size="10" type="VARCHAR"/>
  +    <column name="DATA_MODIFIED_ID_CODE" size="22" type="DECIMAL"/>
  +    <column name="DATA_MODIFIED_DATE" type="TIMESTAMP"/>
  +    <column name="DATA_CREATOR_ID_CODE" size="22" type="DECIMAL"/>
  +    <column name="DATA_CREATOR_DATE" type="TIMESTAMP"/>
  +    <column name="DATA_TRANSFER_CODE" size="1" type="VARCHAR"/>
  +    <column name="BASE_ADDRESS_TEXT" size="2000" type="VARCHAR"/>
  +    <column name="BASE_TYPE_TEXT" size="100" type="VARCHAR"/>
  +    <column name="START_DATE" type="TIMESTAMP"/>
  +    <column name="END_DATE" type="TIMESTAMP"/>
  +  </table>
  +  
  +  <!-- test for hypersonic -->
  +  <table name="NATIVE_TEST">
  +    <column name="NATIVE_ID" required="true" primaryKey="true" type="INTEGER" autoIncrement="true"/>
  +    <column name="NAME" type="VARCHAR" size="250"/>
  +  </table>
  +  <table name="NATIVE_REF_TEST">
  +    <column name="NATIVE_ID" required="true" primaryKey="true" type="INTEGER" autoIncrement="true"/>
  +    <column name="NAME" type="VARCHAR" size="250"/>
  +    <column name="FK_ID" required="true" type="INTEGER"/>
  +  </table>
  +  
  +</database>
  +
  
  
  
  1.2.2.1   +3 -4      db-torque/src/rttest/id-table-schema.xml
  
  Index: id-table-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/rttest/id-table-schema.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- id-table-schema.xml	29 Jan 2002 04:50:28 -0000	1.2
  +++ id-table-schema.xml	27 May 2003 20:05:42 -0000	1.2.2.1
  @@ -1,6 +1,5 @@
   <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  -<!DOCTYPE database SYSTEM 
  -"http://jakarta.apache.org/turbine/dtd/database.dtd">
  +<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_0_1.dtd">
   
   <!-- ==================================================================== -->
   <!--                                                                      -->
  @@ -8,7 +7,7 @@
   <!--                                                                      -->
   <!-- ==================================================================== -->
   <!-- This is the XML schema use by Torque to generate the SQL for         -->
  -<!-- ID_TABLE table used by the id broker mechanism in Turbine.           -->
  +<!-- ID_TABLE table used by the id broker mechanism in Torque.            -->
   <!-- ==================================================================== -->
   <!-- @author: <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>   
  -->
   <!-- @version $Id$ -->
  
  
  
  1.10.2.1  +1 -1      db-torque/src/rttest/bookstore-schema.xml
  
  Index: bookstore-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/rttest/bookstore-schema.xml,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- bookstore-schema.xml	15 Sep 2002 03:16:57 -0000	1.10
  +++ bookstore-schema.xml	27 May 2003 20:05:42 -0000	1.10.2.1
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
  -<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
  +<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_0_1.dtd">
   
   
   <database 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +1 -1      db-torque/src/rttest/extext-schema.xml
  
  Index: extext-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/rttest/extext-schema.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- extext-schema.xml	21 Mar 2003 15:05:01 -0000	1.2
  +++ extext-schema.xml	27 May 2003 20:05:42 -0000	1.2.2.1
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
  -<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database_3_1.dtd">
  +<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_0_1.dtd">
   
   <database
     name="@DATABASE_DEFAULT@"
  
  
  
  1.2.2.1   +1 -1      db-torque/src/rttest/ext-schema.xml
  
  Index: ext-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/rttest/ext-schema.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ext-schema.xml	21 Mar 2003 15:05:01 -0000	1.2
  +++ ext-schema.xml	27 May 2003 20:05:42 -0000	1.2.2.1
  @@ -1,5 +1,5 @@
   <?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
  -<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database_3_1.dtd">
  +<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_0_1.dtd">
   
   <database
     name="@DATABASE_DEFAULT@"
  
  
  

Mime
View raw message