Merge pull request #162 from jelster/patch-1

perrysk-msft · web-flow · commit 9bdcd4b15ae0 · 2017-01-05T12:37:57.000-08:00
prevent attach failure when db name contains '.'
diff --git a/samples/manage/windows-containers/mssql-server-2016-express-sp1-windows/start.ps1 b/samples/manage/windows-containers/mssql-server-2016-express-sp1-windows/start.ps1
@@ -46,12 +46,12 @@ if ($null -ne $dbs -And $dbs.Length -gt 0){
 		}
 		
 		$files = $files -join ","
-		$sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"
+		$sqlcmd = "sp_detach_db ""$($db.dbName)"";CREATE DATABASE ""$($db.dbName)"" ON $($files) FOR ATTACH ;"
 
 		Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"
 		Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"
 	}
 }
 
 Write-Verbose "Started SQL Server."
-while ($true) { Start-Sleep -Seconds 3600 }
+while ($true) { Start-Sleep -Seconds 3600 }

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ if ($null -ne $dbs -And $dbs.Length -gt 0){`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$files = $files -join ","`
`49`		`- $sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"`
	`49`	`+ $sqlcmd = "sp_detach_db ""$($db.dbName)"";CREATE DATABASE ""$($db.dbName)"" ON $($files) FOR ATTACH ;"`
`50`	`50`
`51`	`51`	`Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"`
`52`	`52`	`Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`Write-Verbose "Started SQL Server."`
`57`		`-while ($true) { Start-Sleep -Seconds 3600 }`
	`57`	`+while ($true) { Start-Sleep -Seconds 3600 }`