U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option

nul800sebastiaan · nul800sebastiaan · commit cdda69c4cd62 · 2013-09-30T12:39:28.000+02:00
diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
@@ -112,7 +112,7 @@ public DatabaseProviders DatabaseProvider
         public void ConfigureEmbeddedDatabaseConnection()
         {
             const string providerName = "System.Data.SqlServerCe.4.0";
-            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;File Access Retry Timeout=10";
+            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";
 
             SaveConnectionString(connectionString, providerName);
 
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
@@ -26,7 +26,7 @@
   </appSettings>
   
   <connectionStrings>
-    <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10" providerName="System.Data.SqlServerCe.4.0"/>
+    <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
   </connectionStrings>
 
   <FileSystemProviders>
diff --git a/src/Umbraco.Tests/BusinessLogic/BaseTest.cs b/src/Umbraco.Tests/BusinessLogic/BaseTest.cs
@@ -53,7 +53,7 @@ private void ClearDatabase()
 
         private void InitializeDatabase()
         {
-            ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10");
+            ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf;Flush Interval=1;");
 
 			ClearDatabase();
 
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs
@@ -57,7 +57,7 @@ public override ISqlSyntaxProvider GetSyntaxProvider()
 
         public override UmbracoDatabase GetConfiguredDatabase()
         {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
         }
 
         public override DatabaseProviders GetDatabaseProvider()
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs
@@ -63,7 +63,7 @@ public override ISqlSyntaxProvider GetSyntaxProvider()
 
         public override UmbracoDatabase GetConfiguredDatabase()
         {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
         }
 
         public override DatabaseProviders GetDatabaseProvider()
diff --git a/src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs b/src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs
@@ -100,7 +100,7 @@ public virtual void TearDown()
 
         public UmbracoDatabase GetConfiguredDatabase()
         {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
         }
 
         public string GetDatabaseSpecificSqlScript()
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -69,7 +69,7 @@ public void Can_Assert_Created_Database()
             //Get the connectionstring settings from config
             var settings = ConfigurationManager.ConnectionStrings[Core.Configuration.GlobalSettings.UmbracoConnectionName];
 
-            //by default the conn string is: Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10
+            //by default the conn string is: Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;
             //we'll just replace the sdf file with our custom one:
             //Create the Sql CE database
             var engine = new SqlCeEngine(settings.ConnectionString.Replace("UmbracoPetaPocoTests", "DatabaseContextTests"));
diff --git a/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs b/src/Umbraco.Tests/Persistence/SqlCeTableByTableTest.cs
@@ -35,12 +35,12 @@ public override void Initialize()
             }
 
             //Create the Sql CE database
-            var engine = new SqlCeEngine("Datasource=|DataDirectory|test.sdf;Flush Interval=1;File Access Retry Timeout=10");
+            var engine = new SqlCeEngine("Datasource=|DataDirectory|test.sdf;Flush Interval=1;");
             engine.CreateDatabase();
             
             SqlSyntaxContext.SqlSyntaxProvider = SqlCeSyntax.Provider;
 
-            _database = new Database("Datasource=|DataDirectory|test.sdf;Flush Interval=1;File Access Retry Timeout=10",
+            _database = new Database("Datasource=|DataDirectory|test.sdf;Flush Interval=1;",
                                      "System.Data.SqlServerCe.4.0");
         }
 
diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -105,7 +105,7 @@ protected virtual string GetDbProviderName()
         /// </summary>
         protected virtual string GetDbConnectionString()
         {
-            return @"Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10";            
+            return @"Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;";            
         }
 
         /// <summary>
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -47,7 +47,7 @@ public static void DropForeignKeys(string table)
 		/// </summary>
 		public static void InitializeDatabase()
 		{
-            ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10");
+            ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf;Flush Interval=1;");
 
 			ClearDatabase();
             
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -46,6 +46,7 @@
     <IISExpressUseClassicPipelineMode />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public DatabaseProviders DatabaseProvider`
`112`	`112`	`public void ConfigureEmbeddedDatabaseConnection()`
`113`	`113`	`{`
`114`	`114`	`const string providerName = "System.Data.SqlServerCe.4.0";`
`115`		`- const string connectionString = @"Data Source=\|DataDirectory\|\Umbraco.sdf;Flush Interval=1;File Access Retry Timeout=10";`
	`115`	`+ const string connectionString = @"Data Source=\|DataDirectory\|\Umbraco.sdf;Flush Interval=1;";`
`116`	`116`
`117`	`117`	`SaveConnectionString(connectionString, providerName);`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private void ClearDatabase()`
`53`	`53`
`54`	`54`	`private void InitializeDatabase()`
`55`	`55`	`{`
`56`		`- ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=\|DataDirectory\|\UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10");`
	`56`	`+ ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=\|DataDirectory\|\UmbracoPetaPocoTests.sdf;Flush Interval=1;");`
`57`	`57`
`58`	`58`	`ClearDatabase();`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public override ISqlSyntaxProvider GetSyntaxProvider()`
`57`	`57`
`58`	`58`	`public override UmbracoDatabase GetConfiguredDatabase()`
`59`	`59`	`{`
`60`		`- return new UmbracoDatabase("Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");`
	`60`	`+ return new UmbracoDatabase("Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public override DatabaseProviders GetDatabaseProvider()`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public override ISqlSyntaxProvider GetSyntaxProvider()`
`63`	`63`
`64`	`64`	`public override UmbracoDatabase GetConfiguredDatabase()`
`65`	`65`	`{`
`66`		`- return new UmbracoDatabase("Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");`
	`66`	`+ return new UmbracoDatabase("Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public override DatabaseProviders GetDatabaseProvider()`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public virtual void TearDown()`
`100`	`100`
`101`	`101`	`public UmbracoDatabase GetConfiguredDatabase()`
`102`	`102`	`{`
`103`		`- return new UmbracoDatabase("Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");`
	`103`	`+ return new UmbracoDatabase("Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public string GetDatabaseSpecificSqlScript()`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ public override void Initialize()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`//Create the Sql CE database`
`38`		`- var engine = new SqlCeEngine("Datasource=\|DataDirectory\|test.sdf;Flush Interval=1;File Access Retry Timeout=10");`
	`38`	`+ var engine = new SqlCeEngine("Datasource=\|DataDirectory\|test.sdf;Flush Interval=1;");`
`39`	`39`	`engine.CreateDatabase();`
`40`	`40`
`41`	`41`	`SqlSyntaxContext.SqlSyntaxProvider = SqlCeSyntax.Provider;`
`42`	`42`
`43`		`- _database = new Database("Datasource=\|DataDirectory\|test.sdf;Flush Interval=1;File Access Retry Timeout=10",`
	`43`	`+ _database = new Database("Datasource=\|DataDirectory\|test.sdf;Flush Interval=1;",`
`44`	`44`	`"System.Data.SqlServerCe.4.0");`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected virtual string GetDbProviderName()`
`105`	`105`	`/// </summary>`
`106`	`106`	`protected virtual string GetDbConnectionString()`
`107`	`107`	`{`
`108`		`- return @"Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10";`
	`108`	`+ return @"Datasource=\|DataDirectory\|UmbracoPetaPocoTests.sdf;Flush Interval=1;";`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static void DropForeignKeys(string table)`
`47`	`47`	`/// </summary>`
`48`	`48`	`public static void InitializeDatabase()`
`49`	`49`	`{`
`50`		`- ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=\|DataDirectory\|\UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10");`
	`50`	`+ ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=\|DataDirectory\|\UmbracoPetaPocoTests.sdf;Flush Interval=1;");`
`51`	`51`
`52`	`52`	`ClearDatabase();`
`53`	`53`