Use custom decimal column def when length or scale != defaults

mythz · mythz · commit be06d47ed32f · 2014-12-12T00:28:43.000-05:00
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -353,7 +353,8 @@ public override string GetColumnDefinition(string fieldName, Type fieldType, boo
             var definition = base.GetColumnDefinition(fieldName, fieldType, isPrimaryKey, autoIncrement,
                 isNullable, isRowVersion, fieldLength, scale, defaultValue, customFieldDefinition);
 
-            if (fieldType == typeof(Decimal) && fieldLength != DefaultDecimalPrecision && scale != DefaultDecimalScale)
+            if (fieldType == typeof(Decimal) 
+                && (fieldLength != DefaultDecimalPrecision || scale != DefaultDecimalScale))
             {
                 string validDecimal = String.Format("DECIMAL({0},{1})",
                     fieldLength.GetValueOrDefault(DefaultDecimalPrecision),

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,8 @@ public override string GetColumnDefinition(string fieldName, Type fieldType, boo`
`353`	`353`	`var definition = base.GetColumnDefinition(fieldName, fieldType, isPrimaryKey, autoIncrement,`
`354`	`354`	`isNullable, isRowVersion, fieldLength, scale, defaultValue, customFieldDefinition);`
`355`	`355`
`356`		`- if (fieldType == typeof(Decimal) && fieldLength != DefaultDecimalPrecision && scale != DefaultDecimalScale)`
	`356`	`+ if (fieldType == typeof(Decimal)`
	`357`	`+ && (fieldLength != DefaultDecimalPrecision \|\| scale != DefaultDecimalScale))`
`357`	`358`	`{`
`358`	`359`	`string validDecimal = String.Format("DECIMAL({0},{1})",`
`359`	`360`	`fieldLength.GetValueOrDefault(DefaultDecimalPrecision),`