Index: cpactf/src/test/ddl/org/castor/cpa/test/test1158/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1158/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1158/oracle.sql (revision 0) @@ -0,0 +1,23 @@ +DROP TABLE test1158_extended CASCADE CONSTRAINTS; + +CREATE TABLE test1158_extended ( + id int NOT NULL, + description2 varchar(50) NOT NULL +); + +ALTER TABLE test1158_extended ADD PRIMARY KEY (id); + +INSERT INTO test1158_extended VALUES (1, 'This is the extended object.'); + + +DROP TABLE test1158_object CASCADE CONSTRAINTS; + +CREATE TABLE test1158_object ( + id int NOT NULL, + description varchar(50) NOT NULL, + saved char(1) +); + +ALTER TABLE test1158_object ADD PRIMARY KEY (id); + +INSERT INTO test1158_object VALUES (1, 'This is the test object.', ' '); Index: cpactf/src/test/ddl/org/castor/cpa/test/test2177/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test2177/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test2177/oracle.sql (revision 0) @@ -0,0 +1,8 @@ +DROP TABLE test2177_entity CASCADE CONSTRAINTS; + +CREATE TABLE test2177_entity ( + id int not null, + name varchar(200) not null +); + +INSERT INTO test2177_entity (id, name) VALUES (1, 'entity1'); Index: cpactf/src/test/ddl/org/castor/cpa/test/test87/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test87/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test87/oracle.sql (revision 0) @@ -0,0 +1,52 @@ +DROP TABLE test87_entity CASCADE CONSTRAINTS; + +CREATE TABLE test87_entity ( + id int not null, + name varchar(200) not null, + timestamp numeric(18,0) not null +); + +CREATE UNIQUE INDEX test87_entity_pk ON test87_entity ( id ); + + + +DROP TABLE test87_product CASCADE CONSTRAINTS; + +CREATE TABLE test87_product ( + id int not null, + name varchar(200) not null, + group_id int not null, + timestamp numeric(18,0) not null +); + +CREATE UNIQUE INDEX test87_product_pk ON test87_product ( id ); + +DROP TABLE test87_group CASCADE CONSTRAINTS; + +CREATE TABLE test87_group ( + id int not null, + name varchar(200) not null, + timestamp numeric(18,0) not null +); + +CREATE UNIQUE INDEX test87_group_pk ON test87_group ( id ); + + + +DROP TABLE test87_extended CASCADE CONSTRAINTS; +DROP TABLE test87_base CASCADE CONSTRAINTS; + +CREATE TABLE test87_base ( + id int not null, + name varchar(200) not null, + timestamp numeric(18,0) not null +); + +CREATE UNIQUE INDEX test87_base_pk ON test87_base ( id ); + +CREATE TABLE test87_extended ( + id int not null, + note varchar(200) not null +); + +CREATE UNIQUE INDEX test87_extended_pk ON test87_extended ( id ); Index: cpactf/src/test/java/org/castor/cpa/test/test87/TestRelation.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test87/TestRelation.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test87/TestRelation.java (working copy) @@ -41,7 +41,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.ORACLE); } public void delete() throws Exception { Index: cpactf/src/test/resources/cpactf-conf.xml =================================================================== --- cpactf/src/test/resources/cpactf-conf.xml (revision 7978) +++ cpactf/src/test/resources/cpactf-conf.xml (working copy) @@ -85,19 +85,19 @@ Database configuration for Oracle - - + Database configuration for Oracle - + - + Index: cpactf/src/test/ddl/org/castor/cpa/test/test31/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test31/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test31/oracle.sql (revision 0) @@ -0,0 +1,52 @@ +DROP TABLE test31_relation CASCADE CONSTRAINTS; +DROP TABLE test31_extends2 CASCADE CONSTRAINTS; +DROP TABLE test31_extends1 CASCADE CONSTRAINTS; +DROP TABLE test31_related CASCADE CONSTRAINTS; +DROP TABLE test31_persistent CASCADE CONSTRAINTS; +DROP TABLE test31_group CASCADE CONSTRAINTS; + +CREATE TABLE test31_group ( + id numeric(10,0) not null, + value1 varchar(200) not null +); + +CREATE UNIQUE INDEX test31_group_pk on test31_group ( id ); + +CREATE TABLE test31_persistent ( + id integer not null, + ctime date not null, + mtime date null, + value1 varchar(200) not null, + parent_id integer null, + group_id numeric(10,0) not null +); + +CREATE UNIQUE INDEX test31_persistent_pk on test31_persistent ( id ); + +CREATE TABLE test31_related ( + id integer not null, + persist_id integer not null +); + +CREATE UNIQUE INDEX test31_related_pk on test31_related ( id ); + +CREATE TABLE test31_extends1 ( + ident integer not null, + ext integer not null +); + +CREATE UNIQUE INDEX test31_extends1_pk on test31_extends1 ( ident ); + +CREATE TABLE test31_extends2 ( + id integer not null, + ext integer not null +); + +CREATE UNIQUE INDEX test31_extends2_pk on test31_extends2 ( id ); + +CREATE TABLE test31_relation ( + id1 integer not null, + id2 integer not null +); + +CREATE UNIQUE INDEX test31_relation_pk on test31_relation ( id1, id2 ); Index: cpactf/src/test/ddl/org/castor/cpa/test/test1206/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1206/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1206/oracle.sql (revision 0) @@ -0,0 +1,21 @@ +DROP TABLE TEST1206_STATE CASCADE CONSTRAINTS; + +DROP TABLE TEST1206_COUNTRY CASCADE CONSTRAINTS; + +CREATE TABLE TEST1206_COUNTRY ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL +); + +ALTER TABLE TEST1206_COUNTRY ADD PRIMARY KEY (OID); + +CREATE TABLE TEST1206_STATE ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL, + COUNTRY VARCHAR(8) NOT NULL +); + +ALTER TABLE TEST1206_STATE ADD PRIMARY KEY (OID); + +ALTER TABLE TEST1206_STATE ADD FOREIGN KEY (COUNTRY) +REFERENCES TEST1206_COUNTRY (OID); Index: cpactf/src/test/java/org/castor/cpa/test/test87/TestSimple.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test87/TestSimple.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test87/TestSimple.java (working copy) @@ -43,7 +43,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.ORACLE); } public void delete() throws Exception { Index: cpactf/src/test/ddl/org/castor/cpa/test/test2527/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test2527/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test2527/oracle.sql (revision 0) @@ -0,0 +1,71 @@ +DROP TABLE TEST2527_LOG_REFERENCE CASCADE CONSTRAINTS; +DROP TABLE TEST2527_LOG_EXCEPTION CASCADE CONSTRAINTS; +DROP TABLE TEST2527_LOG CASCADE CONSTRAINTS; + + +CREATE TABLE TEST2527_LOG ( + ID INT NOT NULL, + STAMP TIMESTAMP NOT NULL, + SOURCE VARCHAR(100) NOT NULL, + LLEVEL VARCHAR(10) NOT NULL, + MESSAGE VARCHAR(500) NULL +); + + +ALTER TABLE TEST2527_LOG ADD PRIMARY KEY (ID); + + +CREATE TABLE TEST2527_LOG_EXCEPTION ( + ID INT NOT NULL, + ENTRY_ID INT NOT NULL, + STACKTRACE CLOB NOT NULL +); + +ALTER TABLE TEST2527_LOG_EXCEPTION ADD PRIMARY KEY (ID); + +ALTER TABLE TEST2527_LOG_EXCEPTION +ADD CONSTRAINT TEST2527_LOG_EXCEPTION_FK +FOREIGN KEY (ENTRY_ID) REFERENCES TEST2527_LOG (ID); + + +CREATE TABLE TEST2527_LOG_REFERENCE ( + ID INT NOT NULL, + TYPE VARCHAR(100) NOT NULL, + VALUE VARCHAR(100) NOT NULL +); + +ALTER TABLE TEST2527_LOG_REFERENCE ADD PRIMARY KEY (ID); + +ALTER TABLE TEST2527_LOG_REFERENCE +ADD CONSTRAINT TEST2527_LOG_REFERENZ_FK +FOREIGN KEY (ID) REFERENCES TEST2527_LOG (ID); + + +INSERT INTO TEST2527_LOG VALUES (1, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test1', 'level', 'simple log entry 1'); +INSERT INTO TEST2527_LOG VALUES (2, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test1', 'level', 'simple log entry 2'); + +INSERT INTO TEST2527_LOG VALUES (3, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test2', 'level', 'exception log entry 1'); +INSERT INTO TEST2527_LOG_EXCEPTION VALUES (1, 3, 'stacktrace for exception log entry 1'); +INSERT INTO TEST2527_LOG VALUES (4, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test2', 'level', 'exception log entry 2'); +INSERT INTO TEST2527_LOG_EXCEPTION VALUES (2, 4, 'stacktrace for exception log entry 2'); + +INSERT INTO TEST2527_LOG VALUES (5, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test3', 'level', 'refering log entry 1'); +INSERT INTO TEST2527_LOG_REFERENCE VALUES (5, 'type', 'ref 1'); +INSERT INTO TEST2527_LOG VALUES (6, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test3', 'level', 'refering log entry 2'); +INSERT INTO TEST2527_LOG_REFERENCE VALUES (6, 'type', 'ref 2'); + +INSERT INTO TEST2527_LOG VALUES (7, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test4', 'level', 'simple and exception log entry 1'); +INSERT INTO TEST2527_LOG VALUES (8, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test4', 'level', 'simple and exception log entry 2'); +INSERT INTO TEST2527_LOG_EXCEPTION VALUES (3, 8, 'stacktrace for simple and exception log entry 2'); +INSERT INTO TEST2527_LOG VALUES (9, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test4', 'level', 'simple and exception log entry 3'); + +INSERT INTO TEST2527_LOG VALUES (10, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test5', 'level', 'simple and refering log entry 1'); +INSERT INTO TEST2527_LOG VALUES (11, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test5', 'level', 'simple and refering log entry 2'); +INSERT INTO TEST2527_LOG_REFERENCE VALUES (11, 'type', 's+r 2'); +INSERT INTO TEST2527_LOG VALUES (12, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test5', 'level', 'simple and refering log entry 3'); + +INSERT INTO TEST2527_LOG VALUES (13, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test6', 'level', 'exception, refering and simple log entry 1'); +INSERT INTO TEST2527_LOG_EXCEPTION VALUES (4, 13, 'stacktrace for exception, refering and simple log entry 1'); +INSERT INTO TEST2527_LOG VALUES (14, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test6', 'level', 'exception, refering and simple log entry 2'); +INSERT INTO TEST2527_LOG_REFERENCE VALUES (14, 'type', 'e+r+s 2'); +INSERT INTO TEST2527_LOG VALUES (15, to_timestamp('2008-12-31 12:34:56','RRRR-MM-DD HH24:MI:SSXFF'), 'test6', 'level', 'exception, refering and simple log entry 3'); Index: cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLCountFunction.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLCountFunction.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLCountFunction.java (working copy) @@ -46,8 +46,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void setUp() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test1355/Test1355.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test1355/Test1355.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test1355/Test1355.java (working copy) @@ -34,8 +34,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } /** @@ -53,7 +54,7 @@ GolfCourse course = (GolfCourse) queryResults.next(); // shouldn't have to load city, but Castor 1.0M3 throws an exception without - // debug("Loaded " + course.getCity().getId()); + // LOG.debug("Loaded " + course.getCity().getId()); Iterator < GolfCourseTees > tees = course.getTees().iterator(); while (tees.hasNext()) { Index: cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLPassThrough.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLPassThrough.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLPassThrough.java (working copy) @@ -40,8 +40,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void setUp() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test31/TestPersistenceWithExtends.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test31/TestPersistenceWithExtends.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test31/TestPersistenceWithExtends.java (working copy) @@ -40,8 +40,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY); } public void setUp() throws Exception { Index: cpactf/src/test/ddl/org/castor/cpa/test/test954/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test954/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test954/oracle.sql (revision 0) @@ -0,0 +1,8 @@ +DROP TABLE test954_prod CASCADE CONSTRAINTS; + +CREATE TABLE test954_prod ( + id int not null, + name varchar(200) not null +); + +INSERT INTO test954_prod VALUES (1, 'This is the test object.'); Index: src/doc/release-notes.xml =================================================================== --- src/doc/release-notes.xml (revision 7975) +++ src/doc/release-notes.xml (working copy) @@ -47,6 +47,26 @@ + + + Enabled execution of new cpactf test suite against oracle. + + + Ralf Joachim + ralf.joachim@syscon.eu + + + Ralf Joachim + ralf.joachim@syscon.eu + + + Ralf Joachim + ralf.joachim@syscon.eu + + Task + JDO + 20081118 + Fixed SQLException 'Invalid column type' at execution of query. Index: cpactf/src/test/ddl/org/castor/cpa/test/test1379/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1379/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1379/oracle.sql (revision 0) @@ -0,0 +1,14 @@ +DROP TABLE test1379_prod CASCADE CONSTRAINTS; + +CREATE TABLE test1379_prod ( + id int not null, + name varchar(200) not null, + price numeric(18,2) not null +); + +DROP TABLE test1379_computer CASCADE CONSTRAINTS; + +CREATE TABLE test1379_computer ( + id int not null, + cpu varchar(200) not null +); Index: cpactf/src/test/ddl/org/castor/cpa/test/test356/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test356/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test356/oracle.sql (revision 0) @@ -0,0 +1,14 @@ +DROP TABLE test356_entity CASCADE CONSTRAINTS; + +CREATE TABLE test356_entity ( + id int not null, + prop int +); + +ALTER TABLE test356_entity ADD PRIMARY KEY (id); + +INSERT INTO test356_entity (id, prop) VALUES (1, 100); +INSERT INTO test356_entity (id, prop) VALUES (2, 200); +INSERT INTO test356_entity (id, prop) VALUES (3, 300); +INSERT INTO test356_entity (id, prop) VALUES (4, 400); +INSERT INTO test356_entity (id, prop) VALUES (5, null); Index: cpactf/src/test/java/org/castor/cpa/test/test881/Test881.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test881/Test881.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test881/Test881.java (working copy) @@ -35,8 +35,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void testLoadConfA() throws Exception { Index: cpactf/src/test/ddl/org/castor/cpa/test/test30/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test30/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test30/oracle.sql (revision 0) @@ -0,0 +1,28 @@ +DROP TABLE test30_extends CASCADE CONSTRAINTS; +DROP TABLE test30_entity CASCADE CONSTRAINTS; + +CREATE TABLE test30_entity ( + id int not null, + value1 varchar(200) not null, + value2 varchar(200) +); + +CREATE UNIQUE INDEX test30_entity_pk on test30_entity ( id ); + +CREATE TABLE test30_extends ( + id int not null, + value3 varchar(200) null, + value4 varchar(200) null +); + +CREATE UNIQUE INDEX test30_extends_pk on test30_extends ( id ); + + +DROP TABLE test30_group CASCADE CONSTRAINTS; + +CREATE TABLE test30_group ( + id numeric(10,0) not null, + value1 varchar(200) not null +); + +CREATE UNIQUE INDEX test30_group_pk on test30_group ( id ); Index: cpactf/src/old/resources/jdo/oracle.xml =================================================================== --- cpactf/src/old/resources/jdo/oracle.xml (revision 7955) +++ cpactf/src/old/resources/jdo/oracle.xml (working copy) @@ -4,19 +4,16 @@ - Index: cpactf/src/test/ddl/org/castor/cpa/test/test1002/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1002/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1002/oracle.sql (revision 0) @@ -0,0 +1,8 @@ +DROP TABLE test1002_prod CASCADE CONSTRAINTS; + +CREATE TABLE test1002_prod ( + id int not null, + name varchar(200) not null +); + +INSERT INTO test1002_prod VALUES (1, 'This is the test object.'); Index: cpactf/src/test/resources/org/castor/cpa/test/test1355/mapping.xml =================================================================== --- cpactf/src/test/resources/org/castor/cpa/test/test1355/mapping.xml (revision 7978) +++ cpactf/src/test/resources/org/castor/cpa/test/test1355/mapping.xml (working copy) @@ -94,7 +94,7 @@ - + @@ -203,10 +203,10 @@ - - - - - - + + + + + + Index: cpactf/src/test/ddl/org/castor/cpa/test/test2527/mysql.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test2527/mysql.sql (revision 7955) +++ cpactf/src/test/ddl/org/castor/cpa/test/test2527/mysql.sql (working copy) @@ -7,7 +7,7 @@ ID INT NOT NULL, STAMP TIMESTAMP NOT NULL, SOURCE VARCHAR(100) NOT NULL, - LEVEL VARCHAR(10) NOT NULL, + LLEVEL VARCHAR(10) NOT NULL, MESSAGE VARCHAR(500) NULL ); Index: cpactf/src/test/ddl/org/castor/cpa/test/test1355/mysql.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1355/mysql.sql (revision 7955) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1355/mysql.sql (working copy) @@ -71,7 +71,7 @@ CREATE TABLE test1355_golf_course_holes ( ID BIGINT NOT NULL, COURSE_TEES_ID BIGINT NOT NULL, - NUMBER INTEGER NOT NULL, + NUM INTEGER NOT NULL, HOLE_NAME VARCHAR(100) , PAR INTEGER , YARDAGE INTEGER , @@ -87,68 +87,68 @@ insert into test1355_golf_course (ID, COURSE_NAME, HOLES, CITY_ID) values ('1', 'West Seattle', '18', '1'); insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('1', '1', 'White', 'white'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('1', '1', '1', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('2', '1', '2', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('3', '1', '3', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('4', '1', '4', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('5', '1', '5', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('6', '1', '6', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('7', '1', '7', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('8', '1', '8', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('9', '1', '9', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('1', '1', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('2', '1', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('3', '1', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('4', '1', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('5', '1', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('6', '1', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('7', '1', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('8', '1', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('9', '1', '9', '4'); insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('2', '1', 'Blue', 'blue'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('10', '2', '1', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('11', '2', '2', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('12', '2', '3', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('13', '2', '4', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('14', '2', '5', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('15', '2', '6', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('16', '2', '7', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('17', '2', '8', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('18', '2', '9', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('10', '2', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('11', '2', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('12', '2', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('13', '2', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('14', '2', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('15', '2', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('16', '2', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('17', '2', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('18', '2', '9', '4'); insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('3', '1', 'Red', 'red'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('19', '3', '1', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('20', '3', '2', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('21', '3', '3', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('22', '3', '4', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('23', '3', '5', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('24', '3', '6', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('25', '3', '7', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('26', '3', '8', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('27', '3', '9', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('19', '3', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('20', '3', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('21', '3', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('22', '3', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('23', '3', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('24', '3', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('25', '3', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('26', '3', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('27', '3', '9', '4'); insert into test1355_golf_course (ID, COURSE_NAME, HOLES, CITY_ID) values ('2', 'Jackson Park', '18', '1'); insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('4', '2', 'White', 'white'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('28', '4', '1', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('29', '4', '2', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('30', '4', '3', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('31', '4', '4', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('32', '4', '5', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('33', '4', '6', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('34', '4', '7', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('35', '4', '8', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('36', '4', '9', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('28', '4', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('29', '4', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('30', '4', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('31', '4', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('32', '4', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('33', '4', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('34', '4', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('35', '4', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('36', '4', '9', '4'); insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('5', '2', 'Blue', 'blue'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('37', '5', '1', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('38', '5', '2', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('39', '5', '3', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('40', '5', '4', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('41', '5', '5', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('42', '5', '6', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('43', '5', '7', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('44', '5', '8', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('45', '5', '9', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('37', '5', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('38', '5', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('39', '5', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('40', '5', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('41', '5', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('42', '5', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('43', '5', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('44', '5', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('45', '5', '9', '4'); insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('6', '2', 'Red', 'red'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('46', '6', '1', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('47', '6', '2', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('48', '6', '3', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('49', '6', '4', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('50', '6', '5', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('51', '6', '6', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('52', '6', '7', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('53', '6', '8', '4'); -insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUMBER, PAR) values ('54', '6', '9', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('46', '6', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('47', '6', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('48', '6', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('49', '6', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('50', '6', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('51', '6', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('52', '6', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('53', '6', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('54', '6', '9', '4'); Index: cpactf/src/test/java/org/castor/cpa/test/test2177/Test2177.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test2177/Test2177.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test2177/Test2177.java (working copy) @@ -26,8 +26,9 @@ public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } Index: cpactf/src/test/java/org/castor/cpa/test/test1379/Test1379.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test1379/Test1379.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test1379/Test1379.java (working copy) @@ -15,8 +15,9 @@ private static final String MAPPING = "/org/castor/cpa/test/test1379/mapping.xml"; public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void test() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test87/TestExtended.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test87/TestExtended.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test87/TestExtended.java (working copy) @@ -49,7 +49,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.ORACLE); } public void delete() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test2527/Test2527.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test2527/Test2527.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test2527/Test2527.java (working copy) @@ -30,7 +30,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.ORACLE); } public void test() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test1196/TestLongTransaction.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test1196/TestLongTransaction.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test1196/TestLongTransaction.java (working copy) @@ -41,7 +41,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.ORACLE); } public void deleteUnidirectional() throws Exception { Index: cpactf/src/test/resources/org/castor/cpa/test/test1196/mapping.xml =================================================================== --- cpactf/src/test/resources/org/castor/cpa/test/test1196/mapping.xml (revision 7978) +++ cpactf/src/test/resources/org/castor/cpa/test/test1196/mapping.xml (working copy) @@ -82,7 +82,7 @@ - + @@ -97,7 +97,7 @@ - + Index: cpactf/src/test/java/org/castor/cpa/test/test356/Test356.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test356/Test356.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test356/Test356.java (working copy) @@ -59,8 +59,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void testDoubleEntities() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLCondition.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLCondition.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test30/TestOQLCondition.java (working copy) @@ -43,8 +43,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void setUp() throws Exception { Index: cpactf/src/test/ddl/org/castor/cpa/test/test1196/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1196/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1196/oracle.sql (revision 0) @@ -0,0 +1,100 @@ +DROP TABLE TEST1196_STATE CASCADE CONSTRAINTS; + +DROP TABLE TEST1196_COUNTRY CASCADE CONSTRAINTS; + +CREATE TABLE TEST1196_COUNTRY ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL +); + +ALTER TABLE TEST1196_COUNTRY ADD PRIMARY KEY (OID); + +CREATE TABLE TEST1196_STATE ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL, + COUNTRY VARCHAR(8) NOT NULL +); + +ALTER TABLE TEST1196_STATE ADD PRIMARY KEY (OID); + +ALTER TABLE TEST1196_STATE ADD FOREIGN KEY (COUNTRY) +REFERENCES TEST1196_COUNTRY (OID); + + +DROP TABLE TEST1196_CAR CASCADE CONSTRAINTS; + +DROP TABLE TEST1196_DRIVER CASCADE CONSTRAINTS; + +CREATE TABLE TEST1196_CAR ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL, + DRIVER VARCHAR(8) +); + +ALTER TABLE TEST1196_CAR ADD PRIMARY KEY (OID); + +CREATE TABLE TEST1196_DRIVER ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL, + CAR VARCHAR(8) +); + +ALTER TABLE TEST1196_DRIVER ADD PRIMARY KEY (OID); + +ALTER TABLE TEST1196_CAR ADD FOREIGN KEY (DRIVER) +REFERENCES TEST1196_DRIVER (OID); + +ALTER TABLE TEST1196_DRIVER ADD FOREIGN KEY (CAR) +REFERENCES TEST1196_CAR (OID); + + +DROP TABLE TEST1196_COMPUTER CASCADE CONSTRAINTS; + +DROP TABLE TEST1196_ORDERITEM CASCADE CONSTRAINTS; + +DROP TABLE TEST1196_PRODUCT CASCADE CONSTRAINTS; + +DROP TABLE TEST1196_ORDER CASCADE CONSTRAINTS; + +CREATE TABLE TEST1196_ORDER ( + OID VARCHAR(8) NOT NULL, + NUM INTEGER NOT NULL +); + +ALTER TABLE TEST1196_ORDER ADD PRIMARY KEY (OID); + +CREATE TABLE TEST1196_PRODUCT ( + OID VARCHAR(8) NOT NULL, + NAME VARCHAR(60) NOT NULL +); + +ALTER TABLE TEST1196_PRODUCT ADD PRIMARY KEY (OID); + +CREATE TABLE TEST1196_ORDERITEM ( + OID VARCHAR(8) NOT NULL, + QUANTITY INTEGER NOT NULL, + PRODUCT VARCHAR(8), + PARENT VARCHAR(8) NOT NULL +); + +ALTER TABLE TEST1196_ORDERITEM ADD PRIMARY KEY (OID); + +ALTER TABLE TEST1196_ORDERITEM ADD FOREIGN KEY (PRODUCT) +REFERENCES TEST1196_PRODUCT (OID); + +ALTER TABLE TEST1196_ORDERITEM ADD FOREIGN KEY (PARENT) +REFERENCES TEST1196_ORDER (OID); + +CREATE TABLE TEST1196_COMPUTER ( + OID VARCHAR(8) NOT NULL, + NUM VARCHAR(20) NOT NULL, + ORDERITEM VARCHAR(8) +); + +ALTER TABLE TEST1196_COMPUTER ADD PRIMARY KEY (OID); + +ALTER TABLE TEST1196_COMPUTER ADD FOREIGN KEY (OID) +REFERENCES TEST1196_PRODUCT (OID); + +ALTER TABLE TEST1196_COMPUTER ADD FOREIGN KEY (ORDERITEM) +REFERENCES TEST1196_ORDERITEM (OID); Index: cpactf/src/test/java/org/castor/cpa/test/test1158/Test1158.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test1158/Test1158.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test1158/Test1158.java (working copy) @@ -49,8 +49,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } public void testLoad() { Index: cpactf/src/test/java/org/castor/cpa/test/test954/Test954.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test954/Test954.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test954/Test954.java (working copy) @@ -65,8 +65,9 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL - || engine == DatabaseEngineType.DERBY); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.DERBY) + || (engine == DatabaseEngineType.ORACLE); } protected void setUp() throws Exception { Index: cpactf/src/test/java/org/castor/cpa/test/test1206/TestDirtyIgnore.java =================================================================== --- cpactf/src/test/java/org/castor/cpa/test/test1206/TestDirtyIgnore.java (revision 7955) +++ cpactf/src/test/java/org/castor/cpa/test/test1206/TestDirtyIgnore.java (working copy) @@ -32,7 +32,8 @@ } public boolean include(final DatabaseEngineType engine) { - return (engine == DatabaseEngineType.MYSQL); + return (engine == DatabaseEngineType.MYSQL) + || (engine == DatabaseEngineType.ORACLE); } public void delete() throws Exception { Index: cpactf/src/test/resources/org/castor/cpa/test/test2527/mapping.xml =================================================================== --- cpactf/src/test/resources/org/castor/cpa/test/test2527/mapping.xml (revision 7978) +++ cpactf/src/test/resources/org/castor/cpa/test/test2527/mapping.xml (working copy) @@ -17,7 +17,7 @@ - + Index: cpactf/src/test/ddl/org/castor/cpa/test/test1355/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1355/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1355/oracle.sql (revision 0) @@ -0,0 +1,154 @@ +DROP TABLE test1355_country CASCADE CONSTRAINTS; + +CREATE TABLE test1355_country ( + ID NUMERIC(18,0) NOT NULL, + NAME VARCHAR(100) NOT NULL, + ISO3_COUNTRY_CODE VARCHAR(3) , + RECORD_CREATED_BY_ID NUMERIC(18,0) , + RECORD_LAST_MOD_BY_ID NUMERIC(18,0) , + RECORD_CREATE_DATE DATE , + RECORD_LAST_MOD_DATE DATE +); + +DROP TABLE test1355_state_prov CASCADE CONSTRAINTS; + +CREATE TABLE test1355_state_prov ( + ID NUMERIC(18,0) NOT NULL, + CODE VARCHAR(3) , + NAME VARCHAR(100) NOT NULL, + COUNTRY_ID NUMERIC(18,0) NOT NULL, + RECORD_CREATED_BY_ID NUMERIC(18,0) , + RECORD_LAST_MOD_BY_ID NUMERIC(18,0) , + RECORD_CREATE_DATE DATE , + RECORD_LAST_MOD_DATE DATE +); + +DROP TABLE test1355_city CASCADE CONSTRAINTS; + +CREATE TABLE test1355_city ( + ID NUMERIC(18,0) NOT NULL, + NAME VARCHAR(100) NOT NULL, + STATE_PROV_ID NUMERIC(18,0) NOT NULL, + RECORD_CREATED_BY_ID NUMERIC(18,0) , + RECORD_LAST_MOD_BY_ID NUMERIC(18,0) , + RECORD_CREATE_DATE DATE , + RECORD_LAST_MOD_DATE DATE +); + +DROP TABLE test1355_golf_course CASCADE CONSTRAINTS; + +CREATE TABLE test1355_golf_course ( + ID NUMERIC(18,0) NOT NULL, + COURSE_NAME VARCHAR(100) NOT NULL, + HOLES INTEGER NOT NULL, + CITY_ID NUMERIC(18,0) , + RECORD_CREATED_BY_ID NUMERIC(18,0) , + RECORD_LAST_MOD_BY_ID NUMERIC(18,0) , + RECORD_CREATE_DATE DATE , + RECORD_LAST_MOD_DATE DATE +); + +DROP TABLE test1355_golf_course_tees CASCADE CONSTRAINTS; + +CREATE TABLE test1355_golf_course_tees ( + ID NUMERIC(18,0) NOT NULL, + COURSE_ID NUMERIC(18,0) NOT NULL, + TEES_NAME VARCHAR(100) NOT NULL, + TEES_COLOR VARCHAR(25) , + MENS_SLOPE INTEGER , + MENS_RATING DOUBLE PRECISION , + WOMENS_SLOPE INTEGER , + WOMENS_RATING DOUBLE PRECISION , + YARDAGE INTEGER , + RECORD_CREATED_BY_ID NUMERIC(18,0) , + RECORD_LAST_MOD_BY_ID NUMERIC(18,0) , + RECORD_CREATE_DATE DATE , + RECORD_LAST_MOD_DATE DATE +); + +DROP TABLE test1355_golf_course_holes CASCADE CONSTRAINTS; + +CREATE TABLE test1355_golf_course_holes ( + ID NUMERIC(18,0) NOT NULL, + COURSE_TEES_ID NUMERIC(18,0) NOT NULL, + NUM INTEGER NOT NULL, + HOLE_NAME VARCHAR(100) , + PAR INTEGER , + YARDAGE INTEGER , + RECORD_CREATED_BY_ID NUMERIC(18,0) , + RECORD_LAST_MOD_BY_ID NUMERIC(18,0) , + RECORD_CREATE_DATE DATE , + RECORD_LAST_MOD_DATE DATE +); + +insert into test1355_country (ID, NAME, ISO3_COUNTRY_CODE) values ('1', 'USA', 'USA'); +insert into test1355_state_prov (ID, CODE, NAME, COUNTRY_ID) values ('1', 'WA', 'Washington', '1'); +insert into test1355_city (ID, NAME, STATE_PROV_ID) values ('1', 'Seattle', '1'); + +insert into test1355_golf_course (ID, COURSE_NAME, HOLES, CITY_ID) values ('1', 'West Seattle', '18', '1'); +insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('1', '1', 'White', 'white'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('1', '1', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('2', '1', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('3', '1', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('4', '1', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('5', '1', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('6', '1', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('7', '1', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('8', '1', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('9', '1', '9', '4'); + +insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('2', '1', 'Blue', 'blue'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('10', '2', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('11', '2', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('12', '2', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('13', '2', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('14', '2', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('15', '2', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('16', '2', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('17', '2', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('18', '2', '9', '4'); + +insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('3', '1', 'Red', 'red'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('19', '3', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('20', '3', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('21', '3', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('22', '3', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('23', '3', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('24', '3', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('25', '3', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('26', '3', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('27', '3', '9', '4'); + +insert into test1355_golf_course (ID, COURSE_NAME, HOLES, CITY_ID) values ('2', 'Jackson Park', '18', '1'); +insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('4', '2', 'White', 'white'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('28', '4', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('29', '4', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('30', '4', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('31', '4', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('32', '4', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('33', '4', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('34', '4', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('35', '4', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('36', '4', '9', '4'); + +insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('5', '2', 'Blue', 'blue'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('37', '5', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('38', '5', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('39', '5', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('40', '5', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('41', '5', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('42', '5', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('43', '5', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('44', '5', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('45', '5', '9', '4'); + +insert into test1355_golf_course_tees (ID, COURSE_ID, TEES_NAME, TEES_COLOR) values ('6', '2', 'Red', 'red'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('46', '6', '1', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('47', '6', '2', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('48', '6', '3', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('49', '6', '4', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('50', '6', '5', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('51', '6', '6', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('52', '6', '7', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('53', '6', '8', '4'); +insert into test1355_golf_course_holes (ID, COURSE_TEES_ID, NUM, PAR) values ('54', '6', '9', '4'); Index: cpactf/src/test/ddl/org/castor/cpa/test/test1196/mysql.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test1196/mysql.sql (revision 7955) +++ cpactf/src/test/ddl/org/castor/cpa/test/test1196/mysql.sql (working copy) @@ -61,7 +61,7 @@ CREATE TABLE TEST1196_ORDER ( OID VARCHAR(8) NOT NULL, - NUMBER INTEGER NOT NULL, + NUM INTEGER NOT NULL, PRIMARY KEY (OID) ); @@ -89,7 +89,7 @@ CREATE TABLE TEST1196_COMPUTER ( OID VARCHAR(8) NOT NULL, - NUMBER VARCHAR(20) NOT NULL, + NUM VARCHAR(20) NOT NULL, ORDERITEM VARCHAR(8), PRIMARY KEY (OID) ); Index: cpactf/src/test/ddl/org/castor/cpa/test/test881/oracle.sql =================================================================== --- cpactf/src/test/ddl/org/castor/cpa/test/test881/oracle.sql (revision 0) +++ cpactf/src/test/ddl/org/castor/cpa/test/test881/oracle.sql (revision 0) @@ -0,0 +1,8 @@ +DROP TABLE test881_prod CASCADE CONSTRAINTS; + +CREATE TABLE test881_prod ( + id int not null, + name varchar(200) not null +); + +INSERT INTO test881_prod VALUES (1, 'This is the test object.'); Index: cpactf/src/old/resources/jdo/mysql.xml =================================================================== --- cpactf/src/old/resources/jdo/mysql.xml (revision 7955) +++ cpactf/src/old/resources/jdo/mysql.xml (working copy) @@ -4,10 +4,20 @@ - + + + + + + + +