From 274e15653e8d5d852defe19d8e1953d0f3ceec29 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 27 Dec 2019 21:27:03 +0300
Subject: [PATCH] #1562 Auto-commit mode model

---
 .../ConnectionPageInitialization.java         |  2 +-
 .../model/StreamDataSourceContainer.java      |  3 +--
 .../dbeaver/model/DBPAutoCommitMode.java      | 26 +++++++++++++++++++
 .../dbeaver/model/DBPDataSourceContainer.java |  4 +--
 .../model/impl/jdbc/struct/JDBCTable.java     |  3 ++-
 .../model/impl/sql/BasicSQLDialect.java       | 20 ++++++++++++--
 .../jkiss/dbeaver/model/sql/SQLConstants.java | 16 ++++++++----
 .../registry/DataSourceDescriptor.java        | 20 +-------------
 8 files changed, 61 insertions(+), 33 deletions(-)
 create mode 100644 plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPAutoCommitMode.java

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
index e04a039b85..9ef7012b06 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
@@ -327,7 +327,7 @@ class ConnectionPageInitialization extends ConnectionWizardPage implements IData
             return;
         }
         try {
-            dataSource.setDefaultAutoCommit(autocommit.getSelection(), null, true, null);
+            dataSource.setDefaultAutoCommit(autocommit.getSelection());
             if (txnOptionsLoaded) {
                 int levelIndex = isolationLevel.getSelectionIndex();
                 if (levelIndex <= 0) {
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/model/StreamDataSourceContainer.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/model/StreamDataSourceContainer.java
index 9a2b57dbdf..c777dd3579 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/model/StreamDataSourceContainer.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/model/StreamDataSourceContainer.java
@@ -30,7 +30,6 @@ import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.connection.DBPNativeClientLocation;
 import org.jkiss.dbeaver.model.data.DBDDataFormatterProfile;
 import org.jkiss.dbeaver.model.data.DBDValueHandler;
-import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.impl.data.DefaultValueHandler;
 import org.jkiss.dbeaver.model.net.DBWNetworkHandler;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
@@ -158,7 +157,7 @@ class StreamDataSourceContainer implements DBPDataSourceContainer {
     }
 
     @Override
-    public void setDefaultAutoCommit(boolean autoCommit, @Nullable DBCExecutionContext updateContext, boolean updateConnection, @Nullable Runnable onFinish) throws DBException {
+    public void setDefaultAutoCommit(boolean autoCommit) {
 
     }
 
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPAutoCommitMode.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPAutoCommitMode.java
new file mode 100644
index 0000000000..2774de835e
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPAutoCommitMode.java
@@ -0,0 +1,26 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.model;
+
+/**
+ * Auto-commit mode
+ */
+public enum DBPAutoCommitMode {
+    ON,
+    OFF,
+    SMART
+}
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
index 7e8a4287ec..2f050de867 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceContainer.java
@@ -27,7 +27,6 @@ import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.connection.DBPNativeClientLocation;
 import org.jkiss.dbeaver.model.data.DBDPreferences;
-import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.net.DBWNetworkHandler;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
@@ -102,8 +101,7 @@ public interface DBPDataSourceContainer extends DBSObject, DBDPreferences, DBPNa
 
     boolean isDefaultAutoCommit();
 
-    void setDefaultAutoCommit(boolean autoCommit, @Nullable  DBCExecutionContext updateContext, boolean updateConnection, @Nullable  Runnable onFinish)
-        throws DBException;
+    void setDefaultAutoCommit(boolean autoCommit);
 
     @Nullable
     DBPTransactionIsolation getActiveTransactionsIsolation();
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/struct/JDBCTable.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/struct/JDBCTable.java
index 5bc12b7153..60fde8f712 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/struct/JDBCTable.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/struct/JDBCTable.java
@@ -33,6 +33,7 @@ import org.jkiss.dbeaver.model.impl.struct.AbstractTable;
 import org.jkiss.dbeaver.model.messages.ModelMessages;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.sql.SQLConstants;
 import org.jkiss.dbeaver.model.sql.SQLDataSource;
 import org.jkiss.dbeaver.model.sql.SQLDialect;
 import org.jkiss.dbeaver.model.sql.SQLUtils;
@@ -318,7 +319,7 @@ public abstract class JDBCTable<DATASOURCE extends DBPDataSource, CONTAINER exte
                 String tableName = DBUtils.getEntityScriptName(JDBCTable.this, options);
                 StringBuilder query = new StringBuilder(200);
                 query
-                    .append(useUpsert(session) ? "UPSERT" : "INSERT")
+                    .append(useUpsert(session) ? SQLConstants.KEYWORD_UPSERT : SQLConstants.KEYWORD_INSERT)
                     .append(" INTO ").append(tableName).append(" ("); //$NON-NLS-1$ //$NON-NLS-2$
 
                 allNulls = true;
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
index 98b7b3e8d3..fd307ce32e 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java
@@ -61,6 +61,13 @@ public class BasicSQLDialect implements SQLDialect {
     private static final String[] CORE_NON_TRANSACTIONAL_KEYWORDS = new String[]{
         SQLConstants.KEYWORD_SELECT,
     };
+    protected static final String[] TRANSACTIONAL_KEYWORDS = new String[]{
+            SQLConstants.KEYWORD_INSERT,
+            SQLConstants.KEYWORD_DELETE,
+            SQLConstants.KEYWORD_UPDATE,
+            SQLConstants.KEYWORD_MERGE,
+            SQLConstants.KEYWORD_UPSERT,
+            SQLConstants.KEYWORD_TRUNCATE};
     public static final String[][] DEFAULT_IDENTIFIER_QUOTES = {{"\"", "\""}};
     public static final String[][] DEFAULT_STRING_QUOTES = {{"'", "'"}};
 
@@ -451,8 +458,12 @@ public class BasicSQLDialect implements SQLDialect {
             // anyhow it shouldn't be transactional
             return false;
         }
-        String[] ntk = getDDLKeywords();
-        for (String keyword : ntk) {
+        for (String keyword : getDDLKeywords()) {
+            if (queryString.startsWith(keyword)) {
+                return !ArrayUtils.contains(getNonTransactionKeywords(), keyword);
+            }
+        }
+        for (String keyword : getTransactionKeywords()) {
             if (queryString.startsWith(keyword)) {
                 return true;
             }
@@ -460,6 +471,11 @@ public class BasicSQLDialect implements SQLDialect {
         return false;
     }
 
+    @NotNull
+    protected String[] getTransactionKeywords() {
+        return isStandardSQL() ? TRANSACTIONAL_KEYWORDS : new String[0];
+    }
+
     @NotNull
     protected String[] getNonTransactionKeywords() {
         return isStandardSQL() ? NON_TRANSACTIONAL_KEYWORDS : CORE_NON_TRANSACTIONAL_KEYWORDS;
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLConstants.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLConstants.java
index a7a108ae32..f1e202a2c4 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLConstants.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLConstants.java
@@ -31,8 +31,14 @@ public class SQLConstants {
     public static final String ML_COMMENT_END = "*/";
     public static final String SL_COMMENT = "--";
 
-    public static final String KEYWORD_UPDATE = "UPDATE";
     public static final String KEYWORD_SELECT = "SELECT";
+    public static final String KEYWORD_INSERT = "INSERT";
+    public static final String KEYWORD_UPDATE = "UPDATE";
+    public static final String KEYWORD_DELETE = "DELETE";
+    public static final String KEYWORD_MERGE = "MERGE";
+    public static final String KEYWORD_UPSERT = "UPSERT";
+    public static final String KEYWORD_TRUNCATE = "TRUNCATE";
+
     public static final String KEYWORD_FROM = "FROM";
     public static final String KEYWORD_INTO = "INTO";
     public static final String KEYWORD_JOIN = "JOIN";
@@ -123,7 +129,7 @@ public class SQLConstants {
         "DEC",
         "DECLARE",
         "DEFAULT",
-        "DELETE",
+        KEYWORD_DELETE,
         "DENSE_RANK",
         "DEREF",
         "DESCRIBE",
@@ -172,7 +178,7 @@ public class SQLConstants {
         "INNER",
         "INOUT",
         "INSENSITIVE",
-        "INSERT",
+        KEYWORD_INSERT,
         "INTERSECT",
         "INTERSECTION",
         "INTERVAL",
@@ -190,7 +196,7 @@ public class SQLConstants {
         "LOCALTIMESTAMP",
         "MATCH",
         "MEMBER",
-        "MERGE",
+        KEYWORD_MERGE,
         "METHOD",
         "MINUTE",
         "MOD",
@@ -291,7 +297,7 @@ public class SQLConstants {
         "UNIQUE",
         "UNKNOWN",
         "UNNEST",
-        "UPDATE",
+        KEYWORD_UPDATE,
         "USER",
         "USING",
         //"VALUE", // too common for column names
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
index f8e4eededc..fe1eceacc2 100644
--- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
@@ -381,25 +381,7 @@ public class DataSourceDescriptor
     }
 
     @Override
-    public void setDefaultAutoCommit(final boolean autoCommit, @Nullable DBCExecutionContext updateContext, boolean updateConnection, @Nullable final Runnable onFinish) throws DBException {
-        if (updateContext != null) {
-            final DBCTransactionManager txnManager = DBUtils.getTransactionManager(updateContext);
-            if (updateConnection && txnManager != null) {
-                TasksJob.runTask("Set auto-commit mode", monitor -> {
-                    try {
-                        // Change auto-commit mode
-                        txnManager.setAutoCommit(monitor, autoCommit);
-                    } catch (DBCException e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        monitor.done();
-                        if (onFinish != null) {
-                            onFinish.run();
-                        }
-                    }
-                });
-            }
-        }
+    public void setDefaultAutoCommit(final boolean autoCommit) {
         // Save in preferences
         if (autoCommit == getConnectionConfiguration().getConnectionType().isAutocommit()) {
             connectionInfo.getBootstrap().setDefaultAutoCommit(null);
-- 
GitLab