DRY SetParamValue logic and reuse in RowVersionSql()

Author: mythz

src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs

@@ -174,16 +174,7 @@ internal static IDbCommand SetParameters(this IDbCommand dbCmd, Type type, objec
                         p.Direction = ParameterDirection.Input;
                         dialectProvider.InitDbParam(p, item.GetType());
 
-                        var pValue = dialectProvider.GetFieldValue(item.GetType(), item);
-                        var valueType = pValue?.GetType();
-                        if (valueType != null && valueType != propType)
-                            dialectProvider.InitDbParam(p, valueType);
-
-                        p.Value = pValue == null ?
-                            DBNull.Value
-                          : p.DbType == DbType.String ?
-                            pValue.ToString() :
-                            pValue;
+                        dialectProvider.SetParamValue(p, item, propType);
 
                         dbCmd.Parameters.Add(p);
                     }
@@ -200,26 +191,10 @@ internal static IDbCommand SetParameters(this IDbCommand dbCmd, Type type, objec
                     p.Direction = ParameterDirection.Input;
                     dialectProvider.InitDbParam(p, propType);
 
-                    if (fieldMap != null && fieldMap.TryGetValue(columnName, out var fieldDef))
-                    {
-                        value = dialectProvider.GetFieldValue(fieldDef, value);
-                        var valueType = value?.GetType();
-                        if (valueType != null && valueType != propType)
-                            dialectProvider.InitDbParam(p, valueType);
-                    }
-                    else
-                    {
-                        value = dialectProvider.GetFieldValue(propType, value);
-                        var valueType = value?.GetType();
-                        if (valueType != null && valueType != propType)
-                            dialectProvider.InitDbParam(p, valueType);
-                    }
+                    FieldDefinition fieldDef = null;
+                    fieldMap?.TryGetValue(columnName, out fieldDef);
 
-                    p.Value = value == null ?
-                        DBNull.Value
-                        : p.DbType == DbType.String ?
-                            value.ToString() :
-                            value;
+                    dialectProvider.SetParamValue(p, value, propType, fieldDef);
 
                     dbCmd.Parameters.Add(p);
                 }
@@ -229,6 +204,30 @@ internal static IDbCommand SetParameters(this IDbCommand dbCmd, Type type, objec
             return dbCmd;
         }
 
+        internal static void SetParamValue(this IOrmLiteDialectProvider dialectProvider, IDbDataParameter p, object value, Type propType, FieldDefinition fieldDef=null)
+        {
+            if (fieldDef != null)
+            {
+                value = dialectProvider.GetFieldValue(fieldDef, value);
+                var valueType = value?.GetType();
+                if (valueType != null && valueType != propType)
+                    dialectProvider.InitDbParam(p, valueType);
+            }
+            else
+            {
+                value = dialectProvider.GetFieldValue(propType, value);
+                var valueType = value?.GetType();
+                if (valueType != null && valueType != propType)
+                    dialectProvider.InitDbParam(p, valueType);
+            }
+
+            p.Value = value == null
+                ? DBNull.Value
+                : p.DbType == DbType.String
+                    ? value.ToString()
+                    : value;
+        }
+
         internal delegate void ParamIterDelegate(string propName, string columnName, object value);
 
         internal static void ForEachParam(this Dictionary<string,object> values, ModelDefinition modelDef, bool excludeDefaults, ParamIterDelegate fn)

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -983,8 +983,11 @@ internal static string RowVersionSql(this IDbCommand dbCmd, ModelDefinition mode
 
             dbCmd.Parameters.Clear();
             var idParam = dbCmd.CreateParameter();
+            idParam.Direction = ParameterDirection.Input;
             idParam.ParameterName = idParamString;
-            idParam.Value = id;
+
+            dialectProvider.SetParamValue(idParam, id, modelDef.PrimaryKey.ColumnType, modelDef.PrimaryKey);
+
             dbCmd.Parameters.Add(idParam);
             return sql;
         }

tests/ServiceStack.OrmLite.Tests/EnumTests.cs

@@ -9,8 +9,35 @@ namespace ServiceStack.OrmLite.Tests
 {
     using System;
 
+    public class TypeWithEnumAsStringAsPk
+    {
+        [PrimaryKey]
+        public SomeEnum Id { get; set; }
+
+        [Default(typeof(bool), "0")]
+        public bool IsDeleted { get; set; }
+
+
+        [RowVersion]
+        public byte[] RowVersion { get; set; }
+
+    }
+
     public class EnumTests : OrmLiteTestBase
     {
+        [Test]
+        public void Can_use_RowVersion_on_EnumAsString_PrimaryKey()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<TypeWithEnumAsStringAsPk>();
+
+                db.Insert(new TypeWithEnumAsStringAsPk { Id = SomeEnum.Value1 });
+
+                db.Save(new TypeWithEnumAsStringAsPk { Id = SomeEnum.Value2 });
+            }
+        }
+
         [Test]
         public void CanCreateTable()
         {

tests/ServiceStack.OrmLite.Tests/OrmLiteTestBase.cs

@@ -12,7 +12,9 @@ namespace ServiceStack.OrmLite.Tests
 {
     public class Config
     {
+        public static Dialect DefaultDialect = Dialect.Sqlite;
         public const bool EnableDebugLogging = false;
+
         public static string SqliteMemoryDb = ":memory:";
         public static string SqliteFileDir = "~/App_Data/".MapAbsolutePath();
         public static string SqliteFileDb = "~/App_Data/db.sqlite".MapAbsolutePath();
@@ -25,7 +27,6 @@ public class Config
         public static string PostgreSqlDb = "Server=localhost;Port=5432;User Id=test;Password=test;Database=test;Pooling=true;MinPoolSize=0;MaxPoolSize=200";
         public static string FirebirdDb = @"User=SYSDBA;Password=masterkey;Database=C:\src\ServiceStack.OrmLite\tests\ServiceStack.OrmLite.Tests\App_Data\TEST.FDB;DataSource=localhost;Dialect=3;charset=ISO8859_1;";
 
-        public static Dialect DefaultDialect = Dialect.Sqlite;
 
         public static IOrmLiteDialectProvider DefaultProvider = SqlServerDialect.Provider;
         public static string DefaultConnection = SqlServerBuildDb;