[empire-db] branch master updated: EMPIREDB-362 Bugfix Postgres

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new ed10051  EMPIREDB-362 Bugfix Postgres
ed10051 is described below

commit ed1005144debdb8bf83917ebb6d4835df2e5dbac
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Tue Mar 1 09:21:44 2022 +0100

    EMPIREDB-362 Bugfix Postgres
---
 .../java/org/apache/empire/samples/db/advanced/SampleAdvDB.java     | 6 ++++--
 .../src/main/java/org/apache/empire/samples/db/SampleDB.java        | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java
 
b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java
index 4b576f0..7a822e8 100644
--- 
a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java
+++ 
b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvDB.java
@@ -35,6 +35,7 @@ import org.apache.empire.db.generic.TTable;
 import org.apache.empire.db.generic.TView;
 import org.apache.empire.db.validation.DBModelChecker;
 import org.apache.empire.db.validation.DBModelErrorLogger;
+import org.apache.empire.dbms.DBMSHandler;
 import org.apache.empire.dbms.postgresql.DBMSHandlerPostgreSQL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -306,12 +307,13 @@ public class SampleAdvDB extends TDatabase<SampleAdvDB>
         }
         else
         {   // PostgreSQL does not support DDL in transaction
-            if(getDbms() instanceof DBMSHandlerPostgreSQL)
+            DBMSHandler dbms = context.getDbms();
+            if (dbms instanceof DBMSHandlerPostgreSQL)
                 setAutoCommit(context, true);
             // create the database
             createDatabase(context);
             // PostgreSQL does not support DDL in transaction
-            if(getDbms() instanceof DBMSHandlerPostgreSQL)
+            if (dbms instanceof DBMSHandlerPostgreSQL)
                 setAutoCommit(context, false);
             // attach to driver
             super.open(context);
diff --git 
a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
 
b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
index 96afcae..30b2e9f 100644
--- 
a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
+++ 
b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
@@ -29,6 +29,7 @@ import org.apache.empire.db.DBTable;
 import org.apache.empire.db.DBTableColumn;
 import org.apache.empire.db.validation.DBModelChecker;
 import org.apache.empire.db.validation.DBModelErrorLogger;
+import org.apache.empire.dbms.DBMSHandler;
 import org.apache.empire.dbms.postgresql.DBMSHandlerPostgreSQL;
 import org.apache.empire.samples.db.beans.Department;
 import org.apache.empire.samples.db.beans.Employee;
@@ -216,12 +217,13 @@ public class SampleDB extends DBDatabase
         }
         else
         {   // PostgreSQL does not support DDL in transaction
-            if(getDbms() instanceof DBMSHandlerPostgreSQL)
+            DBMSHandler dbms = context.getDbms();
+            if (dbms instanceof DBMSHandlerPostgreSQL)
                 setAutoCommit(context, true);
             // create the database
             createDatabase(context);
             // PostgreSQL does not support DDL in transaction
-            if(getDbms() instanceof DBMSHandlerPostgreSQL)
+            if (dbms instanceof DBMSHandlerPostgreSQL)
                 setAutoCommit(context, false);
             // attach to driver
             super.open(context);