事务隔离级别不重复设置

Author: core-lib

src/main/java/io/sqlman/version/JdbcIsolation.java

@@ -0,0 +1,72 @@
+package io.sqlman.version;
+
+import java.sql.Connection;
+import java.util.Set;
+
+/**
+ * JDBC事务隔离级别
+ *
+ * @author Payne 646742615@qq.com
+ * 2019/6/1 10:34
+ */
+public enum JdbcIsolation implements JdbcInstruction {
+
+    /**
+     * 隔离级别：读未提交
+     */
+    READ_UNCOMMITTED(INSTRUCTION_READ_UNCOMMITTED, "read uncommitted", Connection.TRANSACTION_READ_UNCOMMITTED),
+    /**
+     * 隔离级别：读已提交
+     */
+    READ_COMMITTED(INSTRUCTION_READ_COMMITTED, "read committed", Connection.TRANSACTION_READ_COMMITTED),
+    /**
+     * 隔离级别：可重复读
+     */
+    REPEATABLE_READ(INSTRUCTION_REPEATABLE_READ, "repeatable read", Connection.TRANSACTION_REPEATABLE_READ),
+    /**
+     * 隔离级别：串行执行
+     */
+    SERIALIZABLE(INSTRUCTION_SERIALIZABLE, "serializable", Connection.TRANSACTION_SERIALIZABLE);
+
+    /**
+     * 指令
+     */
+    public final String instruction;
+    /**
+     * 隔离级别名称
+     */
+    public final String name;
+    /**
+     * JDBC Connection 隔离级别
+     */
+    public final int level;
+
+    JdbcIsolation(String instruction, String name, int level) {
+        this.instruction = instruction;
+        this.name = name;
+        this.level = level;
+    }
+
+    /**
+     * 从指令集中获取隔离级别，如果没有隔离级别指令则返回{@code null}
+     *
+     * @param instructions 指令集
+     * @return 对应隔离级别或{@code null}当没有隔离级别指令时
+     */
+    public static JdbcIsolation valueOf(Set<String> instructions) {
+        if (instructions == null || instructions.isEmpty()) {
+            return null;
+        }
+        for (JdbcIsolation value : values()) {
+            if (instructions.contains(value.instruction)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/io/sqlman/version/JdbcVersionManager.java

@@ -129,22 +129,10 @@ public void upgrade(final SqlScript script, final int ordinal) throws SQLExcepti
                 @Override
                 public Integer execute(Connection connection) throws SQLException {
                     try {
-                        String isolation;
                         Set<String> instructions = script.instructions();
-                        if (instructions != null && instructions.contains(INSTRUCTION_SERIALIZABLE)) {
-                            connection.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
-                            isolation = "serializable";
-                        } else if (instructions != null && instructions.contains(INSTRUCTION_REPEATABLE_READ)) {
-                            connection.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ);
-                            isolation = "repeatable read";
-                        } else if (instructions != null && instructions.contains(INSTRUCTION_READ_COMMITTED)) {
-                            connection.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
-                            isolation = "read committed";
-                        } else if (instructions != null && instructions.contains(INSTRUCTION_READ_UNCOMMITTED)) {
-                            connection.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
-                            isolation = "read uncommitted";
-                        } else {
-                            isolation = "default";
+                        JdbcIsolation isolation = JdbcIsolation.valueOf(instructions);
+                        if (isolation != null && connection.getTransactionIsolation() != isolation.level) {
+                            connection.setTransactionIsolation(isolation.level);
                         }
 
                         SqlSentence sentence = script.sentence(ordinal);

…/resources/sqlman/v1.0.1-ATOMIC!插入数据.sql …an/v1.0.1-ATOMIC-READ_COMMITTED!插入数据.sqlsrc/test/resources/sqlman/v1.0.1-ATOMIC!插入数据.sql renamed to src/test/resources/sqlman/v1.0.1-ATOMIC-READ_COMMITTED!插入数据.sql src/test/resources/sqlman/v1.0.1-ATOMIC!插入数据.sql renamed to src/test/resources/sqlman/v1.0.1-ATOMIC-READ_COMMITTED!插入数据.sql

@@ -1,5 +1,3 @@
-SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
-
 INSERT INTO SQLMAN_TEST1 (ID)
 VALUES (1);
 INSERT INTO SQLMAN_TEST2 (ID)