script line handling log update

opitzconsulting · Oct 24, 2019 · ea87ae9 · ea87ae9
1 parent 8a98363
commit ea87ae9
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...uild_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasScriptRunner.java b/...uild_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasScriptRunner.java
@@ -343,7 +343,7 @@ public void handleCommand(String pLine, File pCurrentFile) throws Exception {
 
         Supplier<String>
             lLineReferenceProvider =
-            () -> pFile + "(" + lStartLineIndex[0] + (lStartLineIndex[0] != lCurrentLineIndex[0] ? "-" + lCurrentLineIndex[0] : "") + ")";
+            () -> pFile + "(" + (lStartLineIndex[0] + 1) + (lStartLineIndex[0] != lCurrentLineIndex[0] ? "-" + (lCurrentLineIndex[0] + 1) : "") + ")";
 
         for (String lLine : pLines) {
             boolean lCurrentEnd = false;
@@ -454,8 +454,11 @@ protected void useCallableStatement(CallableStatement pCallableStatement) throws
             lCurrentLineIndex[0]++;
         }
 
-        if (lCurrent != null && !lCurrent.toString().trim().equals("")) {
-            _log.error(lLineReferenceProvider.get() + ": statemmet not terminated correctly: " + lCurrent.toString());
+        if (lCurrent != null) {
+            String lTrim = lCurrent.toString().replace("\n", "").trim();
+            if (!lTrim.equals("") && !lTrim.equals("/")) {
+                _log.error(lLineReferenceProvider.get() + ": statemmet not terminated correctly: " + lCurrent.toString());
+            }
         }
 
         lSpoolHandler.spoolHandleFileEnd();
@@ -472,7 +475,11 @@ protected SpoolHandler createSpoolHandler(Parameters pParameters) {
         return new SpoolHandler(pParameters);
     }
 
-    private void executeSql(String pSql, CallableStatementProvider pCallableStatementProvider, Parameters pParameters, Supplier<String> pLineReferenceProvider) {
+    private void executeSql(
+        String pSql,
+        CallableStatementProvider pCallableStatementProvider,
+        Parameters pParameters,
+        Supplier<String> pLineReferenceProvider) {
         try {
             new WrapperExecuteUpdate(pSql, pCallableStatementProvider).execute();
         } catch (RuntimeException e) {