Minor fixes

muratcakir · muratcakir · commit aa42f9ebba60 · 2015-07-15T20:43:13.000+02:00
diff --git a/src/Libraries/SmartStore.Data/Migrations/201403112331027_Initial.cs b/src/Libraries/SmartStore.Data/Migrations/201403112331027_Initial.cs
@@ -1774,13 +1774,13 @@ public override void Up()
 			#endregion
 
 			#region Custom
-			
-			this.SqlFile("Indexes.sql");
+
+			this.SqlFileOrResource("Indexes.sql");
 			if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)
 			{
 				// do not execute in unit tests
-				this.SqlFile("Indexes.SqlServer.sql");
-				this.SqlFile("StoredProcedures.sql");
+				this.SqlFileOrResource("Indexes.SqlServer.sql");
+				this.SqlFileOrResource("StoredProcedures.sql");
 			}
 
 			#endregion
@@ -1790,12 +1790,12 @@ public override void Down()
 		{
 			#region Custom
 
-			this.SqlFile("Indexes.Inverse.sql");
+			this.SqlFileOrResource("Indexes.Inverse.sql");
 			if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)
 			{
 				// do not execute in unit tests
-				this.SqlFile("Indexes.SqlServer.Inverse.sql");
-				this.SqlFile("StoredProcedures.Inverse.sql");
+				this.SqlFileOrResource("Indexes.SqlServer.Inverse.sql");
+				this.SqlFileOrResource("StoredProcedures.Inverse.sql");
 			}
 
 			#endregion
diff --git a/src/Libraries/SmartStore.Data/Migrations/201504131412183_NewCategoryProperties.cs b/src/Libraries/SmartStore.Data/Migrations/201504131412183_NewCategoryProperties.cs
@@ -18,7 +18,7 @@ public override void Up()
 
 			if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)
 			{
-				this.SqlFile("LatestProductLoadAllPaged.sql");
+				this.SqlFileOrResource("LatestProductLoadAllPaged.sql");
 			}
         }
         
diff --git a/src/Libraries/SmartStore.Data/Migrations/201506261756463_PrimaryStoreCurrencyMultiStore.cs b/src/Libraries/SmartStore.Data/Migrations/201506261756463_PrimaryStoreCurrencyMultiStore.cs
@@ -2,6 +2,7 @@ namespace SmartStore.Data.Migrations
 {
 	using System.Data.Entity.Migrations;
 	using System.Linq;
+	using System.Web.Hosting;
 	using SmartStore.Core.Data;
 	using SmartStore.Core.Domain.Configuration;
 	using SmartStore.Core.Domain.Directory;
@@ -16,7 +17,7 @@ public override void Up()
 			AddColumn("dbo.Store", "PrimaryExchangeRateCurrencyId", c => c.Int(nullable: false, defaultValue: 1));
 
 			// avoid conflicts with foreign key constraint
-			if (DataSettings.Current.IsSqlServer)
+			if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)
 			{
 				// what sql-server compact does not support here:
 				// - Update Set with a select sub-query
@@ -28,23 +29,23 @@ public override void Up()
 				Sql("Update dbo.Store Set PrimaryExchangeRateCurrencyId = (Select Min(Id) From dbo.Currency)");
 			}
 
-            CreateIndex("dbo.Store", "PrimaryStoreCurrencyId");
-            CreateIndex("dbo.Store", "PrimaryExchangeRateCurrencyId");
+			CreateIndex("dbo.Store", "PrimaryStoreCurrencyId");
+			CreateIndex("dbo.Store", "PrimaryExchangeRateCurrencyId");
 
 			AddForeignKey("dbo.Store", "PrimaryExchangeRateCurrencyId", "dbo.Currency", "Id");
 			AddForeignKey("dbo.Store", "PrimaryStoreCurrencyId", "dbo.Currency", "Id");
         }
         
         public override void Down()
         {
-            DropForeignKey("dbo.Store", "PrimaryStoreCurrencyId", "dbo.Currency");
-            DropForeignKey("dbo.Store", "PrimaryExchangeRateCurrencyId", "dbo.Currency");
+			DropForeignKey("dbo.Store", "PrimaryStoreCurrencyId", "dbo.Currency");
+			DropForeignKey("dbo.Store", "PrimaryExchangeRateCurrencyId", "dbo.Currency");
 
-            DropIndex("dbo.Store", new[] { "PrimaryExchangeRateCurrencyId" });
-            DropIndex("dbo.Store", new[] { "PrimaryStoreCurrencyId" });
+			DropIndex("dbo.Store", new[] { "PrimaryExchangeRateCurrencyId" });
+			DropIndex("dbo.Store", new[] { "PrimaryStoreCurrencyId" });
 
-            DropColumn("dbo.Store", "PrimaryExchangeRateCurrencyId");
-            DropColumn("dbo.Store", "PrimaryStoreCurrencyId");
+			DropColumn("dbo.Store", "PrimaryExchangeRateCurrencyId");
+			DropColumn("dbo.Store", "PrimaryStoreCurrencyId");
         }
 
 		public bool RollbackOnFailure
diff --git a/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs b/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs
@@ -16,7 +16,7 @@ namespace SmartStore.Data.Setup
 	public static class IDbMigrationExtensions
 	{
 
-		public static void SqlFile(this IDbMigration migration, string fileName, Assembly assembly = null, string location = null)
+		public static void SqlFileOrResource(this IDbMigration migration, string fileName, Assembly assembly = null, string location = null)
 		{
 			Guard.ArgumentNotEmpty(() => fileName);
 

Original file line number	Diff line number	Diff line change
`@@ -1774,13 +1774,13 @@ public override void Up()`
`1774`	`1774`	`#endregion`
`1775`	`1775`
`1776`	`1776`	`#region Custom`
`1777`		`-`
`1778`		`- this.SqlFile("Indexes.sql");`
	`1777`	`+`
	`1778`	`+ this.SqlFileOrResource("Indexes.sql");`
`1779`	`1779`	`if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)`
`1780`	`1780`	`{`
`1781`	`1781`	`// do not execute in unit tests`
`1782`		`- this.SqlFile("Indexes.SqlServer.sql");`
`1783`		`- this.SqlFile("StoredProcedures.sql");`
	`1782`	`+ this.SqlFileOrResource("Indexes.SqlServer.sql");`
	`1783`	`+ this.SqlFileOrResource("StoredProcedures.sql");`
`1784`	`1784`	`}`
`1785`	`1785`
`1786`	`1786`	`#endregion`
`@@ -1790,12 +1790,12 @@ public override void Down()`
`1790`	`1790`	`{`
`1791`	`1791`	`#region Custom`
`1792`	`1792`
`1793`		`- this.SqlFile("Indexes.Inverse.sql");`
	`1793`	`+ this.SqlFileOrResource("Indexes.Inverse.sql");`
`1794`	`1794`	`if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)`
`1795`	`1795`	`{`
`1796`	`1796`	`// do not execute in unit tests`
`1797`		`- this.SqlFile("Indexes.SqlServer.Inverse.sql");`
`1798`		`- this.SqlFile("StoredProcedures.Inverse.sql");`
	`1797`	`+ this.SqlFileOrResource("Indexes.SqlServer.Inverse.sql");`
	`1798`	`+ this.SqlFileOrResource("StoredProcedures.Inverse.sql");`
`1799`	`1799`	`}`
`1800`	`1800`
`1801`	`1801`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public override void Up()`
`18`	`18`
`19`	`19`	`if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)`
`20`	`20`	`{`
`21`		`- this.SqlFile("LatestProductLoadAllPaged.sql");`
	`21`	`+ this.SqlFileOrResource("LatestProductLoadAllPaged.sql");`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace SmartStore.Data.Setup`
`16`	`16`	`public static class IDbMigrationExtensions`
`17`	`17`	`{`
`18`	`18`
`19`		`- public static void SqlFile(this IDbMigration migration, string fileName, Assembly assembly = null, string location = null)`
	`19`	`+ public static void SqlFileOrResource(this IDbMigration migration, string fileName, Assembly assembly = null, string location = null)`
`20`	`20`	`{`
`21`	`21`	`Guard.ArgumentNotEmpty(() => fileName);`
`22`	`22`