Add support for RowVersion to Save API's and add support for remaining RowVersion tests

Author: mythz

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -122,21 +122,9 @@ public override string GetColumnDefinition(
             return sql.ToString();
         }
 
-        public override string GetColumnNames(ModelDefinition modelDef)
+        public override string GetRowVersionColumnName(FieldDefinition field)
         {
-            var sqlColumns = new StringBuilder();
-            foreach (var field in modelDef.FieldDefinitions)
-            {
-                if (sqlColumns.Length > 0)
-                    sqlColumns.Append(", ");
-
-                if (field.IsRowVersion)
-                    sqlColumns.Append("xmin as " + GetQuotedColumnName(field.FieldName));
-                else
-                    sqlColumns.Append(GetQuotedColumnName(field.FieldName));
-            }
-
-            return sqlColumns.ToString();
+            return "xmin as " + GetQuotedColumnName(field.FieldName);
         }
 
         public override void AppendFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef, IDbCommand cmd)

src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs

@@ -120,6 +120,7 @@ string ToSelectFromProcedureStatement(object fromObjWithProperties,
 
         bool DoesSequenceExist(IDbCommand dbCmd, string sequencName);
 
+        string GetRowVersionColumnName(FieldDefinition field);
         string GetColumnNames(ModelDefinition modelDef);
 
         SqlExpression<T> SqlExpression<T>();

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -454,7 +454,10 @@ public virtual string ToSelectStatement(Type tableType, string sqlFilter, params
                 return sqlFilter.SqlFmt(filterParams);
 
             var modelDef = tableType.GetModelDefinition();
-            var sql = new StringBuilder("SELECT " + GetColumnNames(modelDef) + " FROM " + GetQuotedTableName(modelDef));
+            var sql = new StringBuilder();
+            sql.AppendFormat("SELECT {0} FROM {1}",
+                GetColumnNames(modelDef),
+                GetQuotedTableName(modelDef));
 
             if (!string.IsNullOrEmpty(sqlFilter))
             {
@@ -471,6 +474,11 @@ public virtual string ToSelectStatement(Type tableType, string sqlFilter, params
             return sql.ToString();
         }
 
+        public virtual string GetRowVersionColumnName(FieldDefinition field)
+        {
+            return GetQuotedColumnName(field.FieldName);
+        }
+
         public virtual string GetColumnNames(ModelDefinition modelDef)
         {
             var sqlColumns = new StringBuilder();
@@ -479,7 +487,10 @@ public virtual string GetColumnNames(ModelDefinition modelDef)
                 if (sqlColumns.Length > 0)
                     sqlColumns.Append(", ");
 
-                sqlColumns.Append(GetQuotedColumnName(field.FieldName));
+                if (field.IsRowVersion)
+                    sqlColumns.Append(GetRowVersionColumnName(field));
+                else
+                    sqlColumns.Append(GetQuotedColumnName(field.FieldName));
             }
 
             return sqlColumns.ToString();

src/ServiceStack.OrmLite/OrmLiteWriteExtensions.cs

@@ -14,6 +14,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using ServiceStack.Logging;
 
@@ -665,14 +666,16 @@ internal static bool Save<T>(this IDbCommand dbCmd, T obj)
         {
             var id = obj.GetId();
             var existingRow = id != null ? dbCmd.SingleById<T>(id) : default(T);
+            var modelDef = typeof(T).GetModelDefinition();
+
             if (Equals(existingRow, default(T)))
             {
-                var modelDef = typeof(T).GetModelDefinition();
                 if (modelDef.HasAutoIncrementId)
                 {
                     var newId = dbCmd.Insert(obj, selectIdentity: true);
                     var safeId = OrmLiteConfig.DialectProvider.ConvertDbValue(newId, modelDef.PrimaryKey.FieldType);
                     modelDef.PrimaryKey.SetValueFn(obj, safeId);
+                    id = newId;
                 }
                 else
                 {
@@ -681,13 +684,21 @@ internal static bool Save<T>(this IDbCommand dbCmd, T obj)
 
                     dbCmd.Insert(obj);
                 }
+
+                if (modelDef.RowVersion != null)
+                    modelDef.RowVersion.SetValueFn(obj, dbCmd.GetRowVersion(modelDef, id));
+                
                 return true;
             }
 
             if (OrmLiteConfig.UpdateFilter != null)
                 OrmLiteConfig.UpdateFilter(dbCmd, obj);
 
             dbCmd.Update(obj);
+            
+            if (modelDef.RowVersion != null)
+                modelDef.RowVersion.SetValueFn(obj, dbCmd.GetRowVersion(modelDef, id));
+
             return false;
         }
 
@@ -735,6 +746,7 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
                             var newId = dbCmd.Insert(row, selectIdentity: true);
                             var safeId = OrmLiteConfig.DialectProvider.ConvertDbValue(newId, modelDef.PrimaryKey.FieldType);
                             modelDef.PrimaryKey.SetValueFn(row, safeId);
+                            id = newId;
                         }
                         else
                         {
@@ -746,6 +758,9 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
 
                         rowsAdded++;
                     }
+
+                    if (modelDef.RowVersion != null)
+                        modelDef.RowVersion.SetValueFn(row, dbCmd.GetRowVersion(modelDef, id));
                 }
 
                 if (dbTrans != null)
@@ -767,5 +782,23 @@ internal static void ExecuteProcedure<T>(this IDbCommand dbCommand, T obj)
             dbCommand.CommandType = CommandType.StoredProcedure;
             dbCommand.ExecuteSql(sql);
         }
+
+        internal static ulong GetRowVersion(this IDbCommand dbCmd, ModelDefinition modelDef, object id)
+        {
+            var idParamString = OrmLiteConfig.DialectProvider.GetParam();
+
+            var sql = string.Format("SELECT {0} FROM {1} WHERE {2} = {3}",
+                OrmLiteConfig.DialectProvider.GetRowVersionColumnName(modelDef.RowVersion),
+                OrmLiteConfig.DialectProvider.GetQuotedTableName(modelDef),
+                OrmLiteConfig.DialectProvider.GetQuotedColumnName(modelDef.PrimaryKey.FieldName),
+                idParamString);
+
+            var idParam = dbCmd.CreateParameter();
+            idParam.ParameterName = idParamString;
+            idParam.Value = id;
+            dbCmd.Parameters.Add(idParam);
+
+            return dbCmd.Scalar<ulong>(sql);
+        }
     }
 }