From dcdb44975e44b4334d3166e5483519207ab35eb8 Mon Sep 17 00:00:00 2001
From: Shandem <unknown@kiln.example.com>
Date: Wed, 5 May 2010 12:16:00 +0000
Subject: [PATCH] Fixes upgrade script

[TFS Changeset #65962]
---
 .../umbraco.controls/umbraco.controls.csproj  |  4 ----
 ...on4_1_Upgrade.sql => Version4_Upgrade.sql} |  0
 .../SqlServer/SqlResources.Designer.cs        | 23 +++++++++++++++++++
 .../SqlHelpers/SqlServer/SqlResources.resx    |  3 +++
 .../Installer/DefaultInstallerUtility.cs      |  5 ++++
 umbraco/datalayer/umbraco.datalayer.csproj    |  2 +-
 6 files changed, 32 insertions(+), 5 deletions(-)
 rename umbraco/datalayer/SqlHelpers/SqlServer/Sql/{Version4_1_Upgrade.sql => Version4_Upgrade.sql} (100%)

diff --git a/components/umbraco.controls/umbraco.controls.csproj b/components/umbraco.controls/umbraco.controls.csproj
index 55a0106984..089c452066 100644
--- a/components/umbraco.controls/umbraco.controls.csproj
+++ b/components/umbraco.controls/umbraco.controls.csproj
@@ -41,10 +41,6 @@
     <DocumentationFile>..\..\umbraco\presentation\bin\controls.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AjaxControlToolkit, Version=1.0.10920.32880, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\foreign dlls\AjaxControlToolkit.dll</HintPath>
-    </Reference>
     <Reference Include="ClientDependency.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\foreign dlls\ClientDependency.Core.dll</HintPath>
diff --git a/umbraco/datalayer/SqlHelpers/SqlServer/Sql/Version4_1_Upgrade.sql b/umbraco/datalayer/SqlHelpers/SqlServer/Sql/Version4_Upgrade.sql
similarity index 100%
rename from umbraco/datalayer/SqlHelpers/SqlServer/Sql/Version4_1_Upgrade.sql
rename to umbraco/datalayer/SqlHelpers/SqlServer/Sql/Version4_Upgrade.sql
diff --git a/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.Designer.cs b/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.Designer.cs
index d7be0fe115..fe96bb799f 100644
--- a/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.Designer.cs
+++ b/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.Designer.cs
@@ -109,5 +109,28 @@ namespace umbraco.DataLayer.SqlHelpers.SqlServer {
                 return ResourceManager.GetString("Version3_Upgrade", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        ////*******************************************************************************************
+        ///
+        ///
+        ///
+        ///
+        ///    Umbraco database installation script for SQL Server (upgrade from Umbraco 4.0.x)
+        /// 
+        ///IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+        /// 
+        ///    Database version: 4.1.0.0
+        ///    
+        ///    Please increment this version number if ANY change is made to this script,
+        ///    so compatibility with scripts for other database systems can be verified easily.
+        ///    The first 3 digits [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string Version4_Upgrade {
+            get {
+                return ResourceManager.GetString("Version4_Upgrade", resourceCulture);
+            }
+        }
     }
 }
diff --git a/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.resx b/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.resx
index 0563f0ff27..a232781057 100644
--- a/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.resx
+++ b/umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.resx
@@ -124,4 +124,7 @@
   <data name="Version3_Upgrade" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>sql\version3_upgrade.sql;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Version4_Upgrade" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>sql\version4_upgrade.sql;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/umbraco/datalayer/Utility/Installer/DefaultInstallerUtility.cs b/umbraco/datalayer/Utility/Installer/DefaultInstallerUtility.cs
index 2a8b95bef8..f3ea0758a1 100644
--- a/umbraco/datalayer/Utility/Installer/DefaultInstallerUtility.cs
+++ b/umbraco/datalayer/Utility/Installer/DefaultInstallerUtility.cs
@@ -220,6 +220,11 @@ namespace umbraco.DataLayer.Utility.Installer
         /// <param name="statements">The statements.</param>
         protected void ExecuteStatements(string statements)
         {
+            if (string.IsNullOrEmpty(statements))
+            {
+                throw new ArgumentNullException("statements", "The sql statement to execute is empty. Database version: " + CurrentVersion.ToString());
+            }
+
             // replace block comments by whitespace
             statements = m_findComments.Replace(statements, " ");
             // execute all non-empty statements
diff --git a/umbraco/datalayer/umbraco.datalayer.csproj b/umbraco/datalayer/umbraco.datalayer.csproj
index 548b04ff1d..b6c7d7d988 100644
--- a/umbraco/datalayer/umbraco.datalayer.csproj
+++ b/umbraco/datalayer/umbraco.datalayer.csproj
@@ -142,7 +142,7 @@
     <None Include="SqlHelpers\MySql\Sql\Total.sql" />
     <None Include="SqlHelpers\MySql\Sql\Version4_Upgrade.sql" />
     <None Include="SqlHelpers\SqlServer\Sql\Version3_Upgrade.sql" />
-    <None Include="SqlHelpers\SqlServer\Sql\Version4_1_Upgrade.sql" />
+    <None Include="SqlHelpers\SqlServer\Sql\Version4_Upgrade.sql" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.