svn commit: r465239 - in /db/ojb/branches/OJB_1_0_RELEASE/src: schema/ojbtest-schema.xml test/org/apache/ojb/repository_junit_inheritance.xml

[arminw]

Author: arminw
Date: Wed Oct 18 05:38:00 2006
New Revision: 465239

URL: http://svn.apache.org/viewvc?view=rev&rev=465239
Log:
fix column name issue

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml
    
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml
URL: 
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml?view=diff&rev=465239&r1=465238&r2=465239
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml Wed Oct 18 
05:38:00 2006
@@ -1835,10 +1835,9 @@
 
     <table name="FIRST_">
                <column
-                  name="ID"
+                  name="ID_"
                   type="INTEGER"
-                  primaryKey="true"
-                  autoIncrement="true"/>
+                  primaryKey="true"/>
                <column
                   name="NAME"
                   type="VARCHAR"/>
@@ -1846,10 +1845,9 @@
 
        <table name="SECOND_">
                <column
-                  name="ID"
+                  name="ID_"
                   type="INTEGER"
-                  primaryKey="true"
-                  autoIncrement="true"/>
+                  primaryKey="true"/>
                <column
                   name="SECOND"
                   type="VARCHAR"/>
@@ -1857,16 +1855,15 @@
                   name="FIRST_FK"
                   type="INTEGER"/>
                <foreign-key foreignTable="FIRST_">
-                       <reference local="FIRST_FK" foreign="ID"/>
+                       <reference local="FIRST_FK" foreign="ID_"/>
                </foreign-key>
        </table>
 
        <table name="THIRD_">
                <column
-                  name="ID"
+                  name="ID_"
                   type="INTEGER"
-                  primaryKey="true"
-                  autoIncrement="true"/>
+                  primaryKey="true"/>
                <column
                   name="THIRD"
                   type="VARCHAR"/>
@@ -1874,7 +1871,7 @@
                   name="THIRD_FK"
                   type="INTEGER"/>
                <foreign-key foreignTable="THIRD_">
-                       <reference local="THIRD_FK" foreign="ID"/>
+                       <reference local="THIRD_FK" foreign="ID_"/>
                </foreign-key>
        </table>
 

Modified: 
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml
URL: 
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml?view=diff&rev=465239&r1=465238&r2=465239
==============================================================================
--- 
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml
 (original)
+++ 
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml
 Wed Oct 18 05:38:00 2006
@@ -430,7 +430,7 @@
 >
     <field-descriptor
         name="id"
-        column="ID"
+        column="ID_"
         jdbc-type="INTEGER"
         primarykey="true"
         autoincrement="true"
@@ -449,7 +449,7 @@
 >
     <field-descriptor
         name="id"
-        column="ID"
+        column="ID_"
         jdbc-type="INTEGER"
         primarykey="true"
         autoincrement="true"
@@ -478,7 +478,7 @@
 >
     <field-descriptor
         name="id"
-        column="ID"
+        column="ID_"
         jdbc-type="INTEGER"
         primarykey="true"
         autoincrement="true"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]