Skip to content

Commit c1cf255

Browse files
xklonxrwasef1830
authored andcommitted
Remove explicit default value for not nullable columns
# Conflicts: # test/EntityFramework6.Npgsql.Tests/EntityFrameworkMigrationTests.cs
1 parent 172e589 commit c1cf255

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

src/EntityFramework6.Npgsql/NpgsqlMigrationSqlGenerator.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -585,14 +585,6 @@ void AppendColumn(ColumnModel column, StringBuilder sql)
585585
break;
586586
}
587587
}
588-
else if (column.IsNullable != null
589-
&& !column.IsNullable.Value
590-
&& (column.StoreType == null ||
591-
(column.StoreType.IndexOf("rowversion", StringComparison.OrdinalIgnoreCase) == -1)))
592-
{
593-
sql.Append(" DEFAULT ");
594-
AppendValue(column.ClrDefaultValue, sql);
595-
}
596588
}
597589

598590
void AppendColumnType(ColumnModel column, StringBuilder sql, bool setSerial)

test/EntityFramework6.Npgsql.Tests/EntityFrameworkMigrationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ public void CreateBloggingContext()
151151
expectedColumns.Remove((string)reader[0]);
152152
Assert.AreEqual("integer", (string)reader[1]);
153153
Assert.AreEqual("NO", (string)reader[2]);
154-
Assert.AreEqual("0", (string)reader[3]);
154+
Assert.That(string.IsNullOrEmpty(reader[3] as string));
155155
break;
156156
case "UniqueId":
157157
expectedColumns.Remove((string)reader[0]);
158158
Assert.AreEqual("uuid", (string)reader[1]);
159159
Assert.AreEqual("NO", (string)reader[2]);
160-
Assert.AreEqual("'00000000-0000-0000-0000-000000000000'::uuid", reader[3] as string);
160+
Assert.That(string.IsNullOrEmpty(reader[3] as string));
161161
//Assert.AreEqual("uuid_generate_v4()", reader[3] as string);
162162
break;
163163
case "Rating":
@@ -358,7 +358,7 @@ public void CreateTableOperation()
358358
Assert.AreEqual("CREATE SCHEMA IF NOT EXISTS \"someSchema\"", statments.ElementAt(0).Sql);
359359
else
360360
Assert.AreEqual("CREATE SCHEMA \"someSchema\"", statments.ElementAt(0).Sql);
361-
Assert.AreEqual("CREATE TABLE \"someSchema\".\"someTable\"(\"SomeString\" varchar(233) NOT NULL DEFAULT '',\"AnotherString\" text,\"SomeBytes\" bytea,\"SomeLong\" serial8,\"SomeDateTime\" timestamp)", statments.ElementAt(1).Sql);
361+
Assert.AreEqual("CREATE TABLE \"someSchema\".\"someTable\"(\"SomeString\" varchar(233) NOT NULL,\"AnotherString\" text,\"SomeBytes\" bytea,\"SomeLong\" serial8,\"SomeDateTime\" timestamp)", statments.ElementAt(1).Sql);
362362
}
363363

364364
[Test]

0 commit comments

Comments
 (0)