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
Date Fri, 21 Mar 2003 15:05:01 GMT
mpoeschl    2003/03/21 07:05:01

  Modified:    src/generator/src/test/org/apache/torque/engine/database
                        package-schema.xml package2-schema.xml
               src/rttest extext-schema.xml ext-schema.xml test-schema.xml
  Log:
  use 3_1.dtd
  
  Revision  Changes    Path
  1.2       +10 -10    db-torque/src/generator/src/test/org/apache/torque/engine/database/package-schema.xml
  
  Index: package-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/test/org/apache/torque/engine/database/package-schema.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package-schema.xml	10 Feb 2003 13:21:35 -0000	1.1
  +++ package-schema.xml	21 Mar 2003 15:05:01 -0000	1.2
  @@ -1,10 +1,10 @@
  -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  -<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
  -
  -<database name="packagedb" defaultIdMethod="idbroker">
  -  <table name="table_a">
  -    <column name="table_a_id" required="true" primaryKey="true" type="INTEGER" />
  -    <column name="col_a" type="CHAR" size="5" />
  -  </table>
  -</database>
  -
  +<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  +<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database_3_1.dtd">
  +
  +<database name="packagedb" defaultIdMethod="idbroker">
  +  <table name="table_a">
  +    <column name="table_a_id" required="true" primaryKey="true" type="INTEGER" />
  +    <column name="col_a" type="CHAR" size="5" />
  +  </table>
  +</database>
  +
  
  
  
  1.2       +11 -11    db-torque/src/generator/src/test/org/apache/torque/engine/database/package2-schema.xml
  
  Index: package2-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/test/org/apache/torque/engine/database/package2-schema.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package2-schema.xml	10 Feb 2003 13:21:35 -0000	1.1
  +++ package2-schema.xml	21 Mar 2003 15:05:01 -0000	1.2
  @@ -1,11 +1,11 @@
  -<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  -<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd">
  -
  -<database name="packagedb2" defaultIdMethod="idbroker" package="packagefromdb">
  -
  -  <table name="table_a">
  -    <column name="table_a_id" required="true" primaryKey="true" type="INTEGER" />
  -    <column name="col_a" type="CHAR" size="5" />
  -  </table>
  -</database>
  -
  +<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  +<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database_3_1.dtd">
  +
  +<database name="packagedb2" defaultIdMethod="idbroker" package="packagefromdb">
  +
  +  <table name="table_a">
  +    <column name="table_a_id" required="true" primaryKey="true" type="INTEGER" />
  +    <column name="col_a" type="CHAR" size="5" />
  +  </table>
  +</database>
  +
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- extext-schema.xml	20 Dec 2002 16:39:21 -0000	1.1
  +++ extext-schema.xml	21 Mar 2003 15:05:01 -0000	1.2
  @@ -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://jakarta.apache.org/turbine/dtd/database_3_1.dtd">
   
   <database
     name="@DATABASE_DEFAULT@"
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ext-schema.xml	20 Dec 2002 16:39:21 -0000	1.1
  +++ ext-schema.xml	21 Mar 2003 15:05:01 -0000	1.2
  @@ -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://jakarta.apache.org/turbine/dtd/database_3_1.dtd">
   
   <database
     name="@DATABASE_DEFAULT@"
  
  
  
  1.10      +86 -86    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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- test-schema.xml	18 Jan 2003 14:51:34 -0000	1.9
  +++ test-schema.xml	21 Mar 2003 15:05:01 -0000	1.10
  @@ -1,86 +1,86 @@
  -<?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" 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>
  -
  -</database>
  +<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
  +<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database_3_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>
  +
  +</database>
  
  
  

Mime
View raw message