Add support for custom Decimal precision in all RDBMS providers

Author: mythz

src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs

@@ -195,31 +195,34 @@ public override string ToCreateTableStatement(Type tableType)
             return sql.ToString();
         }
 
-        public string GetColumnDefinition(FieldDefinition fieldDefinition)
+        public string GetColumnDefinition(FieldDefinition fieldDef)
         {
-            if (fieldDefinition.PropertyInfo.FirstAttribute<TextAttribute>() != null)
+            if (fieldDef.PropertyInfo.FirstAttribute<TextAttribute>() != null)
             {
                 var sql = new StringBuilder();
-                sql.AppendFormat("{0} {1}", GetQuotedColumnName(fieldDefinition.FieldName), TextColumnDefinition);
-                sql.Append(fieldDefinition.IsNullable ? " NULL" : " NOT NULL");
+                sql.AppendFormat("{0} {1}", GetQuotedColumnName(fieldDef.FieldName), TextColumnDefinition);
+                sql.Append(fieldDef.IsNullable ? " NULL" : " NOT NULL");
                 return sql.ToString();
             }
 
             var ret = base.GetColumnDefinition(
-                fieldDefinition.FieldName,
-                fieldDefinition.ColumnType,
-                fieldDefinition.IsPrimaryKey,
-                fieldDefinition.AutoIncrement,
-                fieldDefinition.IsNullable,
-                fieldDefinition.IsRowVersion,
-                fieldDefinition.FieldLength,
+                fieldDef.FieldName,
+                fieldDef.ColumnType,
+                fieldDef.IsPrimaryKey,
+                fieldDef.AutoIncrement,
+                fieldDef.IsNullable,
+                fieldDef.IsRowVersion,
+                fieldDef.FieldLength,
                 null,
-                fieldDefinition.DefaultValue,
-                fieldDefinition.CustomFieldDefinition);
+                fieldDef.DefaultValue,
+                fieldDef.CustomFieldDefinition);
 
-            if (fieldDefinition.IsRowVersion)
+            if (fieldDef.IsRowVersion)
                 return ret + " DEFAULT 1";
 
+            if (fieldDef.ColumnType == typeof(Decimal))
+                return base.ReplaceDecimalColumnDefinition(ret, fieldDef.FieldLength, fieldDef.Scale);
+
             return ret;
         }
 

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -774,7 +774,12 @@ public override string GetColumnDefinition(string fieldName, Type fieldType,
 
             sql.Append(isNullable ? " NULL" : " NOT NULL");
 
-            return sql.ToString();
+            var definition = sql.ToString();
+
+            if (fieldType == typeof(Decimal))
+                return base.ReplaceDecimalColumnDefinition(definition, fieldLength, scale);
+
+            return definition;
         }
 
 

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -123,7 +123,12 @@ public override string GetColumnDefinition(
                 sql.AppendFormat(DefaultValueFormat, defaultValue);
             }
 
-            return sql.ToString();
+            var definition = sql.ToString();
+
+            if (fieldType == typeof(Decimal))
+                return base.ReplaceDecimalColumnDefinition(definition, fieldLength, scale);
+
+            return definition;
         }
 
         //Convert xmin into an integer so it can be used in comparisons

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

@@ -344,14 +344,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))
-            {
-                string validDecimal = String.Format("DECIMAL({0},{1})",
-                    fieldLength.GetValueOrDefault(DefaultDecimalPrecision),
-                    scale.GetValueOrDefault(DefaultDecimalScale));
-                definition = definition.Replace(DecimalColumnDefinition, validDecimal);
-            }
+            if (fieldType == typeof(Decimal))
+                return base.ReplaceDecimalColumnDefinition(definition, fieldLength, scale);
 
             return definition;
         }

src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs

@@ -272,6 +272,9 @@ public override string GetColumnDefinition(string fieldName, Type fieldType, boo
             if (isRowVersion)
                 return ret + " DEFAULT 1";
 
+            if (fieldType == typeof(Decimal))
+                return base.ReplaceDecimalColumnDefinition(ret, fieldLength, scale);
+
             return ret;
         }
     }

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -340,6 +340,23 @@ protected virtual string GetUndefinedColumnDefinition(Type fieldType, int? field
                 : MaxStringColumnDefinition;
         }
 
+        protected string ReplaceDecimalColumnDefinition(string definition, int? fieldLength, int? scale)
+        {
+            if (fieldLength == null && scale == null)
+                return definition;
+
+            if (fieldLength != DefaultDecimalPrecision || scale != DefaultDecimalScale)
+            {
+                var customDecimal = string.Format("DECIMAL({0},{1})",
+                    fieldLength.GetValueOrDefault(DefaultDecimalPrecision),
+                    scale.GetValueOrDefault(DefaultDecimalScale));
+
+                return definition.Replace(DecimalColumnDefinition, customDecimal);
+            }
+
+            return definition;
+        }
+
         public virtual string GetColumnDefinition(string fieldName, Type fieldType,
             bool isPrimaryKey, bool autoIncrement, bool isNullable, bool isRowVersion,
             int? fieldLength, int? scale, string defaultValue, string customFieldDefinition)

tests/ServiceStack.OrmLite.Tests/Issues/CustomFieldTests.cs

@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    public class ModelWithCustomFields
+    {
+        public int Id { get; set; }
+
+        [DecimalLength(12,2)]
+        public decimal? Decimal { get; set; }
+    }
+
+    [TestFixture]
+    public class CustomFieldTests : OrmLiteTestBase
+    {
+        [Test]
+        public void Can_create_custom_Decimal_field()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<ModelWithCustomFields>();
+
+                var sql = db.GetLastSql();
+
+                sql.Print();
+
+                Assert.That(sql, Is.StringContaining("DECIMAL(12,2)"));
+            }
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -129,6 +129,7 @@
     <Compile Include="Expression\SqlExpressionTests.cs" />
     <Compile Include="Expression\SelectExpressionTests.cs" />
     <Compile Include="Issues\ComplexJoinWithAlias.cs" />
+    <Compile Include="Issues\CustomFieldTests.cs" />
     <Compile Include="Issues\UtcDateTimeIssueTests.cs" />
     <Compile Include="Issues\JoinsWithSchemas.cs" />
     <Compile Include="Issues\MappingFieldsFromStoredProcedureTests.cs" />