dain 2004/10/14 21:49:11
Modified: modules/itests/src/itest/org/openejb/test
AxionTestDatabase.java
Log:
Committed Gianny's massive patch:
http://jira.codehaus.org/browse/OPENEJB-13
This adds support for the following:
* CMP sql mapping
* CMR support
* Compound primary key
* Unknown primary key
There are still a few weirdisms...
* Full sql mapping is now required
* SQL is now compiled against physical schema names instead of logical schema names
Revision Changes Path
1.5 +8 -32
openejb/modules/itests/src/itest/org/openejb/test/AxionTestDatabase.java
Index: AxionTestDatabase.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/src/itest/org/openejb/test/AxionTestDatabase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxionTestDatabase.java 14 Oct 2004 07:07:17 -0000 1.4
+++ AxionTestDatabase.java 15 Oct 2004 01:49:11 -0000 1.5
@@ -21,29 +21,17 @@
private static final String CREATE_ENTITY = "CREATE TABLE entity ( id integer
default entity_seq.nextval, first_name string, last_name string )";
private static final String DROP_ENTITY = "DROP TABLE entity";
- private static final String CREATE_BASICCMP = "CREATE TABLE BASICCMP2 ( id
integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_BASICCMP = "DROP TABLE BASICCMP2";
+ private static final String CREATE_BASICCMP = "CREATE TABLE BasicCmp ( id
integer default entity_seq.nextval, firstName string, lastName string )";
+ private static final String DROP_BASICCMP = "DROP TABLE BasicCmp";
- private static final String CREATE_AOBASICCMP = "CREATE TABLE AOBASICCMP2 ( id
integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_AOBASICCMP = "DROP TABLE AOBASICCMP2";
+ private static final String CREATE_AOBASICCMP = "CREATE TABLE AOBasicCmp ( id
integer default entity_seq.nextval, firstName string, lastName string )";
+ private static final String DROP_AOBASICCMP = "DROP TABLE AOBasicCmp";
- private static final String CREATE_ENCCMP = "CREATE TABLE ENCCMP2 ( id integer
default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_ENCCMP = "DROP TABLE ENCCMP2";
+ private static final String CREATE_ENCCMP = "CREATE TABLE EncCmp ( id integer
default entity_seq.nextval, firstName string, lastName string )";
+ private static final String DROP_ENCCMP = "DROP TABLE EncCmp";
- private static final String CREATE_CMPRMIIIOP = "CREATE TABLE CMP2RMIIIOP ( id
integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_CMPRMIIIOP = "DROP TABLE CMP2RMIIIOP";
-
- private static final String CREATE_BASICCMP2 = "CREATE TABLE BASICCMPBEAN ( id
integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_BASICCMP2 = "DROP TABLE BASICCMPBEAN";
-
- private static final String CREATE_AOBASICCMP2 = "CREATE TABLE AOBASICCMPBEAN (
id integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_AOBASICCMP2 = "DROP TABLE AOBASICCMPBEAN";
-
- private static final String CREATE_ENCCMP2 = "CREATE TABLE ENCCMPBEAN ( id
integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_ENCCMP2 = "DROP TABLE ENCCMPBEAN";
-
- private static final String CREATE_CMPRMIIIOP2 = "CREATE TABLE CMPRMIIIOPBEAN (
id integer default entity_seq.nextval, firstname string, lastname string )";
- private static final String DROP_CMPRMIIIOP2 = "DROP TABLE CMPRMIIIOPBEAN";
+ private static final String CREATE_CMPRMIIIOP = "CREATE TABLE CmpRmiIiop ( id
integer default entity_seq.nextval, firstName string, lastName string )";
+ private static final String DROP_CMPRMIIIOP = "DROP TABLE CmpRmiIiop";
private static final String CREATE_ENTITY_SEQ = "CREATE SEQUENCE entity_seq";
private static final String DROP_ENTITY_SEQ = "DROP SEQUENCE entity_seq";
@@ -58,18 +46,10 @@
executeStatementIgnoreErrors(DROP_ENCCMP);
executeStatementIgnoreErrors(DROP_BASICCMP);
executeStatementIgnoreErrors(DROP_AOBASICCMP);
- executeStatementIgnoreErrors(DROP_CMPRMIIIOP2);
- executeStatementIgnoreErrors(DROP_ENCCMP2);
- executeStatementIgnoreErrors(DROP_BASICCMP2);
- executeStatementIgnoreErrors(DROP_AOBASICCMP2);
executeStatementIgnoreErrors(DROP_ENTITY);
executeStatementIgnoreErrors(DROP_ENTITY_SEQ);
executeStatement(CREATE_ENTITY_SEQ);
executeStatement(CREATE_ENTITY);
- executeStatement(CREATE_BASICCMP2);
- executeStatement(CREATE_AOBASICCMP2);
- executeStatement(CREATE_ENCCMP2);
- executeStatement(CREATE_CMPRMIIIOP2);
executeStatement(CREATE_BASICCMP);
executeStatement(CREATE_AOBASICCMP);
executeStatement(CREATE_ENCCMP);
@@ -81,10 +61,6 @@
executeStatement(DROP_ENCCMP);
executeStatement(DROP_BASICCMP);
executeStatement(DROP_AOBASICCMP);
- executeStatement(DROP_CMPRMIIIOP2);
- executeStatement(DROP_ENCCMP2);
- executeStatement(DROP_BASICCMP2);
- executeStatement(DROP_AOBASICCMP2);
executeStatement(DROP_ENTITY);
executeStatement(DROP_ENTITY_SEQ);
}
