arminw 2005/11/03 05:38:25
Modified: src/schema ojbtest-schema.xml
src/test/org/apache/ojb/quick-db OJB.script
src/test/org/apache/ojb repository_junit.xml
repository_junit_inheritance.xml
repository_junit_odmg.xml
repository_junit_reference.xml
Log:
fix problem using reserved DB names in table columns (maxDB reserved name is
'value')
fix problem of too long table names (oracle supports only name <=30 char)
Revision Changes Path
1.102 +33 -33 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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ojbtest-schema.xml 30 Sep 2005 21:48:37 -0000 1.101
+++ ojbtest-schema.xml 3 Nov 2005 13:38:23 -0000 1.102
@@ -1027,103 +1027,103 @@
private Gatherer gatherer;
private String extentName;
-->
- <table name="COLLECTION_GATHERER">
+ <table name="COL_GATHERER">
<column name="GAT_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="COLLECTION_COLLECTIBLE_A">
+ <table name="COL_COLLECTIBLE_A">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_COLLECTIBLE_BASE">
+ <table name="COL_COLLECTIBLE_BASE">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_COLLECTIBLE_B">
+ <table name="COL_COLLECTIBLE_B">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_COLLECTIBLE_C">
+ <table name="COL_COLLECTIBLE_C">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
<column name="EXTENT_NAME" type="VARCHAR" size="150"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_COLLECTIBLE_CC">
+ <table name="COL_COLLECTIBLE_CC">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
<column name="EXTENT_NAME" type="VARCHAR" size="150"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_COLLECTIBLE_C2">
+ <table name="COL_COLLECTIBLE_C2">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
<column name="EXTENT_NAME" type="VARCHAR" size="150"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_COLLECTIBLE_D">
+ <table name="COL_COLLECTIBLE_D">
<column name="COL_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="OJB_CONCRETE_CLASS" type="VARCHAR" size="150"/>
<column name="GAT_ID" type="INTEGER"/>
- <foreign-key foreignTable="COLLECTION_GATHERER">
+ <foreign-key foreignTable="COL_GATHERER">
<reference local="GAT_ID" foreign="GAT_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_2_PROJECT">
+ <table name="COL_2_PROJECT">
<column name="PRO_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="COLLECTION_2_SUB_PROJECT">
+ <table name="COL_2_SUB_PROJECT">
<column name="SUB_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_PRO_ID" type="INTEGER"/>
- <foreign-key foreignTable="COLLECTION_2_PROJECT">
+ <foreign-key foreignTable="COL_2_PROJECT">
<reference local="FK_PRO_ID" foreign="PRO_ID"/>
</foreign-key>
</table>
- <table name="COLLECTION_2_DEVELOPER">
+ <table name="COL_2_DEVELOPER">
<column name="DEV_ID" required="true" primaryKey="true"
type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_PRO_ID" type="INTEGER"/>
- <foreign-key foreignTable="COLLECTION_2_PROJECT">
+ <foreign-key foreignTable="COL_2_PROJECT">
<reference local="FK_PRO_ID" foreign="PRO_ID"/>
</foreign-key>
</table>
@@ -1203,14 +1203,14 @@
<!-- Used in tests AbstractExtentClassTest -->
- <table name="ABSTRACT_COLLECTION_Z">
+ <table name="ABSTRACT_COL_Z">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="CONTAINER_ID" required="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="SOMEVALUE" type="INTEGER" />
</table>
<!-- Used in tests AbstractExtentClassTest -->
- <table name="ABSTRACT_COLLECTION_ZZ">
+ <table name="ABSTRACT_COL_ZZ">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="CONTAINER_ID" required="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
@@ -1798,30 +1798,30 @@
</table>
<table name="OuterClass">
- <column name="id" required="true" primaryKey="true" type="INTEGER"/>
- <column name="value" type="VARCHAR" size="150"/>
+ <column name="id_" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="value_" type="VARCHAR" size="150"/>
</table>
<table name="InnerClass">
- <column name="id" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="id_" required="true" primaryKey="true" type="INTEGER"/>
<column name="outerid" required="true" type="INTEGER"/>
- <column name="value" type="DOUBLE"/>
+ <column name="value_" type="DOUBLE"/>
<foreign-key foreignTable="OuterClass">
- <reference local="outerid" foreign="id"/>
+ <reference local="outerid" foreign="id_"/>
</foreign-key>
</table>
<table name="Level1InnerClass">
- <column name="id" required="true" primaryKey="true" type="INTEGER"/>
- <column name="value" type="DOUBLE"/>
+ <column name="id_" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="value_" type="DOUBLE"/>
</table>
<table name="Level3InnerClass">
- <column name="id" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="id_" required="true" primaryKey="true" type="INTEGER"/>
<column name="level1id" required="true" type="INTEGER"/>
- <column name="value" type="VARCHAR"/>
+ <column name="value_" type="VARCHAR"/>
<foreign-key foreignTable="Level1InnerClass">
- <reference local="level1id" foreign="id"/>
+ <reference local="level1id" foreign="id_"/>
</foreign-key>
</table>
1.36 +13 -13 db-ojb/src/test/org/apache/ojb/quick-db/OJB.script
Index: OJB.script
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/quick-db/OJB.script,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- OJB.script 24 Sep 2005 12:34:32 -0000 1.35
+++ OJB.script 3 Nov 2005 13:38:23 -0000 1.36
@@ -117,17 +117,17 @@
CREATE MEMORY TABLE M2N_COUNTY(OBJ_ID VARCHAR(150) NOT NULL PRIMARY KEY,NAME
VARCHAR(150))
CREATE MEMORY TABLE M2N_NODE(OBJ_ID INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(150))
CREATE MEMORY TABLE M2N_KINDSHIP(PARENT_ID INTEGER NOT NULL,CHILD_ID INTEGER
NOT NULL,PRIMARY KEY(PARENT_ID,CHILD_ID))
-CREATE MEMORY TABLE COLLECTION_GATHERER(GAT_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_A(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,CONSTRAINT COLLECTION_COLLECTIBLE_A_FK_1
FOREIGN KEY(GAT_ID) REFERENCES COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_BASE(COL_ID INTEGER NOT NULL
PRIMARY KEY,NAME VARCHAR(150),GAT_ID INTEGER,CONSTRAINT
COLLECTION_COLLECTIBLE_BASE_FK_1 FOREIGN KEY(GAT_ID) REFERENCES
COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_B(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,CONSTRAINT COLLECTION_COLLECTIBLE_B_FK_1
FOREIGN KEY(GAT_ID) REFERENCES COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_C(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,EXTENT_NAME VARCHAR(150),CONSTRAINT
COLLECTION_COLLECTIBLE_C_FK_1 FOREIGN KEY(GAT_ID) REFERENCES
COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_CC(COL_ID INTEGER NOT NULL
PRIMARY KEY,NAME VARCHAR(150),GAT_ID INTEGER,EXTENT_NAME
VARCHAR(150),CONSTRAINT COLLECTION_COLLECTIBLE_CC_FK_1 FOREIGN KEY(GAT_ID)
REFERENCES COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_C2(COL_ID INTEGER NOT NULL
PRIMARY KEY,NAME VARCHAR(150),GAT_ID INTEGER,EXTENT_NAME
VARCHAR(150),CONSTRAINT COLLECTION_COLLECTIBLE_C2_FK_1 FOREIGN KEY(GAT_ID)
REFERENCES COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_COLLECTIBLE_D(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),OJB_CONCRETE_CLASS VARCHAR(150),GAT_ID INTEGER,CONSTRAINT
COLLECTION_COLLECTIBLE_D_FK_1 FOREIGN KEY(GAT_ID) REFERENCES
COLLECTION_GATHERER(GAT_ID))
-CREATE MEMORY TABLE COLLECTION_2_PROJECT(PRO_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150))
-CREATE MEMORY TABLE COLLECTION_2_SUB_PROJECT(SUB_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),FK_PRO_ID INTEGER,CONSTRAINT
COLLECTION_2_SUB_PROJECT_FK_1 FOREIGN KEY(FK_PRO_ID) REFERENCES
COLLECTION_2_PROJECT(PRO_ID))
-CREATE MEMORY TABLE COLLECTION_2_DEVELOPER(DEV_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),FK_PRO_ID INTEGER,CONSTRAINT COLLECTION_2_DEVELOPER_FK_1
FOREIGN KEY(FK_PRO_ID) REFERENCES COLLECTION_2_PROJECT(PRO_ID))
+CREATE MEMORY TABLE COL_GATHERER(GAT_ID INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(150))
+CREATE MEMORY TABLE COL_COLLECTIBLE_A(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,CONSTRAINT COL_COLLECTIBLE_A_FK_1 FOREIGN
KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_COLLECTIBLE_BASE(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,CONSTRAINT COL_COLLECTIBLE_BASE_FK_1
FOREIGN KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_COLLECTIBLE_B(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,CONSTRAINT COL_COLLECTIBLE_B_FK_1 FOREIGN
KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_COLLECTIBLE_C(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,EXTENT_NAME VARCHAR(150),CONSTRAINT
COL_COLLECTIBLE_C_FK_1 FOREIGN KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_COLLECTIBLE_CC(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,EXTENT_NAME VARCHAR(150),CONSTRAINT
COL_COLLECTIBLE_CC_FK_1 FOREIGN KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_COLLECTIBLE_C2(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),GAT_ID INTEGER,EXTENT_NAME VARCHAR(150),CONSTRAINT
COL_COLLECTIBLE_C2_FK_1 FOREIGN KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_COLLECTIBLE_D(COL_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),OJB_CONCRETE_CLASS VARCHAR(150),GAT_ID INTEGER,CONSTRAINT
COL_COLLECTIBLE_D_FK_1 FOREIGN KEY(GAT_ID) REFERENCES COL_GATHERER(GAT_ID))
+CREATE MEMORY TABLE COL_2_PROJECT(PRO_ID INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(150))
+CREATE MEMORY TABLE COL_2_SUB_PROJECT(SUB_ID INTEGER NOT NULL PRIMARY
KEY,NAME VARCHAR(150),FK_PRO_ID INTEGER,CONSTRAINT COL_2_SUB_PROJECT_FK_1
FOREIGN KEY(FK_PRO_ID) REFERENCES COL_2_PROJECT(PRO_ID))
+CREATE MEMORY TABLE COL_2_DEVELOPER(DEV_ID INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(150),FK_PRO_ID INTEGER,CONSTRAINT COL_2_DEVELOPER_FK_1 FOREIGN
KEY(FK_PRO_ID) REFERENCES COL_2_PROJECT(PRO_ID))
CREATE MEMORY TABLE PB_AWARE_OBJECT(ID_ INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(150),FK_REF INTEGER)
CREATE MEMORY TABLE PB_AWARE_REF(ID_ INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(150))
CREATE MEMORY TABLE PB_AWARE_COLL(ID_ INTEGER NOT NULL PRIMARY
KEY,FK_PB_AWARE INTEGER,NAME VARCHAR(150))
@@ -137,8 +137,8 @@
CREATE MEMORY TABLE TABLE_G(ID INTEGER NOT NULL PRIMARY KEY,F_ID
INTEGER,SOMESUBVALUE INTEGER,CONSTRAINT TABLE_G_FK_1 FOREIGN KEY(F_ID)
REFERENCES TABLE_F(ID))
CREATE MEMORY TABLE TABLE_F1(ID INTEGER NOT NULL PRIMARY KEY,SOMEVALUE
INTEGER,CONSTRAINT TABLE_F1_FK_1 FOREIGN KEY(ID) REFERENCES TABLE_E(ID))
CREATE MEMORY TABLE TABLE_G1(ID INTEGER NOT NULL PRIMARY KEY,SOMESUBVALUE
INTEGER,CONSTRAINT TABLE_G1_FK_1 FOREIGN KEY(ID) REFERENCES TABLE_F1(ID))
-CREATE MEMORY TABLE ABSTRACT_COLLECTION_Z(OBJ_ID INTEGER NOT NULL PRIMARY
KEY,CONTAINER_ID INTEGER,NAME VARCHAR(150),SOMEVALUE INTEGER)
-CREATE MEMORY TABLE ABSTRACT_COLLECTION_ZZ(OBJ_ID INTEGER NOT NULL PRIMARY
KEY,CONTAINER_ID INTEGER,NAME VARCHAR(150),ZZ_NAME VARCHAR(150),SOMEVALUE
INTEGER)
+CREATE MEMORY TABLE ABSTRACT_COL_Z(OBJ_ID INTEGER NOT NULL PRIMARY
KEY,CONTAINER_ID INTEGER,NAME VARCHAR(150),SOMEVALUE INTEGER)
+CREATE MEMORY TABLE ABSTRACT_COL_ZZ(OBJ_ID INTEGER NOT NULL PRIMARY
KEY,CONTAINER_ID INTEGER,NAME VARCHAR(150),ZZ_NAME VARCHAR(150),SOMEVALUE
INTEGER)
CREATE MEMORY TABLE XCONTAINER(OBJ_ID INTEGER NOT NULL PRIMARY KEY)
CREATE MEMORY TABLE COL_BOOKSHELFS(PK INTEGER NOT NULL PRIMARY KEY,NAME
VARCHAR(100))
CREATE MEMORY TABLE COL_BOOKS(PK INTEGER NOT NULL,BOOKSHELF_FK INTEGER NOT
NULL,PRIMARY KEY(PK,BOOKSHELF_FK))
1.140 +9 -9 db-ojb/src/test/org/apache/ojb/repository_junit.xml
Index: repository_junit.xml
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit.xml,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- repository_junit.xml 3 Oct 2005 19:23:26 -0000 1.139
+++ repository_junit.xml 3 Nov 2005 13:38:23 -0000 1.140
@@ -641,14 +641,14 @@
>
<field-descriptor
name="outerId"
- column="id"
+ column="id_"
jdbc-type="INTEGER"
primarykey="true"
autoincrement="true"
/>
<field-descriptor
name="outerValue"
- column="value"
+ column="value_"
jdbc-type="VARCHAR"
/>
</class-descriptor>
@@ -658,14 +658,14 @@
>
<field-descriptor
name="innerId"
- column="id"
+ column="id_"
jdbc-type="INTEGER"
primarykey="true"
autoincrement="true"
/>
<field-descriptor
name="innerValue"
- column="value"
+ column="value_"
jdbc-type="DOUBLE"
/>
<field-descriptor
@@ -688,14 +688,14 @@
>
<field-descriptor
name="level1Id"
- column="id"
+ column="id_"
jdbc-type="INTEGER"
primarykey="true"
autoincrement="true"
/>
<field-descriptor
name="value"
- column="value"
+ column="value_"
jdbc-type="DOUBLE"
/>
</class-descriptor>
@@ -708,14 +708,14 @@
</creation-descriptor>
<field-descriptor
name="level3Id"
- column="id"
+ column="id_"
jdbc-type="INTEGER"
primarykey="true"
autoincrement="true"
/>
<field-descriptor
name="value"
- column="value"
+ column="value_"
jdbc-type="VARCHAR"
/>
<field-descriptor
1.3 +2 -2
db-ojb/src/test/org/apache/ojb/repository_junit_inheritance.xml
Index: repository_junit_inheritance.xml
===================================================================
RCS file:
/home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit_inheritance.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- repository_junit_inheritance.xml 27 Aug 2005 12:46:14 -0000 1.2
+++ repository_junit_inheritance.xml 3 Nov 2005 13:38:24 -0000 1.3
@@ -873,7 +873,7 @@
<class-descriptor
class="org.apache.ojb.broker.AbstractExtentClassTest$ConcreteZ"
- table="ABSTRACT_COLLECTION_Z">
+ table="ABSTRACT_COL_Z">
<field-descriptor
name="id"
@@ -935,7 +935,7 @@
<class-descriptor
class="org.apache.ojb.broker.AbstractExtentClassTest$ConcreteZZ"
- table="ABSTRACT_COLLECTION_ZZ">
+ table="ABSTRACT_COL_ZZ">
<field-descriptor
name="id"
1.19 +5 -5 db-ojb/src/test/org/apache/ojb/repository_junit_odmg.xml
Index: repository_junit_odmg.xml
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit_odmg.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- repository_junit_odmg.xml 27 Aug 2005 12:46:14 -0000 1.18
+++ repository_junit_odmg.xml 3 Nov 2005 13:38:24 -0000 1.19
@@ -684,7 +684,7 @@
-->
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$Gatherer"
- table="COLLECTION_GATHERER">
+ table="COL_GATHERER">
<field-descriptor
name="gatId"
@@ -751,7 +751,7 @@
-->
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$CollectibleA"
- table="COLLECTION_COLLECTIBLE_A">
+ table="COL_COLLECTIBLE_A">
<field-descriptor
name="colId"
@@ -791,7 +791,7 @@
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$CollectibleB"
- table="COLLECTION_COLLECTIBLE_B">
+ table="COL_COLLECTIBLE_B">
<field-descriptor
name="colId"
@@ -831,7 +831,7 @@
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$CollectibleC"
- table="COLLECTION_COLLECTIBLE_C">
+ table="COL_COLLECTIBLE_C">
<field-descriptor
name="colId"
1.25 +12 -12
db-ojb/src/test/org/apache/ojb/repository_junit_reference.xml
Index: repository_junit_reference.xml
===================================================================
RCS file:
/home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit_reference.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- repository_junit_reference.xml 27 Aug 2005 12:46:14 -0000 1.24
+++ repository_junit_reference.xml 3 Nov 2005 13:38:24 -0000 1.25
@@ -724,7 +724,7 @@
-->
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$Gatherer"
- table="COLLECTION_GATHERER">
+ table="COL_GATHERER">
<field-descriptor
name="gatId"
@@ -844,7 +844,7 @@
-->
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleBase"
- table="COLLECTION_COLLECTIBLE_BASE">
+ table="COL_COLLECTIBLE_BASE">
<!-- extent-class
class-ref="org.apache.ojb.broker.CollectionTest$CollectibleB" / -->
<field-descriptor
name="colId"
@@ -870,7 +870,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleB"
- table="COLLECTION_COLLECTIBLE_B">
+ table="COL_COLLECTIBLE_B">
<!-- extent-class
class-ref="org.apache.ojb.broker.CollectionTest$CollectibleC" / -->
@@ -897,7 +897,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleC"
- table="COLLECTION_COLLECTIBLE_C">
+ table="COL_COLLECTIBLE_C">
<!-- extent-class
class-ref="org.apache.ojb.broker.CollectionTest$CollectibleCC" / -->
<!-- extent-class
class-ref="org.apache.ojb.broker.CollectionTest$CollectibleC2" / -->
<field-descriptor
@@ -940,7 +940,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleCC"
- table="COLLECTION_COLLECTIBLE_CC">
+ table="COL_COLLECTIBLE_CC">
<field-descriptor
name="colId"
@@ -982,7 +982,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleC2"
- table="COLLECTION_COLLECTIBLE_C2">
+ table="COL_COLLECTIBLE_C2">
<field-descriptor
name="colId"
@@ -1025,7 +1025,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleD"
- table="COLLECTION_COLLECTIBLE_D">
+ table="COL_COLLECTIBLE_D">
<field-descriptor
name="colId"
@@ -1057,7 +1057,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleDD"
- table="COLLECTION_COLLECTIBLE_D">
+ table="COL_COLLECTIBLE_D">
<field-descriptor
name="colId"
@@ -1675,7 +1675,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$Project"
- table="COLLECTION_2_PROJECT"
+ table="COL_2_PROJECT"
>
<field-descriptor
@@ -1717,7 +1717,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$SubProject"
- table="COLLECTION_2_SUB_PROJECT"
+ table="COL_2_SUB_PROJECT"
>
<field-descriptor
@@ -1755,7 +1755,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$Developer"
- table="COLLECTION_2_DEVELOPER"
+ table="COL_2_DEVELOPER"
>
<field-descriptor
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
