Merge pull request #67 from cyberious/master

Morgan Haskel · Morgan Haskel · commit 46845780a45c · 2015-01-28T11:18:33.000-08:00
Fix bug with TSQL provider rework
diff --git a/lib/puppet/templates/authenticated_query.ps1.erb b/lib/puppet/templates/authenticated_query.ps1.erb
@@ -24,7 +24,7 @@ if (!(Get-Command 'sqlcmd.exe' -ErrorAction SilentlyContinue)){
 }
 
 $result = sqlcmd.exe -i '<%= input_file %>' -h-1 -W -s ',' <% if @instance != 'MSSQLSERVER' %>-S localhost\<%= @instance %><%end%>
-    if($result -match "ERROR"){
+    if($result -match "THROW CAUGHT"){
     	Write-Host ($result | where {$_ -match "THROW CAUGHT"} | select -First 1)
         Write-Error -Message ($result | where {$_ -match "THROW CAUGHT"} | select -First 1)
 		exit(10)

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ if (!(Get-Command 'sqlcmd.exe' -ErrorAction SilentlyContinue)){`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`$result = sqlcmd.exe -i '<%= input_file %>' -h-1 -W -s ',' <% if @instance != 'MSSQLSERVER' %>-S localhost\<%= @instance %><%end%>`
`27`		`- if($result -match "ERROR"){`
	`27`	`+ if($result -match "THROW CAUGHT"){`
`28`	`28`	`Write-Host ($result \| where {$_ -match "THROW CAUGHT"} \| select -First 1)`
`29`	`29`	`Write-Error -Message ($result \| where {$_ -match "THROW CAUGHT"} \| select -First 1)`
`30`	`30`	`exit(10)`