db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/schema ojbtest-schema.xml
Date Fri, 04 Nov 2005 13:07:28 GMT
arminw      2005/11/04 05:07:28

  Modified:    src/schema Tag: OJB_1_0_RELEASE ojbtest-schema.xml
  Log:
  change order of table declaration to avoid problems with constraints on table creation with
torque (nevertheless exceptions could arise on table drop call next time the script was executed)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.80.2.28 +27 -21    db-ojb/src/schema/ojbtest-schema.xml
  
  Index: ojbtest-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/schema/ojbtest-schema.xml,v
  retrieving revision 1.80.2.27
  retrieving revision 1.80.2.28
  diff -u -r1.80.2.27 -r1.80.2.28
  --- ojbtest-schema.xml	3 Nov 2005 13:13:31 -0000	1.80.2.27
  +++ ojbtest-schema.xml	4 Nov 2005 13:07:27 -0000	1.80.2.28
  @@ -356,7 +356,7 @@
          <foreign-key foreignTable="BIDIR_B">
            <reference local="fk_to_B" foreign="pk"/>
          </foreign-key>
  --->       
  +-->
      </table>
   
      <table name="BIDIR_B">
  @@ -952,8 +952,8 @@
               <reference local="MOVIE_ID_STR" foreign="OBJ_ID_STR"/>
           </foreign-key>
       </table>
  -    
  -    
  +
  +
       <table name="M2N_OFFICE">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="150"/>
  @@ -969,8 +969,8 @@
           <column name="NAME" type="VARCHAR" size="150"/>
       </table>
   
  -    
  -    
  +
  +
       <!-- =================================================== -->
       <!-- M2NGraph test table                                 -->
       <!-- =================================================== -->
  @@ -1435,6 +1435,12 @@
       <!-- =================================================== -->
       <!-- LockCircularTest - odmg                             -->
       <!-- =================================================== -->
  +    <table name="CT_DETAIL">
  +        <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
  +        <column name="NAME" type="VARCHAR" size="250"/>
  +        <column name="SHOP_FK" type="INTEGER"/>
  +    </table>
  +
       <table name="CT_SHOP">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="250"/>
  @@ -1444,12 +1450,6 @@
           </foreign-key>
       </table>
   
  -    <table name="CT_DETAIL">
  -        <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
  -        <column name="NAME" type="VARCHAR" size="250"/>
  -        <column name="SHOP_FK" type="INTEGER"/>
  -    </table>
  -
       <table name="CT_DISTRIBUTOR">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="250"/>
  @@ -1479,37 +1479,43 @@
           </foreign-key>
       </table>
   
  -    <table name="CT_OBJECT_A">
  +    <table name="CT_OBJECT_AAAA">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="250"/>
           <column name="FK_ID" type="INTEGER"/>
  -        <foreign-key foreignTable="CT_OBJECT_AA">
  -            <reference local="FK_ID" foreign="OBJ_ID"/>
  -        </foreign-key>
       </table>
  -    <table name="CT_OBJECT_AA">
  +
  +    <table name="CT_OBJECT_AAA">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="250"/>
           <column name="FK_ID" type="INTEGER"/>
  -        <foreign-key foreignTable="CT_OBJECT_AAA">
  +        <column name="FK_ID_A" type="INTEGER"/>
  +        <foreign-key foreignTable="CT_OBJECT_AAAA">
               <reference local="FK_ID" foreign="OBJ_ID"/>
           </foreign-key>
       </table>
  -    <table name="CT_OBJECT_AAA">
  +
  +    <table name="CT_OBJECT_AA">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="250"/>
           <column name="FK_ID" type="INTEGER"/>
  -        <column name="FK_ID_A" type="INTEGER"/>
  -        <foreign-key foreignTable="CT_OBJECT_AAAA">
  +        <foreign-key foreignTable="CT_OBJECT_AAA">
               <reference local="FK_ID" foreign="OBJ_ID"/>
           </foreign-key>
       </table>
  -    <table name="CT_OBJECT_AAAA">
  +
  +    <table name="CT_OBJECT_A">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="250"/>
           <column name="FK_ID" type="INTEGER"/>
  +        <foreign-key foreignTable="CT_OBJECT_AA">
  +            <reference local="FK_ID" foreign="OBJ_ID"/>
  +        </foreign-key>
       </table>
   
  +
  +
  +
       <!-- =================================================== -->
       <!-- Complex test model tables                           -->
       <!-- =================================================== -->
  
  
  

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


Mime
View raw message