Skip to content

Fix For issue #106 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix For issue #106 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
991dc6d
Fix for Issue #106
sparkybg Sep 18, 2020
3bcdb98
Update EF6.PG/NpgsqlMigrationSqlGenerator.cs
sparkybg Sep 19, 2020
55bef39
Update NpgsqlMigrationSqlGenerator.cs
sparkybg Sep 22, 2020
2e4316d
Tests added
sparkybg Sep 22, 2020
d7304f6
Small error on AddColumnOperationNullable
sparkybg Sep 22, 2020
04670ef
Fix for CreateTableOperation test
sparkybg Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions EF6.PG.Tests/EntityFrameworkMigrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,20 @@ public void DatabaseExistsCreateDelete()

[Test]
public void AddColumnOperation()
{
var operations = new List<MigrationOperation>();
operations.Add(new AddColumnOperation("tableName", new ColumnModel(PrimitiveTypeKind.Double)
{
Name = "columnName",
IsNullable = false
}));
var statments = new NpgsqlMigrationSqlGenerator().Generate(operations, _backendVersion.ToString());
Assert.AreEqual(1, statments.Count());
Assert.AreEqual("ALTER TABLE \"tableName\" ADD \"columnName\" float8 NOT NULL DEFAULT 0", statments.ElementAt(0).Sql);
}

[Test]
public void AddColumnOperationNullable()
{
var operations = new List<MigrationOperation>();
operations.Add(new AddColumnOperation("tableName", new ColumnModel(PrimitiveTypeKind.Double)
Expand Down Expand Up @@ -262,7 +276,23 @@ public void AlterColumnOperation()
var operations = new List<MigrationOperation>();
operations.Add(new AlterColumnOperation("tableName", new ColumnModel(PrimitiveTypeKind.Double)
{
Name = "columnName"
Name = "columnName",
IsNullable = false
}, false));
var statments = new NpgsqlMigrationSqlGenerator().Generate(operations, _backendVersion.ToString());
Assert.AreEqual(3, statments.Count());
Assert.AreEqual("ALTER TABLE \"tableName\" ALTER COLUMN \"columnName\" TYPE float8", statments.ElementAt(0).Sql);
Assert.AreEqual("ALTER TABLE \"tableName\" ALTER COLUMN \"columnName\" SET NOT NULL", statments.ElementAt(1).Sql);
Assert.AreEqual("ALTER TABLE \"tableName\" ALTER COLUMN \"columnName\" SET DEFAULT 0", statments.ElementAt(2).Sql);
}

[Test]
public void AlterColumnOperationNullable()
{
var operations = new List<MigrationOperation>();
operations.Add(new AlterColumnOperation("tableName", new ColumnModel(PrimitiveTypeKind.Double)
{
Name = "columnName",
}, false));
var statments = new NpgsqlMigrationSqlGenerator().Generate(operations, _backendVersion.ToString());
Assert.AreEqual(3, statments.Count());
Expand Down Expand Up @@ -335,7 +365,7 @@ public void CreateTableOperation()
Assert.AreEqual("CREATE SCHEMA IF NOT EXISTS \"someSchema\"", statments.ElementAt(0).Sql);
else
Assert.AreEqual("CREATE SCHEMA \"someSchema\"", statments.ElementAt(0).Sql);
Assert.AreEqual("CREATE TABLE \"someSchema\".\"someTable\"(\"SomeString\" varchar(233) NOT NULL,\"AnotherString\" text,\"SomeBytes\" bytea,\"SomeLong\" serial8,\"SomeDateTime\" timestamp)", statments.ElementAt(1).Sql);
Assert.AreEqual("CREATE TABLE \"someSchema\".\"someTable\"(\"SomeString\" varchar(233) NOT NULL DEFAULT '',\"AnotherString\" text,\"SomeBytes\" bytea,\"SomeLong\" serial8,\"SomeDateTime\" timestamp)", statments.ElementAt(1).Sql);
}

[Test]
Expand Down
10 changes: 10 additions & 0 deletions EF6.PG/NpgsqlMigrationSqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,11 @@ protected virtual void Convert(AlterColumnOperation alterColumnOperation)
throw new NotImplementedException("Not supporting creating IsIdentity for " + alterColumnOperation.Column.Type);
}
}
else if(alterColumnOperation.Column.IsNullable==false && alterColumnOperation.Column.ClrDefaultValue != null)
{
sql.Append(" SET DEFAULT ");
AppendValue(alterColumnOperation.Column.ClrDefaultValue, sql);
}
else
sql.Append(" DROP DEFAULT");
AddStatment(sql);
Expand Down Expand Up @@ -551,6 +556,11 @@ void AppendColumn(ColumnModel column, StringBuilder sql)
break;
}
}
else if (column.IsNullable == false && column.ClrDefaultValue != null)
{
sql.Append(" DEFAULT ");
AppendValue(column.ClrDefaultValue, sql);
}
}

void AppendColumnType(ColumnModel column, StringBuilder sql, bool setSerial)
Expand Down