You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by to...@apache.org on 2006/02/16 00:45:09 UTC
svn commit: r378122 - in /db/ojb/branches/OJB_1_0_RELEASE/src: schema/
test/org/apache/ojb/ test/org/apache/ojb/odmg/ test/org/apache/ojb/quick-db/
Author: tomdz
Date: Wed Feb 15 15:45:05 2006
New Revision: 378122
URL: http://svn.apache.org/viewcvs?rev=378122&view=rev
Log:
Modified test schema so that the identifiers are not longer than 18 characters because of the identifier length limitation in Db2
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/odmg/CircularTest.java
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/quick-db/OJB.script
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit.xml
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_odmg.xml
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_reference.xml
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
--- 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 Feb 15 15:45:05 2006
@@ -197,13 +197,13 @@
<column name="FATHER_ID" type="INTEGER"/>
</table>
- <table name="LOCKED_BY_VERSION">
+ <table name="VERSIONLOCKED">
<column name="ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="VALUE_" type="VARCHAR" size="150"/>
<column name="VERSION_" type="INTEGER"/>
</table>
- <table name="LOCKED_BY_TIMESTAMP">
+ <table name="TIMESTAMPLOCKED">
<column name="ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="VALUE_" type="VARCHAR" size="150"/>
<column name="TIMESTAMP_" type="TIMESTAMP"/>
@@ -228,7 +228,7 @@
<column name="MASTER_TEXT" type="VARCHAR" size="255"/>
</table>
- <table name="MDTEST_DETAIL_FKINPK">
+ <table name="MDTEST_FKINPK">
<column name="MASTERID" required="true" primaryKey="true" type="INTEGER"/>
<column name="DETAILID" required="true" primaryKey="true" type="INTEGER"/>
<column name="DETAIL_TEXT" type="VARCHAR" size="255"/>
@@ -237,7 +237,7 @@
</foreign-key>
</table>
- <table name="MDTEST_DETAIL_FKNOPK">
+ <table name="MDTEST_FKNOPK">
<column name="DETAILID" required="true" primaryKey="true" type="INTEGER"/>
<column name="MASTERID" required="true" type="INTEGER"/>
<column name="DETAIL_TEXT" type="VARCHAR" size="255"/>
@@ -697,27 +697,27 @@
private long uid; // primary key
private long node_refid;
-->
- <table name="FIELD_CONVERSION_NODE">
+ <table name="FIELDCONV_NODE">
<column name="NODE_ID" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="NODE_STATE" required="true" primaryKey="true" type="INTEGER"/>
<column name="PARENT_UID" type="DECIMAL" size="15,0"/>
</table>
- <table name="FIELD_CONVERSION_NODE_NOINC">
+ <table name="FIELDCONV_NOINC">
<column name="NODE_ID" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
</table>
<table name="CONVERSION_VO">
<column name="PK_WITH_AUTO" required="true" primaryKey="true" type="INTEGER"/>
- <column name="PK_WITHOUT_AUTO" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="PK_WO_AUTO" required="true" primaryKey="true" type="INTEGER"/>
<column name="NORMAL_WITH_AUTO" required="false" primaryKey="false" type="INTEGER"/>
- <column name="NORMAL_WITHOUT_AUTO" required="false" primaryKey="false" type="INTEGER"/>
+ <column name="NORMAL_WO_AUTO" required="false" primaryKey="false" type="INTEGER"/>
</table>
<!-- =================================================== -->
<!-- NumberAccuarcyTest -->
<!-- =================================================== -->
- <table name="NUMBER_ACCURACY_TEST">
+ <table name="NUMBER_ACCURACY">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="SCALE_TWO" type="DECIMAL" size="15,6"/>
<column name="SCALE_FOUR" type="DECIMAL" size="15,6"/>
@@ -911,13 +911,13 @@
<column name="FK_REF" type="INTEGER"/>
</table>
- <table name="READTEST_ADDRESS">
+ <table name="READTEST_ADDR">
<column name="OJB_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_REF" type="INTEGER"/>
</table>
- <table name="READTEST_ADDRESS_TYPE">
+ <table name="READTEST_ADDR_TYPE">
<column name="OJB_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_REF" type="INTEGER"/>
@@ -1047,7 +1047,7 @@
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="COL_COLLECTIBLE_A">
+ <table name="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"/>
@@ -1057,7 +1057,7 @@
</foreign-key>
</table>
- <table name="COL_COLLECTIBLE_BASE">
+ <table name="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"/>
@@ -1067,7 +1067,7 @@
</foreign-key>
</table>
- <table name="COL_COLLECTIBLE_B">
+ <table name="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"/>
@@ -1077,7 +1077,7 @@
</foreign-key>
</table>
- <table name="COL_COLLECTIBLE_C">
+ <table name="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"/>
@@ -1088,7 +1088,7 @@
</foreign-key>
</table>
- <table name="COL_COLLECTIBLE_CC">
+ <table name="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"/>
@@ -1099,7 +1099,7 @@
</foreign-key>
</table>
- <table name="COL_COLLECTIBLE_C2">
+ <table name="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"/>
@@ -1110,7 +1110,7 @@
</foreign-key>
</table>
- <table name="COL_COLLECTIBLE_D">
+ <table name="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"/>
@@ -1122,49 +1122,49 @@
</table>
- <table name="COL_2_PROJECT">
+ <table name="COL2_PRJ">
<column name="PRO_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="COL_2_SUB_PROJECT">
+ <table name="COL2_SUBPRJ">
<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="COL_2_PROJECT">
+ <foreign-key foreignTable="COL2_PRJ">
<reference local="FK_PRO_ID" foreign="PRO_ID"/>
</foreign-key>
</table>
- <table name="COL_2_SUB_PROJECT_2">
+ <table name="COL2_SUBPRJ2">
<column name="SUB_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="SUB_DATE" required="true" primaryKey="true" type="TIMESTAMP"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_PRO_ID" type="INTEGER"/>
- <foreign-key foreignTable="COL_2_PROJECT">
+ <foreign-key foreignTable="COL2_PRJ">
<reference local="FK_PRO_ID" foreign="PRO_ID"/>
</foreign-key>
</table>
- <table name="COL_2_DEVELOPER">
+ <table name="COL2_DEV">
<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="COL_2_PROJECT">
+ <foreign-key foreignTable="COL2_PRJ">
<reference local="FK_PRO_ID" foreign="PRO_ID"/>
</foreign-key>
</table>
- <table name="COL_2_SUB_PROJECT_SELF">
+ <table name="COL2_SUBPRJ_SELF">
<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="COL_2_SUB_PROJECT_SELF">
+ <foreign-key foreignTable="COL2_SUBPRJ_SELF">
<reference local="FK_PRO_ID" foreign="SUB_ID"/>
</foreign-key>
</table>
- <table name="COL_2_DEVELOPER_SELF">
+ <table name="COL2_DEV_SELF">
<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="COL_2_SUB_PROJECT_SELF">
+ <foreign-key foreignTable="COL2_SUBPRJ_SELF">
<reference local="FK_PRO_ID" foreign="SUB_ID"/>
</foreign-key>
</table>
@@ -1291,14 +1291,14 @@
<!-- =================================================== -->
<!-- PB nested fields test -->
<!-- =================================================== -->
- <table name="NESTED_FIELDS_TAB">
+ <table name="NESTED_TAB">
<column name="OBJ_ID" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="NESTED_VALUE" type="VARCHAR" size="150"/>
<column name="NESTED_DESCRIPTION" type="VARCHAR" size="150"/>
</table>
- <table name="NESTED_FIELDS_ENTRY">
+ <table name="NESTED_ENTRY">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="FK_ID" required="true" type="DECIMAL" size="15,0"/>
<column name="NAME" type="VARCHAR" size="150"/>
@@ -1325,29 +1325,29 @@
<!-- =================================================== -->
<!-- Mapping Classes on Multiple Joined Tables test -->
<!-- =================================================== -->
- <table name="INHERITANCE_COMPANY">
+ <table name="INH_COMPANY">
<column name="OBJ_ID" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="INHERITANCE_ADDRESS">
+ <table name="INH_ADDRESS">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="STREET" type="VARCHAR" size="150"/>
<column name="FK_EMPLOYEE_1" type="INTEGER"/>
<column name="FK_EMPLOYEE_2" type="DECIMAL" size="15,0"/>
</table>
- <table name="INHERITANCE_EMPLOYEE">
+ <table name="INH_EMPLOYEE">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="OBJ_ID_2" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_ADDRESS" type="INTEGER"/>
- <foreign-key foreignTable="INHERITANCE_ADDRESS">
+ <foreign-key foreignTable="INH_ADDRESS">
<reference local="FK_ADDRESS" foreign="OBJ_ID"/>
</foreign-key>
</table>
- <table name="INHERITANCE_EXECUTIVE">
+ <table name="INH_EXECUTIVE">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="OBJ_ID_2" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="SUPER_ID" type="INTEGER"/>
@@ -1355,66 +1355,66 @@
<column name="MANAGER_ID" type="INTEGER"/>
<column name="MANAGER_ID_2" type="DECIMAL" size="15,0"/>
<column name="DEPARTMENT" type="VARCHAR" size="150"/>
- <foreign-key foreignTable="INHERITANCE_EMPLOYEE">
+ <foreign-key foreignTable="INH_EMPLOYEE">
<reference local="SUPER_ID" foreign="OBJ_ID"/>
<reference local="SUPER_ID_2" foreign="OBJ_ID_2"/>
</foreign-key>
</table>
- <table name="INHERITANCE_MANAGER">
+ <table name="INH_MANAGER">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="OBJ_ID_2" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="FK_CONSORTIUM" type="INTEGER"/>
<column name="SUPER_ID" type="INTEGER"/>
<column name="SUPER_ID_2" type="DECIMAL" size="15,0"/>
- <foreign-key foreignTable="INHERITANCE_EXECUTIVE">
+ <foreign-key foreignTable="INH_EXECUTIVE">
<reference local="SUPER_ID" foreign="OBJ_ID"/>
<reference local="SUPER_ID_2" foreign="OBJ_ID_2"/>
</foreign-key>
</table>
- <table name="INHERITANCE_SHAREHOLDER">
+ <table name="INH_SHAREHOLDER">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="OBJ_ID_2" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="SHARE_" type="INTEGER"/>
<column name="SUPER_ID" type="INTEGER"/>
<column name="SUPER_ID_2" type="DECIMAL" size="15,0"/>
- <foreign-key foreignTable="INHERITANCE_MANAGER">
+ <foreign-key foreignTable="INH_MANAGER">
<reference local="SUPER_ID" foreign="OBJ_ID"/>
<reference local="SUPER_ID_2" foreign="OBJ_ID_2"/>
</foreign-key>
</table>
- <table name="INHERITANCE_EMPLOYEE_ADDRESS">
+ <table name="INH_EMPL_ADDR">
<column name="EMPLOYEE_ID_1" required="true" primaryKey="true" type="INTEGER"/>
<column name="EMPLOYEE_ID_2" required="true" primaryKey="true" type="DECIMAL" size="15,0"/>
<column name="ADDRESS_ID" required="true" primaryKey="true" type="INTEGER"/>
</table>
- <table name="INHERITANCE_CONSORTIUM">
+ <table name="INH_CONSORTIUM">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="INHERITANCE_ENTITY">
+ <table name="INH_ENTITY">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="INHERITANCE_ANIMAL">
+ <table name="INH_ANIMAL">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="WEIGHT" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_PARENT" type="INTEGER"/>
</table>
- <table name="INHERITANCE_DOG">
+ <table name="INH_DOG">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="LEGS" type="INTEGER"/>
</table>
- <table name="INHERITANCE_FOOD">
+ <table name="INH_FOOD">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="FK_ANIMAL" type="INTEGER"/>
</table>
@@ -1423,25 +1423,25 @@
<!-- =================================================== -->
<!-- Runtime reference setting test -->
<!-- =================================================== -->
- <table name="RUNTIME_SETTING_ONE">
+ <table name="RUNTIME_ONE">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
</table>
- <table name="RUNTIME_SETTING_MAIN">
+ <table name="RUNTIME_MAIN">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_REF" type="INTEGER"/>
- <foreign-key foreignTable="RUNTIME_SETTING_ONE">
+ <foreign-key foreignTable="RUNTIME_ONE">
<reference local="FK_REF" foreign="OBJ_ID"/>
</foreign-key>
</table>
- <table name="RUNTIME_SETTING_MANY">
+ <table name="RUNTIME_MANY">
<column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="NAME" type="VARCHAR" size="150"/>
<column name="FK_MAIN" type="INTEGER"/>
- <foreign-key foreignTable="RUNTIME_SETTING_MAIN">
+ <foreign-key foreignTable="RUNTIME_MAIN">
<reference local="FK_MAIN" foreign="OBJ_ID"/>
</foreign-key>
</table>
@@ -1544,7 +1544,7 @@
</foreign-key>
</table>
- <table name="CT_SHOP_DISTRIBUTOR">
+ <table name="CT_SHOP_DIST">
<column name="SHOP_ID" type="INTEGER"/>
<column name="DISTRIBUTOR_ID" type="INTEGER"/>
<foreign-key foreignTable="CT_SHOP">
@@ -1790,34 +1790,6 @@
<reference local="PHONE_NUMBER_ID" foreign="PHONE_NUMBER_ID"/>
</foreign-key>
</table>
- <table name="OJB_HL_SEQ">
- <column name="TABLENAME"
- javaName="tableName"
- type="VARCHAR"
- primaryKey="true"
- required="true"
- size="250"
- />
- <column name="FIELDNAME"
- javaName="fieldName"
- type="VARCHAR"
- primaryKey="true"
- required="true"
- size="250"
- />
- <column name="MAX_KEY"
- javaName="maxKey"
- type="BIGINT"
- />
- <column name="GRAB_SIZE"
- javaName="grabSize"
- type="INTEGER"
- />
- <column name="VERSION"
- javaName="version"
- type="INTEGER"
- />
- </table>
<table name="PHONE_NUMBER">
<column name="PHONE_NUMBER_ID"
javaName="phoneNumberId"
@@ -1918,7 +1890,7 @@
javaName="minimumStock"/>
<column name="Auslaufartikel" type="INTEGER"
javaName="inSelloutArticle"/>
- <foreign-key foreignTable="Kategorien_2">
+ <foreign-key foreignTable="Kategorien_2" name="Artikel2Kateg2FK">
<reference local="KatName" foreign="Kategorie_Name"/>
</foreign-key>
</table>
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/CircularTest.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/CircularTest.java?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/CircularTest.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/CircularTest.java Wed Feb 15 15:45:05 2006
@@ -42,7 +42,7 @@
* - Shop has a FK to ShopDetail<br/>
* - Product has a FK to Product<br/>
* - Product has a FK to Shop<br/>
- * - CT_SHOP_DISTRIBUTOR indirection table has FK's to Shop and Distributor<br/>
+ * - CT_SHOP_DIST indirection table has FK's to Shop and Distributor<br/>
* <p/>
* Here a summery of the dependencies:<br/>
* Shop--1:1-->ShopDetail--1:1-->Shop<br/>
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/quick-db/OJB.script
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/quick-db/OJB.script?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
Binary files - no diff available.
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit.xml
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit.xml?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit.xml Wed Feb 15 15:45:05 2006
@@ -1232,7 +1232,7 @@
<!-- Definitions for org.apache.ojb.broker.LockedByVersion -->
<class-descriptor
class="org.apache.ojb.broker.LockedByVersion"
- table="LOCKED_BY_VERSION"
+ table="VERSIONLOCKED"
>
<field-descriptor
name="id"
@@ -1257,7 +1257,7 @@
<!-- Definitions for org.apache.ojb.broker.LockedByTimestamp -->
<class-descriptor
class="org.apache.ojb.broker.LockedByTimestamp"
- table="LOCKED_BY_TIMESTAMP"
+ table="TIMESTAMPLOCKED"
>
<field-descriptor
name="id"
@@ -2417,7 +2417,7 @@
<field-descriptor
name="pkWithoutAutoIncrement"
- column="PK_WITHOUT_AUTO"
+ column="PK_WO_AUTO"
jdbc-type="INTEGER"
primarykey="true"
autoincrement="false"
@@ -2435,7 +2435,7 @@
<field-descriptor
name="normalWithoutAutoIncrement"
- column="NORMAL_WITHOUT_AUTO"
+ column="NORMAL_WO_AUTO"
jdbc-type="INTEGER"
primarykey="false"
autoincrement="false"
@@ -2446,7 +2446,7 @@
<!-- Field conversion test using PB-api and BigDecimal -->
<class-descriptor
class="org.apache.ojb.broker.FieldConversionTest_3$Node"
- table="FIELD_CONVERSION_NODE"
+ table="FIELDCONV_NODE"
>
<field-descriptor
name="uid"
@@ -2485,7 +2485,7 @@
<!-- Field conversion test using PB-api and BigDecimal -->
<class-descriptor
class="org.apache.ojb.broker.FieldConversionTest_3$NodeWoAutoInc"
- table="FIELD_CONVERSION_NODE_NOINC">
+ table="FIELDCONV_NOINC">
<field-descriptor
name="uid"
column="NODE_ID"
@@ -2502,7 +2502,7 @@
<class-descriptor
class="org.apache.ojb.broker.NumberAccuracyTest$NumberObject"
- table="NUMBER_ACCURACY_TEST"
+ table="NUMBER_ACCURACY"
>
<field-descriptor
name="id"
@@ -2788,7 +2788,7 @@
<!-- ************************************************* -->
<class-descriptor
class="org.apache.ojb.broker.NestedFieldsTest$NestedMain"
- table="NESTED_FIELDS_TAB">
+ table="NESTED_TAB">
<field-descriptor
name="objId"
@@ -2829,7 +2829,7 @@
<class-descriptor
class="org.apache.ojb.broker.NestedFieldsTest$NestedEntry"
- table="NESTED_FIELDS_ENTRY">
+ table="NESTED_ENTRY">
<field-descriptor
name="id"
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_inheritance.xml?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
--- 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 Feb 15 15:45:05 2006
@@ -22,7 +22,7 @@
<!-- =================================================== -->
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Entity"
- table="INHERITANCE_ENTITY"
+ table="INH_ENTITY"
>
<field-descriptor
name="id"
@@ -41,7 +41,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Company"
- table="INHERITANCE_COMPANY"
+ table="INH_COMPANY"
>
<field-descriptor
name="id"
@@ -86,7 +86,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Employee"
- table="INHERITANCE_EMPLOYEE"
+ table="INH_EMPLOYEE"
>
<!-- This is the base class of the object hierarchy,
so we use autoincrement for one PK field. The other
@@ -129,7 +129,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Executive"
- table="INHERITANCE_EXECUTIVE"
+ table="INH_EXECUTIVE"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
@@ -185,7 +185,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Manager"
- table="INHERITANCE_MANAGER"
+ table="INH_MANAGER"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
@@ -231,7 +231,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Shareholder"
- table="INHERITANCE_SHAREHOLDER"
+ table="INH_SHAREHOLDER"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
@@ -266,7 +266,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Consortium"
- table="INHERITANCE_CONSORTIUM"
+ table="INH_CONSORTIUM"
>
<field-descriptor
name="id"
@@ -307,7 +307,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Address"
- table="INHERITANCE_ADDRESS"
+ table="INH_ADDRESS"
>
<field-descriptor
name="id"
@@ -327,7 +327,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Animal"
- table="INHERITANCE_ANIMAL"
+ table="INH_ANIMAL"
>
<field-descriptor
name="id"
@@ -374,7 +374,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Dog"
- table="INHERITANCE_DOG"
+ table="INH_DOG"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
@@ -400,7 +400,7 @@
<class-descriptor
class="org.apache.ojb.broker.InheritanceMultipleTableTest$Food"
- table="INHERITANCE_FOOD"
+ table="INH_FOOD"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_odmg.xml
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_odmg.xml?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_odmg.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_odmg.xml Wed Feb 15 15:45:05 2006
@@ -240,7 +240,7 @@
<class-descriptor
class="org.apache.ojb.odmg.shared.DetailFKinPK"
- table="MDTEST_DETAIL_FKINPK"
+ table="MDTEST_FKINPK"
>
<field-descriptor
name="masterId"
@@ -275,7 +275,7 @@
<class-descriptor
class="org.apache.ojb.odmg.shared.DetailFKnoPK"
- table="MDTEST_DETAIL_FKNOPK"
+ table="MDTEST_FKNOPK"
>
<field-descriptor
name="detailId"
@@ -575,7 +575,7 @@
note, we do not use autoincrement -->
<class-descriptor
class="org.apache.ojb.odmg.FieldConversionTest_4$Node"
- table="FIELD_CONVERSION_NODE"
+ table="FIELDCONV_NODE"
>
<field-descriptor
name="uid"
@@ -752,7 +752,7 @@
-->
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$CollectibleA"
- table="COL_COLLECTIBLE_A">
+ table="COLLECTIBLE_A">
<field-descriptor
name="colId"
@@ -792,7 +792,7 @@
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$CollectibleB"
- table="COL_COLLECTIBLE_B">
+ table="COLLECTIBLE_B">
<field-descriptor
name="colId"
@@ -832,7 +832,7 @@
<class-descriptor
class="org.apache.ojb.odmg.CollectionsTest$CollectibleC"
- table="COL_COLLECTIBLE_C">
+ table="COLLECTIBLE_C">
<field-descriptor
name="colId"
@@ -1371,7 +1371,7 @@
<!-- =================================================== -->
<class-descriptor
class="org.apache.ojb.odmg.InheritanceMultipleTableTest$Employee"
- table="INHERITANCE_EMPLOYEE"
+ table="INH_EMPLOYEE"
>
<field-descriptor
name="id"
@@ -1425,7 +1425,7 @@
<collection-descriptor
name="carrels"
element-class-ref="org.apache.ojb.odmg.InheritanceMultipleTableTest$Address"
- indirection-table="INHERITANCE_EMPLOYEE_ADDRESS"
+ indirection-table="INH_EMPL_ADDR"
proxy="false"
auto-retrieve="true"
auto-update="none"
@@ -1439,7 +1439,7 @@
<class-descriptor
class="org.apache.ojb.odmg.InheritanceMultipleTableTest$Executive"
- table="INHERITANCE_EXECUTIVE"
+ table="INH_EXECUTIVE"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
@@ -1496,7 +1496,7 @@
<class-descriptor
class="org.apache.ojb.odmg.InheritanceMultipleTableTest$Manager"
- table="INHERITANCE_MANAGER"
+ table="INH_MANAGER"
>
<!-- auto-increment of PK field is handled by base class -->
<field-descriptor
@@ -1536,7 +1536,7 @@
<class-descriptor
class="org.apache.ojb.odmg.InheritanceMultipleTableTest$Address"
- table="INHERITANCE_ADDRESS"
+ table="INH_ADDRESS"
>
<field-descriptor
name="id"
@@ -1566,7 +1566,7 @@
<collection-descriptor
name="employees"
element-class-ref="org.apache.ojb.odmg.InheritanceMultipleTableTest$Employee"
- indirection-table="INHERITANCE_EMPLOYEE_ADDRESS"
+ indirection-table="INH_EMPL_ADDR"
proxy="false"
auto-retrieve="true"
auto-update="none"
@@ -1981,7 +1981,7 @@
name="distributors"
collection-class="org.apache.ojb.broker.util.collections.ManageableArrayList"
element-class-ref="org.apache.ojb.odmg.CircularTest$Distributor"
- indirection-table="CT_SHOP_DISTRIBUTOR"
+ indirection-table="CT_SHOP_DIST"
proxy="false"
auto-retrieve="true"
auto-update="none"
@@ -2015,7 +2015,7 @@
name="shops"
collection-class="org.apache.ojb.broker.util.collections.ManageableArrayList"
element-class-ref="org.apache.ojb.odmg.CircularTest$Shop"
- indirection-table="CT_SHOP_DISTRIBUTOR"
+ indirection-table="CT_SHOP_DIST"
proxy="false"
auto-retrieve="true"
auto-update="none"
@@ -2289,7 +2289,7 @@
<class-descriptor
class="org.apache.ojb.odmg.LockingTest$LockObject"
- table="LOCKED_BY_VERSION"
+ table="VERSIONLOCKED"
>
<field-descriptor
name="id"
@@ -2307,7 +2307,7 @@
<class-descriptor
class="org.apache.ojb.odmg.LockingTest$LockObjectOpt"
- table="LOCKED_BY_VERSION"
+ table="VERSIONLOCKED"
>
<field-descriptor
name="id"
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_reference.xml
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_reference.xml?rev=378122&r1=378121&r2=378122&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_reference.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/repository_junit_reference.xml Wed Feb 15 15:45:05 2006
@@ -844,7 +844,7 @@
-->
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleBase"
- table="COL_COLLECTIBLE_BASE">
+ table="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="COL_COLLECTIBLE_B">
+ table="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="COL_COLLECTIBLE_C">
+ table="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="COL_COLLECTIBLE_CC">
+ table="COLLECTIBLE_CC">
<field-descriptor
name="colId"
@@ -982,7 +982,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleC2"
- table="COL_COLLECTIBLE_C2">
+ table="COLLECTIBLE_C2">
<field-descriptor
name="colId"
@@ -1025,7 +1025,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleD"
- table="COL_COLLECTIBLE_D">
+ table="COLLECTIBLE_D">
<field-descriptor
name="colId"
@@ -1057,7 +1057,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest$CollectibleDD"
- table="COL_COLLECTIBLE_D">
+ table="COLLECTIBLE_D">
<field-descriptor
name="colId"
@@ -1442,7 +1442,7 @@
<class-descriptor
class="org.apache.ojb.broker.MultithreadedReadTest$AddressImpl"
- table="READTEST_ADDRESS"
+ table="READTEST_ADDR"
proxy="dynamic"
>
<field-descriptor
@@ -1480,7 +1480,7 @@
<class-descriptor
class="org.apache.ojb.broker.MultithreadedReadTest$AddressTypeImpl"
- table="READTEST_ADDRESS_TYPE"
+ table="READTEST_ADDR_TYPE"
proxy="dynamic"
>
<field-descriptor
@@ -1736,7 +1736,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$Project"
- table="COL_2_PROJECT"
+ table="COL2_PRJ"
>
<field-descriptor
@@ -1789,7 +1789,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$SubProject"
- table="COL_2_SUB_PROJECT"
+ table="COL2_SUBPRJ"
>
<field-descriptor
@@ -1827,7 +1827,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$SubProject_2"
- table="COL_2_SUB_PROJECT_2"
+ table="COL2_SUBPRJ2"
>
<field-descriptor
@@ -1873,7 +1873,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$Developer"
- table="COL_2_DEVELOPER"
+ table="COL2_DEV"
>
<field-descriptor
@@ -1900,7 +1900,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$SubProjectSelfRef"
- table="COL_2_SUB_PROJECT_SELF"
+ table="COL2_SUBPRJ_SELF"
>
<field-descriptor
@@ -1949,7 +1949,7 @@
<class-descriptor
class="org.apache.ojb.broker.CollectionTest2$DeveloperSelf"
- table="COL_2_DEVELOPER_SELF"
+ table="COL2_DEV_SELF"
>
<field-descriptor
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org