Updates to transactions

Added database diff to the psake script
Removed unused skipfilenamescontaining and filefilterservice code
Added logging to changescriptexecutor to show if a script is running in
a transaction
Cleaned up namespaces
Added testdata unit tests
Database baseliner tests in progress

Author: ericdc1

README.md

@@ -19,7 +19,7 @@ Logs to usd_AppliedDatabaseScript
 AliaSQL.exe Create .\sqlexpress ./scripts  
 ```
 
-Run all scripts in Create and Update folders that have not yet been ran - expects database to already exist.
+Run all scripts in Create and Update folders that have not yet been ran. If target database does not already exist it will be created. 
 Logs to usd_AppliedDatabaseScript
 ```dos
 AliaSQL.exe Update .\sqlexpress ./scripts  
@@ -31,13 +31,13 @@ Logs to usd_AppliedDatabaseScript
 AliaSQL.exe Rebuild .\sqlexpress ./scripts  
 ```
 
-Run all scripts in TestData folder that has yet been ran - expects database to already exist.
+Run all scripts in TestData folder that have not yet been ran - expects target database to already exist.
 Logs to usd_AppliedDatabaseTestDataScript
 ```dos
 AliaSQL.exe TestData .\sqlexpress ./scripts  
 ```
 
-Logs but does not execute all scripts in Create and Update folders that have not yet been ran - expects database to already exist. This is to add the usd_AppliedDatabaseScript table and a record of all scripts to a legacy database.
+Logs (but does not execute) all scripts in Create and Update folders that have not yet been ran - expects database to already exist. This adds the usd_AppliedDatabaseScript table and a record of all scripts to an existing database.
 Logs to usd_AppliedDatabaseScript
 ```dos
 AliaSQL.exe Baseline .\sqlexpress ./scripts  
@@ -52,6 +52,10 @@ Install it via Nuget at *Coming Soon* or download it via Github releases at http
 
 I like to create a console application in my solution that contains the Create/Update/Seed folders and a simple program to execute AliaSQL.exe from Visual Studio. Here is an example of this https://github.com/ericdc1/AliaSQL/blob/master/source/Database.Demo/Program.cs  There is a Nuget package that will set it up with the necessary folders and the program in a (hopefully empty) console application to make this as easy as possible.
 
+There is an example database console application with sample scripts available in the source. It includes helper batch files to Rebuild, Update, and populate Test Data to the Demo database.  
+
+There is also a database diff batch file that will compare the Demo database against the current set of Create and Update scripts and will generate a .sql file with the schema changes. Redgate SQL Compare is the better choice but this is free using SQLPackage.exe that comes with SQL Server Express. 
+
 Nuget package: *Coming Soon*
 
 Latest compiled version can be found here: https://github.com/ericdc1/AliaSQL/raw/master/nuget/content/scripts/AliaSQL.exe

database-diff.bat

@@ -0,0 +1,3 @@
+powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "& { Import-Module '.\lib\psakev4\psake.psm1'; Invoke-psake GenerateDatabaseDiff;  }" 
+
+pause

default.ps1

@@ -1,14 +1,14 @@
 properties {
 	$projectName = "AliaSQL" 
-    $version = "1.0.1"
+    $version = "1.0.2"
 
     $version = $version + "." + (get-date -format "MMdd")  
 	$projectConfig = "Release"
 	$base_dir = resolve-path .
 	$source_dir = "$base_dir\source"
     $unitTestAssembly = "$projectName.UnitTests.dll"
     $nunitPath = "$source_dir\packages\NUnit.Runners.2.6.3\tools\"
-    $AliaSQLPath = "$base_dir\lib\AliaSQL\"
+    $AliaSQLPath = "$base_dir\lib\AliaSQL\AliaSQL.exe"
 	$build_dir = "$base_dir\build"
 	$test_dir = "$build_dir\test"
 	$testCopyIgnorePath = "_ReSharper"
@@ -17,6 +17,7 @@ properties {
 	$databaseServer = ".\sqlexpress"
 	$databaseScripts = "$source_dir\Database.Demo"
 	$databaseName = "Demo"
+    $SqlPackagePath = "C:\Program Files (x86)\Microsoft SQL Server\110\DAC\bin\SqlPackage.exe"
 }
 
 task default -depends Init, UpdateAssemblyInfo, Compile, Test
@@ -63,22 +64,22 @@ task UpdateAssemblyInfo {
 }
 
 task RebuildDatabase {
-    exec { & $AliaSQLPath\AliaSQL.exe Rebuild $databaseServer "$databaseName" "$databaseScripts\Scripts"}
+    exec { & $AliaSQLPath Rebuild $databaseServer "$databaseName" "$databaseScripts\Scripts"}
 }
 
 task UpdateDatabase {
-        exec { & $AliaSQLPath\AliaSQL.exe Update $databaseServer "$databaseName" "$databaseScripts\Scripts"}
+        exec { & $AliaSQLPath Update $databaseServer "$databaseName" "$databaseScripts\Scripts"}
 }
 
 task TestDataDatabase { 
-    exec { &  $AliaSQLPath\AliaSQL.exe TestData $databaseServer " $databaseName" "$databaseScripts\Scripts"}
+    exec { &  $AliaSQLPath TestData $databaseServer " $databaseName" "$databaseScripts\Scripts"}
 }
 
 task Package -depends Compile {	
     write-host "Copy in database scripts"
     copy_files "$databaseScripts\scripts" "$package_dir\database\"
     write-host "Copy AliaSQL tool so scripts can be ran"
-    copy_files "$AliaSQLPath"  "$package_dir\database\"
+    copy-item "$AliaSQLPath"  "$package_dir\database\AliaSQL.exe"
     write-host "Create batch files to run db updates"
     create-dbdeployscript "Update" "$package_dir\database\_Update-Database.bat"
     create-dbdeployscript "Rebuild" "$package_dir\database\_Rebuild-Database.bat"
@@ -114,6 +115,77 @@ task Package -depends Compile {
 	copy-item $package_dir\AliaSQL\AliaSQL.exe $base_dir\lib\AliaSQL\AliaSQL.exe -Force
 }
 
+task GenerateDatabaseDiff {
+    create-dbdiffscript $databaseName $databaseScripts
+}
+
+function create-dbdiffscript([string]$datebase_name, [string]$database_scripts)
+{
+    $databaseName_Original = "$datebase_name" + "_Original"
+    $databaseScriptsUpdate = "$database_scripts\Scripts\Update"
+    $newScriptName = ((Get-ChildItem $databaseScriptsUpdate -filter "*.sql" | ForEach-Object {[int]$_.Name.Substring(0, 4)} | Sort-Object)[-1] + 1).ToString("0000-") + "$datebase_name" + ".sql.temp"
+
+    write-host "Building original database..."
+    copy_files "$databaseScripts\Deploy-Once" "$package_dir\temp\DBCreate\update"
+    exec { & $AliaSQLPath Rebuild $databaseServer "$databaseName_Original" "$database_scripts\Scripts"}
+    
+    write-host "`n`nGenerating the diff script"
+    #generate the needed .dacpac (we'll delete it later)
+    exec { & $SqlPackagePath /a:Extract /ssn:.\SQLEXPRESS /sdn:"$datebase_name" /tf:$databaseScripts\$datebase_name.dacpac }
+    #generate the diff script
+    exec { & $SqlPackagePath /a:Script /op:$databaseScriptsUpdate\$newScriptName /sf:$databaseScripts\$datebase_name.dacpac /tsn:.\SQLEXPRESS /tdn:"$databaseName_Original"}
+    
+    write-host "`n`nCleaning up generated script..."
+    $scriptLines = Get-Content $databaseScriptsUpdate\$newScriptName
+    Clear-Content $databaseScriptsUpdate\$newScriptName
+
+    $passedLastSqlCmd = $false
+    $skipBlock = $false
+    $blocksToSkip = "usd_AppliedDatabaseScript","usd_AppliedDatabaseTestDataScript", "IX_usd_DateApplied"
+    $noDiff = $true
+    $noDiffLines = "", "GO", "PRINT N'Update complete.';" #these are the only lines left when there are no DB diffs
+    foreach($line in $scriptLines)
+    {   
+        #don't add anything until we get past the line USE [`$(DatabaseName)]; -- all the previous stuff should be sqlcmd/unncessary junk 
+        if ($line -eq "USE [`$(DatabaseName)];")
+        {
+            $passedLastSqlCmd = $true
+        }
+        #skip any blocks which contain any of the text in the skippable array
+        elseif ($blocksToSkip | Where-Object { $line.Contains($_) })
+        {
+             $skipBlock = $true
+        }        
+        elseif ($passedLastSqlCmd -and -not $skipBlock)
+        {
+            $newLine = "$line"
+            Add-Content $databaseScriptsUpdate\$newScriptName "$newLine"
+
+            if ($noDiff)
+            {
+                $noDiff = $noDiffLines.Contains($newLine)
+            }
+        }
+        elseif ($line -eq "GO")
+        {
+            $skipBlock = $false
+        }
+    }    
+
+    write-host "Cleaning up temporary files and databases..."
+    exec { & del $databaseScripts\$datebase_name.dacpac }
+    exec { & sqlcmd -S .\SQLEXPRESS -Q "DROP DATABASE $databaseName_Original"  }
+
+    if ($noDiff)
+    {
+        Remove-Item $databaseScriptsUpdate\$newScriptName
+         write-host "No schema changes found for $datebase_name" -foregroundcolor "green"
+    }
+    else 
+    {
+        write-host "Please validate the new script $databaseScriptsUpdate\$newScriptName is correct, then rename to .sql and add to the database project" -foregroundcolor "yellow"
+    }
+}
 
 function global:zip_directory($directory,$file) {
     write-host "Zipping folder: " $test_assembly
@@ -211,6 +283,8 @@ function Update-AssemblyInfoFiles ([string] $version, [System.Array] $excludes =
 		}
 
 		if (test-path ($filename)) { remove-item $filename }
+        #diff tools aren't too happy with Unicode files - change it to ansi
+        Set-Content $tmp -Encoding ASCII -Value (Get-Content $tmp)
 		move-item $tmp $filename -force		
 
 	}

lib/AliaSQL/AliaSQL.exe

@@ -72,7 +72,6 @@
     <Compile Include="Services\IDatabaseActionResolver.cs" />
     <Compile Include="Services\IDatabaseConnectionDropper.cs" />
     <Compile Include="Services\IDatabaseVersioner.cs" />
-    <Compile Include="Services\IFileFilterService.cs" />
     <Compile Include="Services\ILogMessageGenerator.cs" />
     <Compile Include="Services\Impl\TestDataScriptExecutor.cs" />
     <Compile Include="Services\Impl\ChangeScriptExecutor.cs" />
@@ -86,7 +85,6 @@
     <Compile Include="Services\Impl\DatabaseTestData.cs" />
     <Compile Include="Services\Impl\DatabaseUpdater.cs" />
     <Compile Include="Services\Impl\DatabaseVersioner.cs" />
-    <Compile Include="Services\Impl\FileFilterService.cs" />
     <Compile Include="Services\Impl\IDataBaseActionLocator.cs" />
     <Compile Include="Services\Impl\LogMessageGenerator.cs" />
     <Compile Include="Services\Impl\QueryExecutor.cs" />

nuget/content/scripts/AliaSQL.exe

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using AliaSQL.Core.Services;
 using AliaSQL.Core.Services.Impl;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core
 {

source/AliaSQL.Console/Properties/AssemblyInfo.cs

@@ -11,7 +11,6 @@ public TaskAttributes(ConnectionSettings connectionSettings, string scriptDirect
         }
 
         public ConnectionSettings ConnectionSettings { get; set; }
-        public string SkipFileNameContaining { get; set; }
         public string ScriptDirectory { get; set; }
         public RequestedDatabaseAction RequestedDatabaseAction { get; set; }
 

source/AliaSQL.Core/AliaSQL.Core.csproj

@@ -2,7 +2,6 @@
 using System.IO;
 using AliaSQL.Core.Model;
 using AliaSQL.Core;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core.Services.Impl
 {
@@ -36,15 +35,23 @@ public void Execute(string fullFilename, ConnectionSettings settings, ITaskObser
             }
             else
             {
-                taskObserver.Log(string.Format("Executing: {0}", scriptFilename));
                 if (!logOnly)
                 {
                     string sql = _fileSystem.ReadTextFile(fullFilename);
-                    _executor.ExecuteNonQueryTransactional(settings, sql);
+                    if (!ScriptSupportsTransactions(sql))
+                    {
+                        taskObserver.Log(string.Format("Executing: {0}", scriptFilename));
+                        _executor.ExecuteNonQuery(settings, sql, true);
+                    }
+                    else
+                    {
+                        taskObserver.Log(string.Format("Executing: {0} in a transaction", scriptFilename));
+                        _executor.ExecuteNonQueryTransactional(settings, sql); 
+                    }                 
                 }
                 else
                 {
-                    taskObserver.Log("Executed in log only mode");
+                    taskObserver.Log(string.Format("Executing: {0} in log only mode", scriptFilename));
                 }
 
                 _executionTracker.MarkScriptAsExecuted(settings, scriptFilename, taskObserver);
@@ -55,5 +62,28 @@ private string getFilename(string fullFilename)
         {
             return Path.GetFileName(fullFilename);
         }
+        /// <summary>
+        /// Some commands are not allowed inside transactions
+        /// http://msdn.microsoft.com/en-us/library/ms191544.aspx
+        /// </summary>
+        private bool ScriptSupportsTransactions(string sql)
+        {
+            if (sql.IndexOf("ALTER DATABASE", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("ALTER FULLTEXT CATALOG ", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("ALTER FULLTEXT INDEX ", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("BACKUP ", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("CREATE DATABASE", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("CREATE FULLTEXT CATALOG ", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("CREATE FULLTEXT INDEX", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("DROP DATABASE", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("DROP FULLTEXT CATALOG", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("DROP FULLTEXT INDEX", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("RECONFIGURE", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+            if (sql.IndexOf("RESTORE ", StringComparison.OrdinalIgnoreCase) >= 0) return false;
+
+            //UPDATE STATISTICS can be used inside an explicit transaction. However, UPDATE STATISTICS commits independently of the enclosing transaction and cannot be rolled back.
+
+            return true;
+        }
     }
 }

source/AliaSQL.Core/Factory.cs

@@ -1,7 +1,6 @@
 using System;
 using AliaSQL.Core.Model;
 using AliaSQL.Core;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core.Services.Impl
 {

source/AliaSQL.Core/Model/TaskAttributes.cs

@@ -1,6 +1,5 @@
 using System;
 using AliaSQL.Core.Model;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core.Services.Impl
 {

source/AliaSQL.Core/Properties/AssemblyInfo.cs

@@ -1,6 +1,5 @@
 using System;
 using AliaSQL.Core.Model;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core.Services.Impl
 {

source/AliaSQL.Core/Services/IFileFilterService.cs

@@ -1,6 +1,5 @@
 using System;
 using AliaSQL.Core.Model;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core.Services.Impl
 {

source/AliaSQL.Core/Services/Impl/ChangeScriptExecutor.cs

@@ -1,7 +1,6 @@
 using System;
 using AliaSQL.Core.Model;
 using AliaSQL.Core;
-using AliaSQL.Infrastructure.DatabaseManager.DataAccess;
 
 namespace AliaSQL.Core.Services.Impl
 {

source/AliaSQL.Core/Services/Impl/DatabaseConnectionDropper.cs

@@ -12,11 +12,7 @@ public string GetInitialMessage(TaskAttributes taskAttributes)
 															? string.Format(" using scripts from {0}", taskAttributes.ScriptDirectory)
 															: string.Empty;
 
-		    var skipFiles = !string.IsNullOrEmpty(taskAttributes.SkipFileNameContaining)
-		                        ? string.Format(" while skipping file containing {0}",taskAttributes.SkipFileNameContaining)
-		                        : string.Empty;
-
-            var logMessage = string.Format("{0} {1} on {2}{3}{4}\n", taskAttributes.RequestedDatabaseAction,taskAttributes.ConnectionSettings.Database, taskAttributes.ConnectionSettings.Server, scriptFolder,skipFiles);
+            var logMessage = string.Format("{0} {1} on {2}{3}\n", taskAttributes.RequestedDatabaseAction,taskAttributes.ConnectionSettings.Database, taskAttributes.ConnectionSettings.Server, scriptFolder);
 
 			return logMessage;
 		}