Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into herddb-docker

This commit is contained in:
Enrico Olivelli 2021-04-17 14:03:32 +02:00 committed by GitHub
parent 7d291f8a6f d5ac99d402
commit 10dda41553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestGenerationType.java
View File

@ -25,6 +25,7 @@ import javax.persistence.EntityTransaction;
import javax.persistence.Query;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@ -117,6 +118,10 @@ public class TestGenerationType
}
public void testQueryWithoutGetGeneratedKeys() {
if (getDBDictionary() instanceof OracleDictionary) {
// Oracle now always has JDBC4 driver.
return;
}
testQuery();
}

3
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerationProperties.java
View File

@ -33,6 +33,7 @@ import org.apache.openjpa.jdbc.schema.SchemaGroup;
import org.apache.openjpa.jdbc.schema.SchemaTool;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.HerdDBDictionary;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
import org.apache.openjpa.jdbc.sql.PostgresDictionary;
import org.apache.openjpa.jdbc.sql.SQLServerDictionary;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
@ -180,6 +181,8 @@ public class TestSchemaGenerationProperties extends BaseJDBCTest {
createSql = "org/apache/openjpa/persistence/jdbc/schema/create-postgresql.sql";
} else if (dict instanceof SQLServerDictionary) {
createSql = "org/apache/openjpa/persistence/jdbc/schema/create-mssql.sql";
} else if (dict instanceof OracleDictionary) {
createSql = "org/apache/openjpa/persistence/jdbc/schema/create-oracle.sql";
} else {
createSql = "org/apache/openjpa/persistence/jdbc/schema/create.sql";
}

14
openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/jdbc/schema/create-oracle.sql Normal file
View File

@ -0,0 +1,14 @@
CREATE TABLE AUTOINCPC1 (ID INTEGER NOT NULL, STRNGFLD VARCHAR(50), DTYPE VARCHAR(255), ONEONE_ID INTEGER, INTFIELD INTEGER, CONSTRAINT SQL150111133630290 PRIMARY KEY (ID));
CREATE TABLE AUTOINCPC3 (ID NUMBER NOT NULL, STRNGFLD VARCHAR(50), ONEONE_ID NUMBER, CONSTRAINT SQL150111133630380 PRIMARY KEY (ID));
CREATE TABLE CONJOINPC4 (ID INTEGER NOT NULL, MANYTOMANY BLOB, NAME VARCHAR(50), ONETOONE1_ID INTEGER, CONSTRAINT SQL150111133630400 PRIMARY KEY (ID));
CREATE TABLE CONJOINPC5 (ID INTEGER NOT NULL, NAME VARCHAR(255), CONSTRAINT SQL150111133630420 PRIMARY KEY (ID));
CREATE TABLE CUSTMAPPC (ID INTEGER NOT NULL, FEMALE SMALLINT, NAME VARCHAR(50), CONSTRAINT SQL150111133630430 PRIMARY KEY (ID));
CREATE TABLE DFGTEST (ID NUMBER NOT NULL, DFGFIELD INTEGER, NONDFGFIELD INTEGER, CONSTRAINT SQL150111133630450 PRIMARY KEY (ID));
CREATE TABLE EAGEROUTERJOINPC (ID NUMBER NOT NULL, NAME VARCHAR(255), HELPER BLOB, CONSTRAINT SQL150111133630460 PRIMARY KEY (ID));
CREATE TABLE EAGERPC (ID INTEGER NOT NULL, STRNGFLD VARCHAR(50), EAGER_ID INTEGER, EAGSUB INTEGER, HELPER_ID INTEGER, RECURSE_ID INTEGER, CONSTRAINT SQL150111133630470 PRIMARY KEY (ID));
CREATE TABLE EAGERPCSUB (ID INTEGER NOT NULL, INTFIELD INTEGER, CONSTRAINT SQL150111133630480 PRIMARY KEY (ID));
CREATE TABLE HELPERPC (ID INTEGER NOT NULL, STRNGFLD VARCHAR(50), EAGER_ID INTEGER, HELPER BLOB, CONSTRAINT SQL150111133630500 PRIMARY KEY (ID));
CREATE TABLE HELPERPC2 (ID INTEGER NOT NULL, STRNGFLD VARCHAR(50), HELPER_ID INTEGER, CONSTRAINT SQL150111133630510 PRIMARY KEY (ID));
CREATE TABLE HELPERPC3 (ID INTEGER NOT NULL, STRNGFLD VARCHAR(50), DTYPE VARCHAR(255), INTFIELD INTEGER, CONSTRAINT SQL150111133630520 PRIMARY KEY (ID));
CREATE TABLE INVERTA (ID INTEGER NOT NULL, TEST VARCHAR(35), INVERTB_ID INTEGER, CONSTRAINT SQL150111133630530 PRIMARY KEY (ID));
CREATE TABLE INVERTB (ID INTEGER NOT NULL, TEST VARCHAR(35), INVERTA_ID INTEGER, CONSTRAINT SQL150111133630540 PRIMARY KEY (ID));

4
pom.xml
View File

@ -1578,8 +1578,8 @@
<images>
<image>
<!--<name>oracledb19c/oracle.19.3.0-ee:oracle19.3.0-ee</name>-->
<!--<name>oracleinanutshell/oracle-xe-11g</name>-->
<name>pvargacl/oracle-xe-18.4.0:latest</name>
<name>oracleinanutshell/oracle-xe-11g</name>
<!--<name>pvargacl/oracle-xe-18.4.0:latest</name>-->
<run>
<volumes>
<bind>