Merge pull request #41 from crimdon/regex-change

Regex change
crimdon · Sep 28, 2017 · e34327a · e34327a
2 parents 38a309c + de0223f
commit e34327a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/RunSingleSqlScript/RunSingleSqlScript.ps1 b/RunSingleSqlScript/RunSingleSqlScript.ps1
@@ -48,11 +48,11 @@ Try {
             #Execute the query
             switch ($removeComments) {
                 $true {
-                    (Get-Content $sqlScript -Encoding UTF8 | Out-String) -replace '(?s)/\*.*?\*/', " " -split '\r?\ngo\r?\n' -notmatch '^\s*$' |
+                    (Get-Content $sqlScript -Encoding UTF8 | Out-String) -replace '(?s)/\*.*?\*/', " " -split '\r?\ngo' -notmatch '^\s*$' |
                         ForEach-Object { $SqlCmd.CommandText = $_.Trim(); $reader = $SqlCmd.ExecuteNonQuery() }
                 }
                 $false {
-                    (Get-Content $sqlScript -Encoding UTF8 | Out-String) -split '\r?\ngo\r?\n' |
+                    (Get-Content $sqlScript -Encoding UTF8 | Out-String) -split '\r?\ngo' -notmatch '^\s*$' |
                         ForEach-Object { $SqlCmd.CommandText = $_.Trim(); $reader = $SqlCmd.ExecuteNonQuery() }
                 }
             }

diff --git a/RunSingleSqlScript/task.json b/RunSingleSqlScript/task.json
@@ -8,7 +8,7 @@
     "version": {
         "Major": "2",
         "Minor": "3",
-        "Patch": "4"
+        "Patch": "7"
     },
     "groups": [
         {

diff --git a/RunSqlScripts/RunSqlScripts.ps1 b/RunSqlScripts/RunSqlScripts.ps1
@@ -55,11 +55,11 @@ Try {
                     #Execute the query
                     switch ($removeComments) {
                         $true {
-                            (Get-Content $sqlScript.FullName -Encoding UTF8 | Out-String) -replace '(?s)/\*.*?\*/', " " -split '\r?\ngo\r?\n' -notmatch '^\s*$' |
+                            (Get-Content $sqlScript.FullName -Encoding UTF8 | Out-String) -replace '(?s)/\*.*?\*/', " " -split '\r?\ngo' -notmatch '^\s*$' |
                                 ForEach-Object { $SqlCmd.CommandText = $_.Trim(); $reader = $SqlCmd.ExecuteNonQuery() }
                         }
                         $false {
-                            (Get-Content $sqlScript.FullName -Encoding UTF8 | Out-String) -split '\r?\ngo\r?\n' |
+                            (Get-Content $sqlScript.FullName -Encoding UTF8 | Out-String) -split '\r?\ngo' -notmatch '^\s*$' |
                                 ForEach-Object { $SqlCmd.CommandText = $_.Trim(); $reader = $SqlCmd.ExecuteNonQuery() }
                         }
                     }

diff --git a/RunSqlScripts/task.json b/RunSqlScripts/task.json
@@ -8,7 +8,7 @@
     "version": {
         "Major": "2",
         "Minor": "4",
-        "Patch": "9"
+        "Patch": "10"
     },
     "groups": [
         {

diff --git a/vss-extension.json b/vss-extension.json
@@ -2,7 +2,7 @@
     "manifestVersion": 1,
     "id": "sql-toolkit",
     "name": "SQL Toolkit",
-    "version": "2.7.3",
+    "version": "2.7.7",
     "publisher": "andrewlackenby",
     "public": true,
 	"categories": [