Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
11 changes: 10 additions & 1 deletion src/Migrator.Tests/ColumnPropertyMapperTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ public void SqlServerCreatesSql()
Assert.That("[foo] varchar(30)", Is.EqualTo(mapper.ColumnSql));
}

[Test]
public void SqlServerMapsTimeType()
{
var dialect = new SqlServerDialect();

Assert.That(dialect.GetTypeName(DbType.Time), Is.EqualTo("TIME"));
Assert.That(dialect.GetDbType("time"), Is.EqualTo(DbType.Time));
}

[Test]
public void SqlServerIndexSqlIsNoNullWhenIndexed()
{
Expand All @@ -118,4 +127,4 @@ public void SQLiteIndexSqlWithEmptyStringDefault()
mapper.MapColumnProperties(new Column("foo", DbType.String, 1, ColumnProperty.NotNull, string.Empty));
Assert.That("foo varchar(30) NOT NULL DEFAULT ''", Is.EqualTo(mapper.ColumnSql));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,26 @@ public void AddTableDateTime()
}

[Test]
public void AddTableDateTime2()
{
var tableName = "Table1";
var columnName = "Column1";

Provider.AddTable(tableName, new Column(columnName, DbType.DateTime2, ColumnProperty.NotNull));
var column = Provider.GetColumnByName(tableName, columnName);

Assert.That(column.Type, Is.EqualTo(DbType.DateTime2));
}
}
public void AddTableDateTime2()
{
var tableName = "Table1";
var columnName = "Column1";

Provider.AddTable(tableName, new Column(columnName, DbType.DateTime2, ColumnProperty.NotNull));
var column = Provider.GetColumnByName(tableName, columnName);

Assert.That(column.Type, Is.EqualTo(DbType.DateTime2));
}

[Test]
public void AddTableTime()
{
var tableName = "Table1";
var columnName = "Column1";

Provider.AddTable(tableName, new Column(columnName, DbType.Time, ColumnProperty.NotNull));
var column = Provider.GetColumnByName(tableName, columnName);

Assert.That(column.Type, Is.EqualTo(DbType.Time));
}
}
2 changes: 1 addition & 1 deletion src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public SqlServerDialect()
RegisterColumnType(DbType.String, 4000, "NVARCHAR($l)");
RegisterColumnType(DbType.String, int.MaxValue, "NVARCHAR(max)");
//RegisterColumnType(DbType.String, 1073741823, "NTEXT");
RegisterColumnType(DbType.Time, "DATETIME");
RegisterColumnType(DbType.Time, "TIME");
RegisterColumnType(DbType.VarNumeric, "NUMERIC(18,0)");
Comment on lines 48 to 52

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 4596e13. SqlServerDialect.Default now emits quoted TimeSpan defaults for SQL Server TIME columns, and I added a focused test covering the generated SQL.

RegisterColumnType(DbType.VarNumeric, 38, "NUMERIC($l,0)");
RegisterColumnType(MigratorDbType.Interval, "BIGINT");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -645,14 +645,18 @@ public override Column[] GetColumns(string table)
{
column.MigratorDbType = MigratorDbType.DateTime2;
}
else if (dataTypeString == "datetimeoffset")
{
column.MigratorDbType = MigratorDbType.DateTimeOffset;
}
else if (dataTypeString == "binary" || dataTypeString == "varbinary")
{
column.MigratorDbType = MigratorDbType.Binary;
}
else if (dataTypeString == "datetimeoffset")
{
column.MigratorDbType = MigratorDbType.DateTimeOffset;
}
else if (dataTypeString == "time")
{
column.MigratorDbType = MigratorDbType.Time;
}
else if (dataTypeString == "binary" || dataTypeString == "varbinary")
{
column.MigratorDbType = MigratorDbType.Binary;
}
else if (dataTypeString == "uniqueidentifier")
{
column.MigratorDbType = MigratorDbType.Guid;
Expand Down
Loading