From 6efed0f377385e59a6ae55d559b50b9b46c6fde5 Mon Sep 17 00:00:00 2001
From: Louis DeJardin <Louis.DeJardin@microsoft.com>
Date: Fri, 3 Sep 2010 11:12:41 -0700
Subject: [PATCH 1/3] Clarifying branch

--HG--
branch : dev
---
 src/Orchard.Web/Web.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config
index 8c725a4db..922b7d550 100644
--- a/src/Orchard.Web/Web.config
+++ b/src/Orchard.Web/Web.config
@@ -8,7 +8,6 @@
     \Windows\Microsoft.Net\Framework\v2.x\Config 
 -->
 <configuration>
-
   <appSettings/>
   <system.diagnostics configSource="Config\Diagnostics.config"/>
   <!-- 

From 47a0ae929a2c111ea934bfa6b5fb1a61b65f087a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <>
Date: Fri, 3 Sep 2010 16:23:33 -0700
Subject: [PATCH 2/3] Index tags on content items

--HG--
branch : dev
---
 .../Modules/Orchard.Tags/Handlers/TagsPartHandler.cs        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
index 206d2763d..a0d470c22 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.ContentManagement;
@@ -46,6 +47,9 @@ namespace Orchard.Tags.Handlers {
                 }
 
             });
+
+            OnIndexing<TagsPart>((context, tagsPart) => context.DocumentIndex
+                                                    .Add("tags", String.Join(", ", tagsPart.CurrentTags.Select(t => t.TagName))).Analyze());
         }
     }
 }
\ No newline at end of file

From b03a29ad4227f2c82e2dde2f260f7abfc2b65f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <>
Date: Fri, 3 Sep 2010 16:51:57 -0700
Subject: [PATCH 3/3] Increased field storage size - Ensure AlterColumn defines
 the field Type if the size is changed

--HG--
branch : dev
---
 .../DataMigration/SchemaBuilderTests.cs       | 62 +++++++++++++++++--
 .../DataMigrations/FrameworkDataMigration.cs  | 11 +++-
 .../DefaultDataMigrationInterpreter.cs        |  7 ++-
 3 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
index bf93a8d80..59f493f52 100644
--- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
+++ b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
@@ -1,4 +1,5 @@
-using System.Data;
+using System;
+using System.Data;
 using System.Linq;
 using Autofac;
 using NHibernate;
@@ -37,8 +38,6 @@ namespace Orchard.Tests.DataMigration {
 
             var builder = new ContainerBuilder();
 
-            builder.RegisterInstance(new ShellSettings { DataTablePrefix = "TEST_", DataProvider = "SqlCe" });
-
             var session = _sessionFactory.OpenSession();
             builder.RegisterInstance(appDataFolder).As<IAppDataFolder>();
             builder.RegisterType<SqlCeDataServicesProvider>().As<IDataServicesProvider>();
@@ -49,7 +48,7 @@ namespace Orchard.Tests.DataMigration {
             builder.RegisterType<SessionFactoryHolder>().As<ISessionFactoryHolder>();
             builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(session)).As<ISessionLocator>();
             builder.RegisterInstance(new ShellBlueprint { Records = Enumerable.Empty<RecordBlueprint>() }).As<ShellBlueprint>();
-            builder.RegisterInstance(new ShellSettings { Name = "temp", DataProvider = "SqlCe", DataTablePrefix = "TEST_" }).As<ShellSettings>();
+            builder.RegisterInstance(new ShellSettings { Name = "temp", DataProvider = "SqlCe", DataTablePrefix = "TEST" }).As<ShellSettings>();
             builder.RegisterModule(new DataModule());
             _container = builder.Build();
 
@@ -154,6 +153,61 @@ namespace Orchard.Tests.DataMigration {
                     .Column("UserId", DbType.Int32, column => column.NotNull()))
                 .CreateForeignKey("FK_User", "Address", new[] { "UserId" }, "User", new[] { "Id" })
                 .DropForeignKey("Address", "FK_User");
+        }
+
+        [Test, ExpectedException]
+        public void BiggerDataShouldNotFit() {
+            _schemaBuilder
+                .CreateTable("ContentItemRecord", table => table
+                    .Column("Id", DbType.Int32, column => column.PrimaryKey().Identity())
+                    .Column("Data", DbType.String, column => column.WithLength(255)));
+
+            // should write successfully less than 255 chars
+            _schemaBuilder
+                .ExecuteSql("insert into TEST_ContentItemRecord (Data) values('Hello World')");
+
+            // should throw an exception if trying to write more data
+            _schemaBuilder
+                .ExecuteSql(String.Format("insert into TEST_ContentItemRecord (Data) values('{0}')", new String('x', 256)));
+
+            _schemaBuilder
+                .AlterTable("ContentItemRecord", table => table
+                    .AlterColumn("Data", column => column.WithType(DbType.String).WithLength(257)));
+
+            _schemaBuilder
+                .ExecuteSql(String.Format("insert into TEST_ContentItemRecord (Data) values('{0}')", new String('x', 256)));
+        }
+
+        [Test]
+        public void ShouldAllowFieldSizeAlteration() {
+            _schemaBuilder
+                .CreateTable("ContentItemRecord", table => table
+                    .Column("Id", DbType.Int32, column => column.PrimaryKey().Identity())
+                    .Column("Data", DbType.String, column => column.WithLength(255)));
+
+            // should write successfully less than 255 chars
+            _schemaBuilder
+                .ExecuteSql("insert into TEST_ContentItemRecord (Data) values('Hello World')");
+
+            _schemaBuilder
+                .AlterTable("ContentItemRecord", table => table
+                    .AlterColumn("Data", column => column.WithType(DbType.String).WithLength(2048)));
+
+            // should write successfully a bigger value now
+            _schemaBuilder
+                .ExecuteSql(String.Format("insert into TEST_ContentItemRecord (Data) values('{0}')", new String('x', 2048)));
+        }
+
+        [Test, ExpectedException(typeof(OrchardException))]
+        public void ChangingSizeWithoutTypeShouldNotBeAllowed() {
+            _schemaBuilder
+                .CreateTable("ContentItemRecord", table => table
+                    .Column("Id", DbType.Int32, column => column.PrimaryKey().Identity())
+                    .Column("Data", DbType.String, column => column.WithLength(255)));
+
+            _schemaBuilder
+                .AlterTable("ContentItemRecord", table => table
+                    .AlterColumn("Data", column => column.WithLength(2048)));
 
         }
     }
diff --git a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
index b1dcca7ed..5cdaaf79f 100644
--- a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
+++ b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
@@ -1,4 +1,5 @@
-using Orchard.Data.Migration;
+using System.Data;
+using Orchard.Data.Migration;
 
 namespace Orchard.ContentManagement.DataMigrations {
     public class FrameworkDataMigration : DataMigrationImpl {
@@ -35,5 +36,13 @@ namespace Orchard.ContentManagement.DataMigrations {
 
             return 1;
         }
+
+        public int UpdateFrom1() {
+            SchemaBuilder
+                .AlterTable("ContentItemRecord", table => table
+                    .AlterColumn("Data", column => column.WithType(DbType.String).Unlimited()));
+
+            return 2;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
index 86b7390a8..6377aa25f 100644
--- a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
+++ b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
@@ -39,7 +39,7 @@ namespace Orchard.Data.Migration.Interpreters {
             _reportsCoordinator = reportsCoordinator;
 
             Logger = NullLogger.Instance;
-
+            T = NullLocalizer.Instance;
             var configuration = _sessionFactoryHolder.GetConfiguration();
             _dialect = Dialect.GetDialect(configuration.Properties);
         }
@@ -192,6 +192,11 @@ namespace Orchard.Data.Migration.Interpreters {
             if (command.DbType != DbType.Object) {
                 builder.Append(GetTypeName(command.DbType, command.Length, command.Precision, command.Scale));
             }
+            else {
+                if(command.Length > 0 || command.Precision > 0 || command.Scale > 0) {
+                    throw new OrchardException(T("Error while executing data migration: you need to specify the field's type in order to change it's properies"));
+                }
+            }
 
             // [default value]
             if (!string.IsNullOrEmpty(command.Default)) {