db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject svn commit: r465237 - in /db/ojb/trunk/src: schema/ojbtest-schema.xml test/org/apache/ojb/repository_junit_inheritance.xml
Date Wed, 18 Oct 2006 12:37:22 GMT
Author: arminw
Date: Wed Oct 18 05:37:22 2006
New Revision: 465237

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

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

Modified: db/ojb/trunk/src/schema/ojbtest-schema.xml
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/schema/ojbtest-schema.xml?view=diff&rev=465237&r1=465236&r2=465237
==============================================================================
--- db/ojb/trunk/src/schema/ojbtest-schema.xml (original)
+++ db/ojb/trunk/src/schema/ojbtest-schema.xml Wed Oct 18 05:37:22 2006
@@ -1850,10 +1850,9 @@
 
     <table name="FIRST_">
 		<column
-		   name="ID"
+		   name="ID_"
 		   type="INTEGER"
-		   primaryKey="true"
-		   autoIncrement="true"/>
+		   primaryKey="true"/>
 		<column
 		   name="NAME"
 		   type="VARCHAR"/>
@@ -1861,10 +1860,9 @@
 
 	<table name="SECOND_">
 		<column
-		   name="ID"
+		   name="ID_"
 		   type="INTEGER"
-		   primaryKey="true"
-		   autoIncrement="true"/>
+		   primaryKey="true"/>
 		<column
 		   name="SECOND"
 		   type="VARCHAR"/>
@@ -1872,16 +1870,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"/>
@@ -1889,7 +1886,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/trunk/src/test/org/apache/ojb/repository_junit_inheritance.xml
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/test/org/apache/ojb/repository_junit_inheritance.xml?view=diff&rev=465237&r1=465236&r2=465237
==============================================================================
--- db/ojb/trunk/src/test/org/apache/ojb/repository_junit_inheritance.xml (original)
+++ db/ojb/trunk/src/test/org/apache/ojb/repository_junit_inheritance.xml Wed Oct 18 05:37:22
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: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message