From 5dfe86f80c1374386a699c106923c3cc77d2e793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <none@none>
Date: Tue, 2 Nov 2010 21:47:55 -0700
Subject: [PATCH] Correcting data migration code generation - Changing class
 name to Migrations.cs for consistency - Corrected project alteration to add
 the correct file path - Added missing using for System.Data

--HG--
branch : dev
---
 .../CodeGenerationTemplates/DataMigration.txt               | 3 ++-
 .../Commands/CodeGenerationCommands.cs                      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
index a37519809..8ad2238b0 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
@@ -7,7 +8,7 @@ using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 
 namespace $$FeatureName$$.DataMigrations {
-    public class Migration : DataMigrationImpl {
+    public class Migrations : DataMigrationImpl {
 
         public int Create() {
 $$Commands$$
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 63f71accc..94e6fe992 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -61,7 +61,7 @@ namespace Orchard.CodeGeneration.Commands {
             }
 
             string dataMigrationFolderPath = HostingEnvironment.MapPath("~/Modules/" + extensionDescriptor.Name + "/");
-            string dataMigrationFilePath = dataMigrationFolderPath + "Migration.cs";
+            string dataMigrationFilePath = dataMigrationFolderPath + "Migrations.cs";
             string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard." + ModuleName + "/CodeGenerationTemplates/");
             string moduleCsProjPath = HostingEnvironment.MapPath(string.Format("~/Modules/{0}/{0}.csproj", extensionDescriptor.Name));
                     
@@ -93,11 +93,11 @@ namespace Orchard.CodeGeneration.Commands {
 
             // The string searches in solution/project files can be made aware of comment lines.
             if ( projectFileText.Contains("<Compile Include") ) {
-                string compileReference = string.Format("<Compile Include=\"{0}\" />\r\n    ", "DataMigrations\\" + extensionDescriptor.DisplayName + "DataMigration.cs");
+                string compileReference = string.Format("<Compile Include=\"{0}\" />\r\n    ", "Migrations.cs");
                 projectFileText = projectFileText.Insert(projectFileText.LastIndexOf("<Compile Include"), compileReference);
             }
             else {
-                string itemGroupReference = string.Format("</ItemGroup>\r\n  <ItemGroup>\r\n    <Compile Include=\"{0}\" />\r\n  ", "DataMigrations\\" + extensionDescriptor.DisplayName + "DataMigration.cs");
+                string itemGroupReference = string.Format("</ItemGroup>\r\n  <ItemGroup>\r\n    <Compile Include=\"{0}\" />\r\n  ", "Migrations.cs");
                 projectFileText = projectFileText.Insert(projectFileText.LastIndexOf("</ItemGroup>"), itemGroupReference);
             }