Replace DatabaseSourceLoaderWithCommit with a simple constructor switch

on the original DatabaseSourceLoader class. Rename loader tag for
builder to DatabaseSourceImplicitCommit

src/com/fivium/scriptrunner2/loader/BuiltInLoader.java

@@ -11,7 +11,7 @@ public abstract class BuiltInLoader
 implements Loader {
 
   public static final String LOADER_NAME_DB_SOURCE = "DatabaseSource";
-  public static final String LOADER_NAME_DB_SOURCE_WITH_COMMIT = "DatabaseSourceWithCommit";
+  public static final String LOADER_NAME_DB_SOURCE_WITH_COMMIT = "DatabaseSourceImplicitCommit";
   public static final String LOADER_NAME_SCRIPTRUNNER_UTIL = "ScriptRunnerUtil";
   public static final String LOADER_NAME_PATCH = "Patch";
   /** Special loader name for the builder only - files associated with this loader are ignored when constructing the manifest. */
@@ -21,7 +21,7 @@ public abstract class BuiltInLoader
   static {
     gBuiltInLoaderMap = new HashMap<String, Loader>();
     gBuiltInLoaderMap.put(LOADER_NAME_DB_SOURCE, new DatabaseSourceLoader());
-    gBuiltInLoaderMap.put(LOADER_NAME_DB_SOURCE_WITH_COMMIT, new DatabaseSourceWithCommitLoader());
+    gBuiltInLoaderMap.put(LOADER_NAME_DB_SOURCE_WITH_COMMIT, new DatabaseSourceLoader(true));
     gBuiltInLoaderMap.put(LOADER_NAME_SCRIPTRUNNER_UTIL, UtilLoader.getInstance());
     gBuiltInLoaderMap.put(LOADER_NAME_PATCH, new PatchScriptLoader());
   }

src/com/fivium/scriptrunner2/loader/DatabaseSourceLoader.java

@@ -24,11 +24,29 @@
  */
 public class DatabaseSourceLoader 
 extends SourceLoader {
-
+
+  private boolean implicitCommit = false;
+
+  /**
+   * Default Constructor
+   */
+  public DatabaseSourceLoader(){
+    super();
+  }
+
+  /**
+   * Constructor to force commit of active transaction once file has been loaded
+   * @param pImplicitCommit
+   */
+  public DatabaseSourceLoader(boolean pImplicitCommit){
+    super();
+    this.implicitCommit = pImplicitCommit;
+  }
+
   @Override
   public void doPromote(ScriptRunner pScriptRunner, PromotionFile pFile)
   throws ExPromote {
-    
+
     long lStart = System.currentTimeMillis();
     Logger.logInfo("\nPromote DatabaseSource " + pFile.getFilePath());
     //Read the DBSource file in
@@ -62,6 +80,10 @@ public void doPromote(ScriptRunner pScriptRunner, PromotionFile pFile)
       for(ScriptExecutable lExecutable : lExecutableList){
         lExecutable.execute(pScriptRunner.getDatabaseConnection());
       }
+      //  if the transaction is still active at the end of the script AND loader has implicitCommit flag set, perform a commit.
+      if (implicitCommit)
+        pScriptRunner.getDatabaseConnection().unsafelyCommit();
+
     }
     catch (Throwable th){      
       throw new ExPromote("Failed to promote DatabaseSource " + pFile.getFilePath() + ": " + th.getMessage(), th);