yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes upgrade script

Browse Source 
[TFS Changeset #65962]
This commit is contained in:
Shandem
2010-05-05 12:16:00 +00:00
parent c5bb52f078
commit dcdb44975e
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/umbraco.controls/umbraco.controls.csproj
View File

@@ -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>

0
umbraco/datalayer/SqlHelpers/SqlServer/Sql/Version4_1_Upgrade.sql → umbraco/datalayer/SqlHelpers/SqlServer/Sql/Version4_Upgrade.sql
View File

23
umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.Designer.cs generated
View File

@@ -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);
}
}
}
}

3
umbraco/datalayer/SqlHelpers/SqlServer/SqlResources.resx
View File

@@ -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>

5
umbraco/datalayer/Utility/Installer/DefaultInstallerUtility.cs
View File

@@ -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

2
umbraco/datalayer/umbraco.datalayer.csproj
View File

@@ -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.