序号从1开始

Author: core-lib

src/main/java/io/sqlman/SqlScript.java

@@ -20,6 +20,7 @@ public interface SqlScript {
 
     /**
      * 获取该脚本指定序号的SQL语句
+     * 序号从{@code 1}开始
      *
      * @param ordinal SQL语句序号
      * @return 指定序号的SQL语句

src/main/java/io/sqlman/SqlVersionManager.java

@@ -24,7 +24,7 @@ public interface SqlVersionManager {
     void upgrade() throws SQLException;
 
     /**
-     * 执行指定SQL脚本的升级。
+     * 执行指定SQL脚本的升级
      *
      * @param script 指定脚本
      * @throws SQLException SQL异常
@@ -33,7 +33,7 @@ public interface SqlVersionManager {
     void upgrade(SqlScript script) throws SQLException;
 
     /**
-     * 执行指定SQL脚本指定语句序号的升级。
+     * 执行指定SQL脚本指定语句序号的升级，语句序号从{@code 1}开始
      *
      * @param script  指定脚本
      * @param ordinal 指定语句序号
@@ -45,7 +45,7 @@ public interface SqlVersionManager {
 
     /**
      * 获取所有SQL脚本
-     * 实现类返回的结果必须遵循脚本版本的先后顺序。
+     * 实现类返回的结果必须遵循脚本版本的先后顺序
      * 实现类当发现脚本资源中包含重复的SQL脚本版本时应当抛出
      *
      * @return 所有SQL脚本

src/main/java/io/sqlman/script/DruidScript.java

@@ -39,7 +39,7 @@ public int sqls() {
 
     @Override
     public SqlSentence sentence(int ordinal) {
-        return sentences.get(ordinal);
+        return sentences.get(ordinal - 1);
     }
 
     @Override

src/main/java/io/sqlman/script/DruidScriptResolver.java

@@ -49,15 +49,15 @@ public SqlScript resolve(SqlSource source) throws IncorrectSyntaxException, IOEx
             String text = SqlUtils.stringify(in, charset);
             List<SQLStatement> statements = SQLUtils.parseStatements(text, dialect.toLowerCase());
             List<SqlSentence> sentences = new ArrayList<>(statements.size());
-            for (int ordinal = 0; ordinal < statements.size(); ordinal++) {
-                SQLStatement statement = statements.get(ordinal);
+            for (int index = 0; index < statements.size(); index++) {
+                SQLStatement statement = statements.get(index);
                 String sql = statement.toString();
                 sql = sql.trim();
                 String suffix = ";";
                 while (sql.endsWith(suffix)) {
                     sql = sql.substring(0, sql.length() - 1);
                 }
-                SqlSentence sentence = new DruidSentence(ordinal, sql);
+                SqlSentence sentence = new DruidSentence(index + 1, sql);
                 sentences.add(sentence);
             }
             return new DruidScript(source.name(), source.version(), source.parameters(), source.description(), sentences);

src/main/java/io/sqlman/script/DruidSentence.java

@@ -13,8 +13,8 @@ public class DruidSentence implements SqlSentence {
     private final String value;
 
     public DruidSentence(int ordinal, String value) {
-        if (ordinal < 0) {
-            throw new IllegalArgumentException("ordinal must not be negative");
+        if (ordinal < 1) {
+            throw new IllegalArgumentException("ordinal must not lesser than 1");
         }
         if (value == null || value.trim().isEmpty()) {
             throw new IllegalArgumentException("value must not be null or blank string");

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

@@ -51,11 +51,11 @@ public void upgrade() throws SQLException {
             logger.info("Schema current version is {}", current);
 
             String version = current != null ? current.getVersion() : null;
-            int ordinal = current != null ? current.getSuccess() ? current.getOrdinal() + 1 : current.getOrdinal() : 0;
-            boolean included = current == null || !current.getSuccess() || ordinal < current.getSqlQuantity() - 1;
+            int ordinal = current != null ? current.getSuccess() ? current.getOrdinal() + 1 : current.getOrdinal() : 1;
+            boolean included = current == null || !current.getSuccess() || ordinal < current.getSqlQuantity();
             Enumeration<SqlSource> sources = current != null ? acquire(version, included) : acquire();
             if (!included) {
-                ordinal = 0;
+                ordinal = 1;
             }
 
             if (sources.hasMoreElements()) {
@@ -65,14 +65,14 @@ public void upgrade() throws SQLException {
             while (sources.hasMoreElements()) {
                 SqlSource source = sources.nextElement();
                 SqlScript script = resolve(source);
-                if (ordinal == 0) {
+                if (ordinal == 1) {
                     upgrade(script);
                 } else {
                     int sqls = script.sqls();
-                    for (int index = ordinal; index < sqls; index++) {
+                    for (int index = ordinal; index <= sqls; index++) {
                         upgrade(script, index);
                     }
-                    ordinal = 0;
+                    ordinal = 1;
                 }
             }
 
@@ -102,7 +102,7 @@ public void upgrade(final SqlScript script) throws SQLException {
                 @Override
                 public void perform(Connection connection) throws SQLException {
                     int sqls = script.sqls();
-                    for (int ordinal = 0; ordinal < sqls; ordinal++) {
+                    for (int ordinal = 1; ordinal <= sqls; ordinal++) {
                         upgrade(script, ordinal);
                     }
                 }
@@ -112,7 +112,7 @@ public void perform(Connection connection) throws SQLException {
         else {
             logger.info("Executing script {} non-atomically", script.name());
             int sqls = script.sqls();
-            for (int ordinal = 0; ordinal < sqls; ordinal++) {
+            for (int ordinal = 1; ordinal <= sqls; ordinal++) {
                 upgrade(script, ordinal);
             }
         }
@@ -150,7 +150,7 @@ public Integer execute(Connection connection) throws SQLException {
                         SqlSentence sentence = script.sentence(ordinal);
                         String sql = sentence.value();
 
-                        logger.info("Executing sentence {}/{} of script version {} in {} transaction isolation level : {}", ordinal + 1, script.sqls(), script.version(), isolation, sql.replaceAll("\\s+", " "));
+                        logger.info("Executing sentence {}/{} of script version {} in {} transaction isolation level : {}", ordinal, script.sqls(), script.version(), isolation, sql.replaceAll("\\s+", " "));
 
                         PreparedStatement statement = connection.prepareStatement(sql);
                         int rows = statement.executeUpdate();