Skip to content

Identity checks / DateTimeOffset default value update #150

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

Merged
merged 1 commit into from
Nov 25, 2025
Merged

Identity checks / DateTimeOffset default value update #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/Migrator.Tests/Providers/Generic/Generic_GetColumnsTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using Migrator.Tests.Providers.Base;

namespace Migrator.Tests.Providers.Generic;

public abstract class Generic_GetColumnsTestsBase : TransformationProviderBase
{
}
33 changes: 31 additions & 2 deletions src/Migrator.Tests/Providers/OracleProvider/OracleTransformationProvider_GetColumns_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using System.Linq;
using System.Threading.Tasks;
using DotNetProjects.Migrator.Framework;
using Migrator.Tests.Providers.Base;
using Migrator.Tests.Providers.Generic;
using NUnit.Framework;

namespace Migrator.Tests.Providers.OracleProvider;

[TestFixture]
[Category("Oracle")]
public class OracleTransformationProvider_GetColumns_Tests : TransformationProviderBase
public class OracleTransformationProvider_GetColumns_Tests : Generic_GetColumnsTestsBase
{
[SetUp]
public async Task SetUpAsync()
Expand Down Expand Up @@ -110,4 +110,33 @@ public void GetColumns_DefaultValues_Succeeds()
Assert.That(binarycolumn1.DefaultValue, Is.EqualTo(new byte[] { 12, 32, 34 }));
Assert.That(doubleColumn1.DefaultValue, Is.EqualTo(84.874596567));
}

[Test]
public void GetColumns_GetIdentity_Succeeds()
{
// Arrange
var tableName1 = "Table1";
var tableName2 = "Table2";
var tableName3 = "Table3";
var tableName4 = "Table4";
var columnName1 = "ColumnName1";

Provider.ExecuteNonQuery($"CREATE TABLE {tableName1} ({columnName1} NUMBER GENERATED ALWAYS AS IDENTITY PRIMARY KEY)");
Provider.ExecuteNonQuery($"CREATE TABLE {tableName2} ({columnName1} NUMBER PRIMARY KEY)");

Provider.AddTable(name: tableName3, new Column(columnName1, DbType.Int32, ColumnProperty.Identity | ColumnProperty.PrimaryKey));
Provider.AddTable(name: tableName4, new Column(columnName1, DbType.Int32, ColumnProperty.PrimaryKey));

// Act
var columnTable1 = Provider.GetColumnByName(table: tableName1, column: columnName1);
var columnTable2 = Provider.GetColumnByName(table: tableName2, column: columnName1);
var columnTable3 = Provider.GetColumnByName(table: tableName3, column: columnName1);
var columnTable4 = Provider.GetColumnByName(table: tableName4, column: columnName1);

// Assert
Assert.That(columnTable1.IsIdentity, Is.True);
Assert.That(columnTable2.IsIdentity, Is.False);
Assert.That(columnTable3.IsIdentity, Is.True);
Assert.That(columnTable4.IsIdentity, Is.False);
}
}
62 changes: 62 additions & 0 deletions ...Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_ChangeColumnTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,66 @@ public void ChangeColumn_DateTimeOffsetToDateTime_Success()
Assert.That(column2.MigratorDbType, Is.EqualTo(MigratorDbType.DateTime2));
Assert.That(column2.DefaultValue, Is.Null);
}

[Test]
public void ChangeColumn_DateTimeOffsetToDateTimeGetDefaultValueAndReuseIt_DefaultValueIsEqualAndValueIsEqual()
{
// Arrange
var tableName = "TableName";
var column1Name = "Column1";
var column2Name = "Column2";
var dateTimeOffsetDefaultValue = new DateTimeOffset(2022, 2, 3, 4, 5, 6, TimeSpan.FromHours(2));
var dateTimeOffsetInsert = new DateTimeOffset(2001, 2, 3, 4, 5, 6, TimeSpan.FromHours(2));

Provider.AddTable(tableName,
new Column(column1Name, DbType.Int32, ColumnProperty.Null),
new Column(column2Name, DbType.DateTimeOffset, ColumnProperty.Null, defaultValue: dateTimeOffsetDefaultValue)
);

Provider.Insert(table: tableName, columns: [column2Name], values: [dateTimeOffsetInsert]);
// Act

var column2 = Provider.GetColumnByName(tableName, column2Name);
Assert.That(((DateTimeOffset)column2.DefaultValue).UtcDateTime, Is.EqualTo(dateTimeOffsetDefaultValue.UtcDateTime));
Provider.ChangeColumn(tableName, new Column(column2Name, DbType.DateTime2, ColumnProperty.NotNull, defaultValue: column2.DefaultValue));


// Assert
column2 = Provider.GetColumnByName(tableName, column2Name);

// using var reader = Provider.Select(Provider.GetCommand(), what: column2Name, from: tableName);
// var valueFromDatabase = reader.GetDateTime(0);

Assert.That(column2.MigratorDbType, Is.EqualTo(MigratorDbType.DateTime2));
Assert.That(column2.DefaultValue, Is.EqualTo(dateTimeOffsetDefaultValue.UtcDateTime));
}

[Test]
public void GetColumns_GetIdentity_Succeeds()
{
// Arrange
var tableName1 = "Table1";
var tableName2 = "Table2";
var tableName3 = "Table3";
var tableName4 = "Table4";
var columnName1 = "ColumnName1";

Provider.ExecuteNonQuery($"CREATE TABLE {tableName1} ({columnName1} INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY)");
Provider.ExecuteNonQuery($"CREATE TABLE {tableName2} ({columnName1} INT PRIMARY KEY)");

Provider.AddTable(name: tableName3, new Column(columnName1, DbType.Int32, ColumnProperty.Identity | ColumnProperty.PrimaryKey));
Provider.AddTable(name: tableName4, new Column(columnName1, DbType.Int32, ColumnProperty.PrimaryKey));

// Act
var columnTable1 = Provider.GetColumnByName(table: tableName1, column: columnName1);
var columnTable2 = Provider.GetColumnByName(table: tableName2, column: columnName1);
var columnTable3 = Provider.GetColumnByName(table: tableName3, column: columnName1);
var columnTable4 = Provider.GetColumnByName(table: tableName4, column: columnName1);

// Assert
Assert.That(columnTable1.IsIdentity, Is.True);
Assert.That(columnTable2.IsIdentity, Is.False);
Assert.That(columnTable3.IsIdentity, Is.True);
Assert.That(columnTable4.IsIdentity, Is.False);
}
}
4 changes: 2 additions & 2 deletions src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_GetColumns_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System.Threading.Tasks;
using Migrator.Tests.Providers.Base;
using Migrator.Tests.Providers.Generic;
using NUnit.Framework;

namespace Migrator.Tests.Providers.PostgreSQL;

[TestFixture]
[Category("Postgre")]
public class PostgreSQLTransformationProvider_GetColumns_Tests : TransformationProviderBase
public class PostgreSQLTransformationProvider_GetColumns_Tests : Generic_GetColumnsTestsBase
{
[SetUp]
public async Task SetUpAsync()
Expand Down
35 changes: 33 additions & 2 deletions src/Migrator.Tests/Providers/SQLServer/SQLServerTransformationProvider_GetColumnsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,47 @@
using System.Data;
using System.Threading.Tasks;
using Migrator.Tests.Providers.Base;
using DotNetProjects.Migrator.Framework;
using Migrator.Tests.Providers.Generic;
using NUnit.Framework;

namespace Migrator.Tests.Providers.SQLServer;

[TestFixture]
[Category("SqlServer")]
public class SQLServerTransformationProvider_GetColumnsTests : TransformationProviderBase
public class SQLServerTransformationProvider_GetColumnsTests : Generic_GetColumnsTestsBase
{
[SetUp]
public async Task SetUpAsync()
{
await BeginSQLServerTransactionAsync();
}

[Test]
public void GetColumns_GetIdentity_Succeeds()
{
// Arrange
var tableName1 = "Table1";
var tableName2 = "Table2";
var tableName3 = "Table3";
var tableName4 = "Table4";
var columnName1 = "ColumnName1";

Provider.ExecuteNonQuery($"CREATE TABLE {tableName1} ({columnName1} INT IDENTITY(1,1) PRIMARY KEY)");
Provider.ExecuteNonQuery($"CREATE TABLE {tableName2} ({columnName1} INT PRIMARY KEY)");

Provider.AddTable(name: tableName3, new Column(columnName1, DbType.Int32, ColumnProperty.Identity | ColumnProperty.PrimaryKey));
Provider.AddTable(name: tableName4, new Column(columnName1, DbType.Int32, ColumnProperty.PrimaryKey));

// Act
var columnTable1 = Provider.GetColumnByName(table: tableName1, column: columnName1);
var columnTable2 = Provider.GetColumnByName(table: tableName2, column: columnName1);
var columnTable3 = Provider.GetColumnByName(table: tableName3, column: columnName1);
var columnTable4 = Provider.GetColumnByName(table: tableName4, column: columnName1);

// Assert
Assert.That(columnTable1.IsIdentity, Is.True);
Assert.That(columnTable2.IsIdentity, Is.False);
Assert.That(columnTable3.IsIdentity, Is.True);
Assert.That(columnTable4.IsIdentity, Is.False);
}
}
4 changes: 2 additions & 2 deletions src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using System.Threading.Tasks;
using DotNetProjects.Migrator.Framework;
using DotNetProjects.Migrator.Providers.Impl.SQLite;
using Migrator.Tests.Providers.Base;
using Migrator.Tests.Providers.Generic;
using NUnit.Framework;

namespace Migrator.Tests.Providers.SQLite;

[TestFixture]
[Category("SQLite")]
public class SQLiteTransformationProvider_GetColumnsTests : TransformationProviderBase
public class SQLiteTransformationProvider_GetColumnsTests : Generic_GetColumnsTestsBase
{
[SetUp]
public async Task SetUpAsync()
Expand Down
20 changes: 16 additions & 4 deletions src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,10 @@ public override Column[] GetColumns(string table)
{
columnInfo.ColumnDefault = match.Value;
}
column.DefaultValue = long.Parse(columnInfo.ColumnDefault.ToString());
if (!columnInfo.ColumnDefault.Contains(table, StringComparison.OrdinalIgnoreCase))
{
column.DefaultValue = long.Parse(columnInfo.ColumnDefault.ToString());
}
}
else if (column.MigratorDbType == MigratorDbType.UInt16 || column.MigratorDbType == MigratorDbType.UInt32 || column.MigratorDbType == MigratorDbType.UInt64)
{
Expand All @@ -621,7 +624,10 @@ public override Column[] GetColumns(string table)
{
columnInfo.ColumnDefault = match.Value;
}
column.DefaultValue = ulong.Parse(columnInfo.ColumnDefault.ToString());
if (!columnInfo.ColumnDefault.Contains(table, StringComparison.OrdinalIgnoreCase))
{
column.DefaultValue = ulong.Parse(columnInfo.ColumnDefault.ToString());
}
}
else if (column.MigratorDbType == MigratorDbType.Double || column.MigratorDbType == MigratorDbType.Single)
{
Expand All @@ -630,7 +636,10 @@ public override Column[] GetColumns(string table)
{
columnInfo.ColumnDefault = match.Value;
}
column.DefaultValue = double.Parse(columnInfo.ColumnDefault.ToString(), CultureInfo.InvariantCulture);
if (!columnInfo.ColumnDefault.Contains(table, StringComparison.OrdinalIgnoreCase))
{
column.DefaultValue = double.Parse(columnInfo.ColumnDefault.ToString(), CultureInfo.InvariantCulture);
}
}
else if (column.MigratorDbType == MigratorDbType.Interval)
{
Expand Down Expand Up @@ -731,7 +740,10 @@ public override Column[] GetColumns(string table)
{
columnInfo.ColumnDefault = match.Value;
}
column.DefaultValue = decimal.Parse(columnInfo.ColumnDefault, CultureInfo.InvariantCulture);
if (!columnInfo.ColumnDefault.Contains(table, StringComparison.OrdinalIgnoreCase))
{
column.DefaultValue = decimal.Parse(columnInfo.ColumnDefault, CultureInfo.InvariantCulture);
}
}
else if (column.MigratorDbType == MigratorDbType.String)
{
Expand Down
10 changes: 10 additions & 0 deletions src/Migrator/Providers/TransformationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,6 +2033,16 @@ protected virtual void ConfigureParameterWithValue(IDbDataParameter parameter, i
parameter.DbType = DbType.DateTime;
parameter.Value = value;
}
else if (value is DateTimeOffset dateTimeOffset)
{
parameter.DbType = DbType.DateTimeOffset;
parameter.Value = dateTimeOffset.ToUniversalTime();
}
else if (value is DateTimeOffset?)
{
parameter.DbType = DbType.DateTimeOffset;
parameter.Value = value == null ? null : ((DateTimeOffset?)value).Value.ToUniversalTime();
}
else if (value is bool || value is bool?)
{
parameter.DbType = DbType.Boolean;
Expand Down
Loading