From c96d1abcf3b2b772905d0ccec41df19c7237613e Mon Sep 17 00:00:00 2001 From: Frank Sanders Date: Fri, 4 Oct 2019 14:31:19 +0200 Subject: [PATCH] bugfix ignore fk status & task-based-failonerrormode --- .../java/de/opitzconsulting/orcas/diff/OrcasDiff.java | 2 +- .../orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy | 8 ++++++++ .../orcas/gradle/ExecuteOrcasScriptTask.groovy | 9 ++++++++- .../orcas/gradle/ExecuteOrcasScriptsTask.groovy | 9 ++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java index ccf64baa..b6938b38 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java +++ b/orcas_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/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy b/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy index d4bd97a7..578459ce 100644 --- a/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy +++ b/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/BaseOrcasOneTimeScriptsTask.groovy @@ -1,5 +1,8 @@ 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; @@ -7,6 +10,8 @@ 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/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy b/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy index 9f8d0d1d..7dc49de1 100644 --- a/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptTask.groovy +++ b/orcas_core/build_source/orcas_gradle_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/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy b/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy index 5ce550ba..8edb9a70 100644 --- a/orcas_core/build_source/orcas_gradle_plugin/src/main/groovy/com/opitzconsulting/orcas/gradle/ExecuteOrcasScriptsTask.groovy +++ b/orcas_core/build_source/orcas_gradle_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 ) ); }