lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

remove fix for automatic addition of is null (maybe a different PR)

Browse Source
This commit is contained in:
qt1
2015-06-01 03:33:14 +03:00
parent 6e94264df2
commit 5b468b0ce0
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
View File

@@ -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) {