脚本执行

Author: core-lib

src/main/java/io/sqlman/SqlVersion.java

@@ -19,6 +19,7 @@ public class SqlVersion {
     private Integer rowEffected;
     private Integer errorCode;
     private String errorState;
+    private String errorMessage;
     private Timestamp timeExecuted;
 
     public Integer getId() {
@@ -93,6 +94,14 @@ public void setErrorState(String errorState) {
         this.errorState = errorState;
     }
 
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
     public Timestamp getTimeExecuted() {
         return timeExecuted;
     }

src/main/java/io/sqlman/dialect/MySQLDialect.java

@@ -32,6 +32,7 @@ public void install(Connection connection, SqlConfig config) throws SQLException
         ddl.append("         `row_effected` int(11) NOT NULL COMMENT '影响行数',");
         ddl.append("         `error_code` int(11) NOT NULL COMMENT '错误代码',");
         ddl.append("         `error_state` varchar(255) NOT NULL COMMENT '错误状态',");
+        ddl.append("         `error_message` varchar(255) NOT NULL COMMENT '错误信息',");
         ddl.append("         `time_executed` timestamp NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '执行时间',");
         ddl.append("         PRIMARY KEY (`id`),");
         ddl.append("         UNIQUE KEY `UK_").append(name).append("_version_ordinal` (`version`,`ordinal`) USING BTREE");
@@ -54,6 +55,7 @@ public SqlVersion status(Connection connection, SqlConfig config) throws SQLExce
         dql.append("     s.row_effected AS rowEffected,");
         dql.append("     s.error_code AS errorCode,");
         dql.append("     s.error_state AS errorState,");
+        dql.append("     s.error_message AS errorMessage,");
         dql.append("     s.time_executed AS timeExecuted");
         dql.append(" FROM");
         dql.append("     ").append(name).append(" AS s");
@@ -79,6 +81,7 @@ public SqlVersion status(Connection connection, SqlConfig config) throws SQLExce
         version.setRowEffected(result.getInt("rowEffected"));
         version.setErrorCode(result.getInt("errorCode"));
         version.setErrorState(result.getString("errorState"));
+        version.setErrorMessage(result.getString("errorMessage"));
         version.setTimeExecuted(result.getTimestamp("timeExecuted"));
 
         return version;
@@ -97,17 +100,19 @@ public int upgrade(Connection connection, SqlConfig config, SqlVersion version)
         dml.append("     row_effected,");
         dml.append("     error_code,");
         dml.append("     error_state,");
+        dml.append("     error_message,");
         dml.append("     time_executed");
         dml.append(" )");
         dml.append(" VALUES");
-        dml.append("     (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+        dml.append("     (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
         dml.append(" ON DUPLICATE KEY UPDATE");
         dml.append("     description = ?,");
         dml.append("     sql_quantity = ?,");
         dml.append("     success = ?,");
         dml.append("     row_effected = ?,");
         dml.append("     error_code = ?,");
         dml.append("     error_state = ?,");
+        dml.append("     error_message = ?,");
         dml.append("     time_executed = ?");
 
         PreparedStatement statement = connection.prepareStatement(dml.toString());
@@ -119,14 +124,16 @@ public int upgrade(Connection connection, SqlConfig config, SqlVersion version)
         statement.setInt(6, version.getRowEffected());
         statement.setInt(7, version.getErrorCode());
         statement.setString(8, Sqls.truncate(version.getErrorState(), 255));
-        statement.setTimestamp(9, version.getTimeExecuted());
-        statement.setString(10, Sqls.truncate(version.getDescription(), 128));
-        statement.setInt(11, version.getSqlQuantity());
-        statement.setBoolean(12, version.getSuccess());
-        statement.setInt(13, version.getRowEffected());
-        statement.setInt(14, version.getErrorCode());
-        statement.setString(15, Sqls.truncate(version.getErrorState(), 255));
-        statement.setTimestamp(16, version.getTimeExecuted());
+        statement.setString(9, Sqls.truncate(version.getErrorMessage(), 255));
+        statement.setTimestamp(10, version.getTimeExecuted());
+        statement.setString(11, Sqls.truncate(version.getDescription(), 128));
+        statement.setInt(12, version.getSqlQuantity());
+        statement.setBoolean(13, version.getSuccess());
+        statement.setInt(14, version.getRowEffected());
+        statement.setInt(15, version.getErrorCode());
+        statement.setString(16, Sqls.truncate(version.getErrorState(), 255));
+        statement.setString(17, Sqls.truncate(version.getErrorMessage(), 255));
+        statement.setTimestamp(18, version.getTimeExecuted());
 
         return statement.executeUpdate();
     }

src/main/java/io/sqlman/executor/BasicExecutor.java

@@ -90,7 +90,8 @@ private void upgrade(SqlScript script, int ordinal) throws Exception {
         boolean success = false;
         int rowEffected = 0;
         int errorCode = 0;
-        String errorState = "";
+        String errorState = null;
+        String errorMessage = null;
         Timestamp dateExecuted = new Timestamp(System.currentTimeMillis());
         Connection connection = null;
         try {
@@ -105,13 +106,15 @@ private void upgrade(SqlScript script, int ordinal) throws Exception {
             }
             errorCode = e.getErrorCode();
             errorState = e.getSQLState();
+            errorMessage = e.getMessage();
             throw e;
         } catch (Exception e) {
             if (connection != null) {
                 connection.rollback();
             }
             errorCode = -1;
             errorState = e.getMessage();
+            errorMessage = e.getMessage();
         } finally {
             if (connection != null) {
                 connection.close();
@@ -125,6 +128,7 @@ private void upgrade(SqlScript script, int ordinal) throws Exception {
             version.setRowEffected(rowEffected);
             version.setErrorCode(errorCode);
             version.setErrorState(errorState);
+            version.setErrorMessage(errorMessage);
             version.setTimeExecuted(dateExecuted);
             record(version);
         }