Skip to content

Commit 7c09d3c

Browse files
committed
Last migration makes trouble
1 parent cd3427f commit 7c09d3c

5 files changed

Lines changed: 141 additions & 145 deletions

src/Libraries/SmartStore.Data/Migrations/201504111815146_NewCategoryProperties.resx

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/Libraries/SmartStore.Data/Migrations/201504111815146_NewCategoryProperties.Designer.cs renamed to src/Libraries/SmartStore.Data/Migrations/201504131412183_NewCategoryProperties.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Libraries/SmartStore.Data/Migrations/201504111815146_NewCategoryProperties.cs renamed to src/Libraries/SmartStore.Data/Migrations/201504131412183_NewCategoryProperties.cs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ public partial class NewCategoryProperties : DbMigration, ILocaleResourcesProvid
1111
public override void Up()
1212
{
1313
AddColumn("dbo.Category", "FullName", c => c.String(maxLength: 400));
14-
AddColumn("dbo.Category", "BottomDescription", c => c.String());
15-
16-
AddColumn("dbo.CheckoutAttribute", "IsActive", c => c.Boolean(nullable: false, defaultValue: true));
17-
18-
AddColumn("dbo.ReturnRequest", "AdminComment", c => c.String(maxLength: 4000));
19-
AddColumn("dbo.ReturnRequest", "RequestedActionUpdatedOnUtc", c => c.DateTime());
14+
AddColumn("dbo.Category", "BottomDescription", c => c.String());
15+
AddColumn("dbo.ReturnRequest", "RequestedActionUpdatedOnUtc", c => c.DateTime());
16+
AddColumn("dbo.ReturnRequest", "AdminComment", c => c.String(maxLength: 4000));
17+
AddColumn("dbo.CheckoutAttribute", "IsActive", c => c.Boolean(nullable: false));
2018

2119
if (HostingEnvironment.IsHosted && DataSettings.Current.IsSqlServer)
2220
{
@@ -28,13 +26,11 @@ public override void Down()
2826
{
2927
// inverse of LatestProductLoadAllPaged.sql does not make sense to me
3028

31-
DropColumn("dbo.ReturnRequest", "RequestedActionUpdatedOnUtc");
32-
DropColumn("dbo.ReturnRequest", "AdminComment");
33-
34-
DropColumn("dbo.CheckoutAttribute", "IsActive");
35-
36-
DropColumn("dbo.Category", "BottomDescription");
37-
DropColumn("dbo.Category", "FullName");
29+
DropColumn("dbo.CheckoutAttribute", "IsActive");
30+
DropColumn("dbo.ReturnRequest", "AdminComment");
31+
DropColumn("dbo.ReturnRequest", "RequestedActionUpdatedOnUtc");
32+
DropColumn("dbo.Category", "BottomDescription");
33+
DropColumn("dbo.Category", "FullName");
3834
}
3935

4036
public bool RollbackOnFailure

src/Libraries/SmartStore.Data/Migrations/201504131412183_NewCategoryProperties.resx

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.

src/Libraries/SmartStore.Data/SmartStore.Data.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@
240240
<Compile Include="Migrations\201502120858030_Licensing.Designer.cs">
241241
<DependentUpon>201502120858030_Licensing.cs</DependentUpon>
242242
</Compile>
243-
<Compile Include="Migrations\201504111815146_NewCategoryProperties.cs" />
244-
<Compile Include="Migrations\201504111815146_NewCategoryProperties.Designer.cs">
245-
<DependentUpon>201504111815146_NewCategoryProperties.cs</DependentUpon>
243+
<Compile Include="Migrations\201504131412183_NewCategoryProperties.cs" />
244+
<Compile Include="Migrations\201504131412183_NewCategoryProperties.Designer.cs">
245+
<DependentUpon>201504131412183_NewCategoryProperties.cs</DependentUpon>
246246
</Compile>
247247
<Compile Include="Setup\Builder\SettingsBuilder.cs" />
248248
<Compile Include="Setup\Builder\SettingsMigrator.cs" />
@@ -478,8 +478,8 @@
478478
<EmbeddedResource Include="Migrations\201502120858030_Licensing.resx">
479479
<DependentUpon>201502120858030_Licensing.cs</DependentUpon>
480480
</EmbeddedResource>
481-
<EmbeddedResource Include="Migrations\201504111815146_NewCategoryProperties.resx">
482-
<DependentUpon>201504111815146_NewCategoryProperties.cs</DependentUpon>
481+
<EmbeddedResource Include="Migrations\201504131412183_NewCategoryProperties.resx">
482+
<DependentUpon>201504131412183_NewCategoryProperties.cs</DependentUpon>
483483
</EmbeddedResource>
484484
<EmbeddedResource Include="Sql\Indexes.sql" />
485485
<EmbeddedResource Include="Sql\StoredProcedures.sql" />

0 commit comments

Comments
 (0)