From 5b468b0ce064c63801d6e43580dc3c076772e924 Mon Sep 17 00:00:00 2001 From: qt1 Date: Mon, 1 Jun 2015 03:33:14 +0300 Subject: [PATCH] remove fix for automatic addition of is null (maybe a different PR) --- .../DefaultDataMigrationInterpreter.cs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs index 566ef04a8..bb0da3d20 100644 --- a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs +++ b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs @@ -285,8 +285,6 @@ namespace Orchard.Data.Migration.Interpreters { } private void Visit(StringBuilder builder, CreateColumnCommand command) { - bool emitNull = true; - if (ExecuteCustomInterpreter(command)) { return; } @@ -299,14 +297,8 @@ namespace Orchard.Data.Migration.Interpreters { } // append identity if handled -<<<<<<< HEAD if (command.IsIdentity && _dialectLazy.Value.SupportsIdentityColumns) { builder.Append(Space).Append(_dialectLazy.Value.IdentityColumnString); -======= - if (command.IsIdentity && _dialect.SupportsIdentityColumns) { - builder.Append(Space).Append(_dialect.IdentityColumnString); - emitNull = !_dialect.IdentityColumnString.ToLower().Contains("null"); // already defined by identity string ->>>>>>> orchard4ibn/IBN-Labs/SchemaBuilder.TableDbName } // [default value] @@ -315,21 +307,11 @@ namespace Orchard.Data.Migration.Interpreters { } // nullable -<<<<<<< HEAD builder.Append(command.IsNotNull ? " not null" : !command.IsPrimaryKey && !command.IsUnique ? _dialectLazy.Value.NullColumnString : string.Empty); -======= - if (emitNull) { - builder.Append(command.IsNotNull - ? " not null" - : !command.IsPrimaryKey && !command.IsUnique - ? _dialect.NullColumnString - : string.Empty); - } ->>>>>>> orchard4ibn/IBN-Labs/SchemaBuilder.TableDbName // append unique if handled, otherwise at the end of the satement if (command.IsUnique && _dialectLazy.Value.SupportsUnique) {