Merge pull request #153 from Barsonax/feature/optionalldfpersist

Made ldf persist move optional

Author: joostmeijles

xp/mssql/Boot.ps1

@@ -40,7 +40,12 @@ Get-ChildItem -Path $DataPath -Filter "*.mdf" | ForEach-Object {
         Invoke-Sqlcmd -Query "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') ALTER DATABASE [$databaseName] SET SINGLE_USER WITH ROLLBACK IMMEDIATE" -Querytimeout 65535 -ConnectionTimeout 65535
 
         Write-Host "### Reattaching '$databaseName'..."
-        $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath'), (FILENAME = N'$ldfPath') FOR ATTACH;"
+
+        $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath') FOR ATTACH;"
+        if (Test-Path $ldfPath) {
+            $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath'), (FILENAME = N'$ldfPath') FOR ATTACH;"
+        }
+        
         # Pass in explicit long timeouts because by default its not infinite (in contrary to what the documentation claims)
         Invoke-Sqlcmd -Query $sqlcmd -Querytimeout 65535 -ConnectionTimeout 65535
     } catch {
@@ -65,4 +70,4 @@ Invoke-Sqlcmd -Query $sqlcmd -Querytimeout 65535 -ConnectionTimeout 65535
 Write-Host "### Sitecore databases ready!"
 
 # Call Start.ps1 from the base image https://github.com/Microsoft/mssql-docker/blob/master/windows/mssql-server-windows-developer/dockerfile
-& C:\Start.ps1 -sa_password $env:sa_password -ACCEPT_EULA $env:ACCEPT_EULA -attach_dbs \"$env:attach_dbs\" -Verbose
+& C:\Start.ps1 -sa_password $env:sa_password -ACCEPT_EULA $env:ACCEPT_EULA -attach_dbs \"$env:attach_dbs\" -Verbose

xp/mssql/Persist-Databases.ps1

@@ -20,11 +20,13 @@ Get-ChildItem -Path $DataPath -Filter "*.mdf" | ForEach-Object {
         throw "Encountered a error while executing a sql query: $msg"
     }
 
-    Write-Host "### Moving '$mdfPath' and '$ldfPath' to '$InstallPath'"
+    Write-Host "### Moving '$mdfPath' and optionally '$ldfPath' to '$InstallPath'"
     Move-Item $mdfPath -Destination $InstallPath -Force
-    Move-Item $ldfPath -Destination $InstallPath -Force
+    if (Test-Path $ldfPath) {
+        Move-Item $ldfPath -Destination $InstallPath -Force
+    }
 }
 
 if (!((Get-ChildItem $DataPath -Filter "*.mdf" | Measure-Object).Count -eq 0)) {
     throw "Something went wrong during persisting the databases as $DataPath is not empty"
-}
+}