bugfix ignore fk status & task-based-failonerrormode

opitzconsulting · Oct 4, 2019 · c96d1ab · c96d1ab
1 parent 9c0a013
commit c96d1ab
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/...s_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java b/...s_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java
@@ -332,7 +332,7 @@ private void updateIsRecreateNeeded( ModelDiff pModelDiff )
           .ifDifferent( FOREIGN_KEY__DEST_COLUMNS )//
           .ifDifferent( FOREIGN_KEY__DEST_TABLE )//
           .ifDifferent( FOREIGN_KEY__SRC_COLUMNS )//
-          .ifDifferent( FOREIGN_KEY__STATUS )//
+          //.ifDifferent( FOREIGN_KEY__STATUS )//
           .ifColumnDependentRecreate( lRecreateColumnNames, lForeignKeyDiff.srcColumnsDiff )//
           .calculate();
         }

diff --git a/...lugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy b/...lugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy
@@ -1,12 +1,17 @@
 package com.opitzconsulting.orcas.gradle
 
+import de.opitzconsulting.orcas.diff.ParameterDefaults
+import de.opitzconsulting.orcas.diff.Parameters
+
 import java.io.File;
 
 import de.opitzconsulting.orcas.diff.OrcasScriptRunner;
 import de.opitzconsulting.orcas.diff.ParametersCall;
 
 public abstract class BaseOrcasOneTimeScriptsTask extends BaseOrcasTask
 {
+  def Parameters.FailOnErrorMode failOnErrorMode = null;
+
   @Override
   protected void executeOrcasTaskWithParameters( ParametersCall pParameters )
   {
@@ -16,6 +21,9 @@ public abstract class BaseOrcasOneTimeScriptsTask extends BaseOrcasTask
       pParameters.setIsOneTimeScriptMode( true );
       pParameters.setAdditionalParameters( null );
       pParameters.setIsOneTimeScriptLogonlyMode( false );
+      if( failOnErrorMode != null ) {
+        pParameters.setFailOnErrorMode(failOnErrorMode);
+      }
 
       new OrcasScriptRunner().mainRun( modifyParameters( pParameters ) );
     }

diff --git a/...dle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy b/...dle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy
@@ -1,4 +1,6 @@
-package com.opitzconsulting.orcas.gradle;
+package com.opitzconsulting.orcas.gradle
+
+import de.opitzconsulting.orcas.diff.Parameters;
 
 import java.io.File;
 import java.util.List;
@@ -8,6 +10,8 @@ import de.opitzconsulting.orcas.diff.ParametersCall;
 
 public class ExecuteOrcasScriptTask extends BaseOrcasTask
 {
+  def Parameters.FailOnErrorMode failOnErrorMode = null;
+
   def scriptfile;
 
   def logname;
@@ -26,6 +30,9 @@ public class ExecuteOrcasScriptTask extends BaseOrcasTask
     pParameters.setIsOneTimeScriptMode( false );
 
     pParameters.setAdditionalParameters( scriptParameters );
+    if( failOnErrorMode != null ) {
+      pParameters.setFailOnErrorMode(failOnErrorMode);
+    }
 
     new OrcasScriptRunner().mainRun( modifyParameters( pParameters ) );
   }

diff --git a/...le_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy b/...le_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy
@@ -1,4 +1,6 @@
-package com.opitzconsulting.orcas.gradle;
+package com.opitzconsulting.orcas.gradle
+
+import de.opitzconsulting.orcas.diff.Parameters;
 
 import java.io.File;
 import org.gradle.api.file.FileCollection;
@@ -9,6 +11,8 @@ import de.opitzconsulting.orcas.diff.ParametersCall;
 
 public class ExecuteOrcasScriptsTask extends BaseOrcasTask
 {
+  def Parameters.FailOnErrorMode failOnErrorMode = null;
+
   def scriptfolder;
 
   FileCollection scriptFiles;
@@ -33,6 +37,9 @@ public class ExecuteOrcasScriptsTask extends BaseOrcasTask
     }
     pParameters.setIsOneTimeScriptMode( false );
     pParameters.setAdditionalParameters( null );
+    if( failOnErrorMode != null ) {
+      pParameters.setFailOnErrorMode(failOnErrorMode);
+    }
 
     new OrcasScriptRunner().mainRun( modifyParameters( pParameters ) );
   }