read db.supports.sequence from passed setup properties and remove ext…

…ra create of SEQGENERATOR Signed-off-by: Scott Marlow <[email protected]>
scottmarlow · Dec 10, 2024 · 22fd88d · 22fd88d
1 parent 4c27b3f
commit 22fd88d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client.java
@@ -35,18 +35,6 @@ public class Client extends PMClientBase {
 	public Client() {
 	}
 
-	protected void createSequenceGenerator() {
-		try {
-			getEntityTransaction().begin();
-			getEntityManager().createNativeQuery("CREATE SEQUENCE SEQGENERATOR START WITH 10").executeUpdate();
-			getEntityTransaction().commit();
-		} catch (Exception e) {
-			logErr( "Exception encountered while creating seq:", e);
-		}
-
-	}
-
-
 	public void cleanup() throws Exception {
 		try {
 			logTrace( "Cleanup data");

diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1.java
@@ -61,12 +61,11 @@ public void setup(String[] args, Properties p) throws Exception {
 		try {
 
 			super.setup(args,p);
-			String s = System.getProperty("db.supports.sequence");
+      String s = p.getProperty("db.supports.sequence");
 			if (s != null) {
 				supports_sequence = Boolean.parseBoolean(s);
 				logMsg( "db.supports.sequence:" + supports_sequence);
 				if (supports_sequence) {
-					createSequenceGenerator();
 					removeTestData();
 					createTestData();
 				}

diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2.java
@@ -45,12 +45,11 @@ public void setup(String[] args, Properties p) throws Exception {
 		try {
 
 			super.setup(args,p);
-			String s = System.getProperty("db.supports.sequence");
+      String s = p.getProperty("db.supports.sequence");
 			if (s != null) {
 				supports_sequence = Boolean.parseBoolean(s);
 				logMsg( "db.supports.sequence:" + supports_sequence);
 				if (supports_sequence) {
-					createSequenceGenerator();
 					removeTestData();
 					createDataTypes2Data();
 				}

diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3.java
@@ -50,12 +50,11 @@ public void setup(String[] args, Properties p) throws Exception {
 		try {
 
 			super.setup(args,p);
-			String s = System.getProperty("db.supports.sequence");
+      String s = p.getProperty("db.supports.sequence");
 			if (s != null) {
 				supports_sequence = Boolean.parseBoolean(s);
 				logMsg( "db.supports.sequence:" + supports_sequence);
 				if (supports_sequence) {
-					createSequenceGenerator();
 					removeTestData();
 					createDataTypes3Data();
 				}

diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4.java
@@ -49,12 +49,11 @@ public void setup(String[] args, Properties p) throws Exception {
 		try {
 
 			super.setup(args,p);
-			String s = System.getProperty("db.supports.sequence");
+      String s = p.getProperty("db.supports.sequence");
 			if (s != null) {
 				supports_sequence = Boolean.parseBoolean(s);
 				logMsg( "db.supports.sequence:" + supports_sequence);
 				if (supports_sequence) {
-					createSequenceGenerator();
 					removeTestData();
 					createDataTypes4Data();
 				}