Fix condition for default value and generation strategy (#1042).

cincuranet · cincuranet · commit edfbf7851b92 · 2022-04-19T20:30:58.000+02:00
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird/Extensions/FbPropertyExtensions.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird/Extensions/FbPropertyExtensions.cs
@@ -33,7 +33,7 @@ public static FbValueGenerationStrategy GetValueGenerationStrategy(this IPropert
 		}
 
 		if (property.ValueGenerated != ValueGenerated.OnAdd
-			|| property.GetDefaultValue() != null
+			|| property.TryGetDefaultValue(out _)
 			|| property.GetDefaultValueSql() != null
 			|| property.GetComputedColumnSql() != null)
 		{
@@ -63,7 +63,7 @@ public static FbValueGenerationStrategy GetValueGenerationStrategy(this IMutable
 		}
 
 		if (property.ValueGenerated != ValueGenerated.OnAdd
-			|| property.GetDefaultValue() != null
+			|| property.TryGetDefaultValue(out _)
 			|| property.GetDefaultValueSql() != null
 			|| property.GetComputedColumnSql() != null)
 		{
@@ -93,7 +93,7 @@ public static FbValueGenerationStrategy GetValueGenerationStrategy(this IConvent
 		}
 
 		if (property.ValueGenerated != ValueGenerated.OnAdd
-			|| property.GetDefaultValue() != null
+			|| property.TryGetDefaultValue(out _)
 			|| property.GetDefaultValueSql() != null
 			|| property.GetComputedColumnSql() != null)
 		{

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static FbValueGenerationStrategy GetValueGenerationStrategy(this IPropert`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (property.ValueGenerated != ValueGenerated.OnAdd`
`36`		`- \|\| property.GetDefaultValue() != null`
	`36`	`+ \|\| property.TryGetDefaultValue(out _)`
`37`	`37`	`\|\| property.GetDefaultValueSql() != null`
`38`	`38`	`\|\| property.GetComputedColumnSql() != null)`
`39`	`39`	`{`
`@@ -63,7 +63,7 @@ public static FbValueGenerationStrategy GetValueGenerationStrategy(this IMutable`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (property.ValueGenerated != ValueGenerated.OnAdd`
`66`		`- \|\| property.GetDefaultValue() != null`
	`66`	`+ \|\| property.TryGetDefaultValue(out _)`
`67`	`67`	`\|\| property.GetDefaultValueSql() != null`
`68`	`68`	`\|\| property.GetComputedColumnSql() != null)`
`69`	`69`	`{`
`@@ -93,7 +93,7 @@ public static FbValueGenerationStrategy GetValueGenerationStrategy(this IConvent`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (property.ValueGenerated != ValueGenerated.OnAdd`
`96`		`- \|\| property.GetDefaultValue() != null`
	`96`	`+ \|\| property.TryGetDefaultValue(out _)`
`97`	`97`	`\|\| property.GetDefaultValueSql() != null`
`98`	`98`	`\|\| property.GetComputedColumnSql() != null)`
`99`	`99`	`{`