From eba78537a807e1e8b5830e3f65a962cdbb152267 Mon Sep 17 00:00:00 2001
From: Alex Ebadirad <alex@ebadirad.com>
Date: Tue, 19 Dec 2017 11:44:37 -0800
Subject: [PATCH 1/2] #608 - set sourceClient variable with sourceDB if the
 local variable is set, instead of from the inherited project object

---
 .../main/groovy/com/marklogic/gradle/task/RunFlowTask.groovy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/RunFlowTask.groovy b/ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/RunFlowTask.groovy
index 1e14fc0e1c..9c448362a3 100644
--- a/ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/RunFlowTask.groovy
+++ b/ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/RunFlowTask.groovy
@@ -63,8 +63,9 @@ class RunFlowTask extends HubTask {
         }
 
         DatabaseClient sourceClient = null
-        if (sourceDB != null) {
-            sourceClient = hubConfig.newStagingClient(project.property("sourceDB"))
+
+        if (sourceDB != null && !sourceDB.isAllWhitespace()) {
+            sourceClient = hubConfig.newStagingClient(sourceDB)
         }
         else if (project.hasProperty("sourceDB")) {
             sourceClient = hubConfig.newStagingClient(project.property("sourceDB"))

From 4e15aee3a0cd7288a2166c0602923574dc8d2144 Mon Sep 17 00:00:00 2001
From: Alexander Ebadirad <alex@ebadirad.com>
Date: Thu, 4 Jan 2018 10:52:06 -0700
Subject: [PATCH 2/2] #608 - Add a test to check if sourceDB is set (set it to
 an incorrect value to cause the creation of the flow to fail)

---
 .../task/CreateHarmonizeFlowTaskTest.groovy    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateHarmonizeFlowTaskTest.groovy b/ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateHarmonizeFlowTaskTest.groovy
index 35e395c06b..009724d39b 100644
--- a/ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateHarmonizeFlowTaskTest.groovy
+++ b/ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateHarmonizeFlowTaskTest.groovy
@@ -40,6 +40,24 @@ class CreateHarmonizeFlowTaskTest extends BaseTest {
         result.task(":hubCreateHarmonizeFlow").outcome == FAILED
     }
 
+    def "createHarmonizeFlow with bad sourceDB"() {
+        given:
+        propertiesFile << """
+            ext {
+                entityName=my-new-entity
+                sourceDB=12345678      
+            }
+        """
+
+        when:
+        def result = runFailTask('hubCreateHarmonizeFlow')
+
+        then:
+        notThrown(UnexpectedBuildSuccess)
+        result.output.contains('sourceDB must be a valid name')
+        result.task(":hubCreateHarmonizeFlow").outcome == FAILED
+    }
+
     def "createHarmonizeFlow with valid name"() {
         given:
         propertiesFile << """