Merge pull request #388 from jessemcdowell-AI/OptimisticConcurrencyOracle

Optimistic testing / fixes for Oracle

Author: mythz

src/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj

@@ -204,6 +204,9 @@
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\PerfTests.cs">
       <Link>PerfTests.cs</Link>
     </Compile>
+    <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\RowVersionTests.cs">
+      <Link>RowVersionTests.cs</Link>
+    </Compile>
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\ApiUtilExtensions.cs">
       <Link>Shared\ApiUtilExtensions.cs</Link>
     </Compile>

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -109,27 +109,17 @@ public override void OnAfterInitColumnTypeMap()
         protected string ClientProvider = OdpProvider;
         public static string RowVersionTriggerFormat = "{0}RowVersionUpdateTrigger";
 
-        public override string ToPostDropTableStatement(ModelDefinition modelDef)
-        {
-            if (modelDef.RowVersion != null)
-            {
-                var triggerName = RowVersionTriggerFormat.Fmt(modelDef.ModelName);
-                return "DROP TRIGGER IF EXISTS {0}".Fmt(GetQuotedTableName(triggerName));
-            }
-
-            return null;
-        }
-
         public override string ToPostCreateTableStatement(ModelDefinition modelDef)
         {
             if (modelDef.RowVersion != null)
             {
-                var triggerName = RowVersionTriggerFormat.Fmt(modelDef.ModelName);
+                var triggerName = NamingStrategy.ApplyNameRestrictions(
+                    RowVersionTriggerFormat.Fmt(modelDef.ModelName));
                 var triggerBody = ":NEW.{0} := :OLD.{0}+1;".Fmt(
                     modelDef.RowVersion.FieldName.SqlColumn());
 
                 var sql = "CREATE TRIGGER {0} BEFORE UPDATE ON {1} FOR EACH ROW BEGIN {2} END;".Fmt(
-                    triggerName, modelDef.ModelName, triggerBody);
+                    Quote(triggerName), modelDef.ModelName, triggerBody);
 
                 return sql;
             }
@@ -319,7 +309,7 @@ public override void PrepareParameterizedInsertStatement<T>(IDbCommand dbCommand
             dbCommand.CommandTimeout = OrmLiteConfig.CommandTimeout;
             foreach (var fieldDef in modelDef.FieldDefinitions)
             {
-                if (fieldDef.IsComputed) continue;
+                if (fieldDef.IsComputed || fieldDef.IsRowVersion) continue;
 
                 //insertFields contains Property "Name" of fields to insert (that's how expressions work)
                 if (insertFields.Count > 0 && !insertFields.Contains(fieldDef.Name)) continue;
@@ -771,7 +761,11 @@ public override string GetColumnDefinition(string fieldName, Type fieldType,
             var sql = new StringBuilder();
             sql.AppendFormat("{0} {1}", GetQuotedColumnName(fieldName), fieldDefinition);
 
-            if (!string.IsNullOrEmpty(defaultValue))
+            if (isRowVersion)
+            {
+                sql.AppendFormat(DefaultValueFormat, 1L);
+            }
+            else if (!string.IsNullOrEmpty(defaultValue))
             {
                 sql.AppendFormat(DefaultValueFormat, defaultValue);
             }

src/ServiceStack.OrmLite/OrmLiteWriteExtensions.cs

@@ -794,6 +794,7 @@ internal static ulong GetRowVersion(this IDbCommand dbCmd, ModelDefinition model
                 OrmLiteConfig.DialectProvider.GetQuotedColumnName(modelDef.PrimaryKey.FieldName),
                 idParamString);
 
+            dbCmd.Parameters.Clear();
             var idParam = dbCmd.CreateParameter();
             idParam.ParameterName = idParamString;
             idParam.Value = id;

tests/ServiceStack.OrmLite.Tests/RowVersionTests.cs

@@ -101,15 +101,15 @@ public void Can_create_table_with_RowVersion()
         {
             db.DropAndCreateTable<ModelWithRowVersion>();
 
-            db.Insert(new ModelWithRowVersion { Text = "Text" });
+            var rowId = db.Insert(new ModelWithRowVersion { Text = "Text" }, selectIdentity:true);
 
-            var row = db.SingleById<ModelWithRowVersion>(1);
+            var row = db.SingleById<ModelWithRowVersion>(rowId);
 
             row.Text += " Updated";
 
             db.Update(row);
 
-            var updatedRow = db.SingleById<ModelWithRowVersion>(1);
+            var updatedRow = db.SingleById<ModelWithRowVersion>(rowId);
 
             Assert.That(updatedRow.Text, Is.EqualTo("Text Updated"));
             Assert.That(updatedRow.RowVersion, Is.GreaterThan(0));
@@ -130,15 +130,15 @@ public void Can_create_table_with_RowVersion_Alias()
         {
             db.DropAndCreateTable<ModelWithRowVersionAlias>();
 
-            db.Insert(new ModelWithRowVersionAlias { Text = "Text" });
+            var rowId = db.Insert(new ModelWithRowVersionAlias { Text = "Text" }, selectIdentity:true);
 
-            var row = db.SingleById<ModelWithRowVersionAlias>(1);
+            var row = db.SingleById<ModelWithRowVersionAlias>(rowId);
 
             row.Text += " Updated";
 
             db.Update(row);
 
-            var updatedRow = db.SingleById<ModelWithRowVersionAlias>(1);
+            var updatedRow = db.SingleById<ModelWithRowVersionAlias>(rowId);
 
             Assert.That(updatedRow.Text, Is.EqualTo("Text Updated"));
             Assert.That(updatedRow.RowVersion, Is.GreaterThan(0));
@@ -221,8 +221,9 @@ public void Can_SaveAll_new_rows_and_retrieve_rowversion()
         [Test]
         public void Can_Save_new_row_with_references_and_retrieve_child_rowversions()
         {
+            db.DropTable<ModelWithRowVersionAndParent>();
             db.DropAndCreateTable<ModelWithOptimisticChildren>();
-            db.DropAndCreateTable<ModelWithRowVersionAndParent>();
+            db.CreateTable<ModelWithRowVersionAndParent>();
 
             var row = new ModelWithOptimisticChildren
             {