Skip to content

Commit 8f56721

Browse files
JaBistDuNarrischJaBistDuNarrisch
authored andcommitted
Allow default value "null" for DbType.String but not for others
1 parent 3bfe067 commit 8f56721

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ protected void DropTestTables()
6464
}
6565
}
6666

67-
6867
protected async Task BeginOracleTransactionAsync()
6968
{
70-
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
69+
using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
7170
var configReader = new ConfigurationReader();
7271

7372
var databaseConnectionConfig = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.OracleId);

src/Migrator/Providers/Impl/Oracle/OracleTransformationProvider.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,11 @@ public override Column[] GetColumns(string table)
635635
}
636636

637637
// dataDefaultString contains ISEQ$$ if the column is an identity column
638-
if (!string.IsNullOrWhiteSpace(dataDefaultString) && !dataDefaultString.Equals("null", StringComparison.OrdinalIgnoreCase) && !dataDefaultString.Contains("ISEQ$$") && !dataDefaultString.Contains(".nextval"))
638+
if (
639+
!string.IsNullOrWhiteSpace(dataDefaultString) &&
640+
(column.Type == DbType.String || !dataDefaultString.Equals("null", StringComparison.OrdinalIgnoreCase)) &&
641+
!dataDefaultString.Contains("ISEQ$$") &&
642+
!dataDefaultString.Contains(".nextval"))
639643
{
640644
// This is only necessary because older versions of this migrator added single quotes for numerics.
641645
var singleQuoteStrippedString = dataDefaultString.Replace("'", "");

0 commit comments

Comments
 (0)