Merge pull request #558 from BruceCowan-AI/FixToUpdateOrInsertStatement

Fix ToUpdateStatement and ToInsertStatement with subset named columns

Author: mythz

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

@@ -400,6 +400,9 @@
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\TestHelpers.cs">
       <Link>TestHelpers.cs</Link>
     </Compile>
+    <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\ToInsertAndUpdateStatementTests.cs">
+      <Link>ToInsertAndUpdateStatementTests.cs</Link>
+    </Compile>
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\TypeDescriptorMetadataTests.cs">
       <Link>TypeDescriptorMetadataTests.cs</Link>
     </Compile>

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using ServiceStack.DataAnnotations;
@@ -743,7 +744,7 @@ public virtual string MergeParamsIntoSql(string sql, IEnumerable<IDbDataParamete
                 var quotedValue = dbParam.Value != null
                     ? GetQuotedValue(dbParam.Value, dbParam.Value.GetType())
                     : "null";
-                sql = sql.Replace(dbParam.ParameterName, quotedValue);
+                sql = Regex.Replace(sql, dbParam.ParameterName + @"(,|\s|\)|$)", quotedValue + "$1");
             }
             return sql;
         }

tests/ServiceStack.OrmLite.Tests/DefaultValueTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
 using ServiceStack.Text;
@@ -12,6 +13,8 @@ public class DefaultValues
         [Default(1)]
         public int DefaultInt { get; set; }
 
+        public int DefaultIntNoDefault { get; set; }
+
         [Default(1)]
         public int? NDefaultInt { get; set; }
 
@@ -39,28 +42,62 @@ public void Can_create_table_with_DefaultValues()
         {
             using (var db = OpenDbConnection())
             {
-                db.DropAndCreateTable<DefaultValues>();
+                var row = CreateAndInitialize(db);
+
+                var expectedDate = Dialect != Dialect.MySql && Dialect != Dialect.Firebird
+                    ? DateTime.UtcNow.Date
+                    : DateTime.Now.Date; //MySql CURRENT_TIMESTAMP == LOCAL_TIME
+
+                Assert.That(row.CreatedDateUtc, Is.GreaterThan(expectedDate));
+                Assert.That(row.NCreatedDateUtc, Is.GreaterThan(expectedDate));
+            }
+        }
+
+        private DefaultValues CreateAndInitialize(IDbConnection db)
+        {
+            db.DropAndCreateTable<DefaultValues>();
 
-                db.GetLastSql().Print();
+            db.GetLastSql().Print();
 
-                db.Insert(new DefaultValues { Id = 1 });
+            db.Insert(new DefaultValues { Id = 1 });
+
+
+            var row = db.SingleById<DefaultValues>(1);
+
+            row.PrintDump();
+            Assert.That(row.DefaultInt, Is.EqualTo(1));
+            Assert.That(row.DefaultIntNoDefault, Is.EqualTo(0));
+            Assert.That(row.NDefaultInt, Is.EqualTo(1));
+            Assert.That(row.DefaultDouble, Is.EqualTo(1.1).Within(.1d));
+            Assert.That(row.NDefaultDouble, Is.EqualTo(1.1).Within(.1d));
+            Assert.That(row.DefaultString, Is.EqualTo("String"));
+
+            return row;
+        }
+
+        [Test]
+        public void Can_use_ToUpdateStatement_to_generate_inline_SQL()
+        {
+            using (var db = OpenDbConnection())
+            {
+                CreateAndInitialize(db);
 
                 var row = db.SingleById<DefaultValues>(1);
+                row.DefaultIntNoDefault = 42;
+
+                var sql = db.ToUpdateStatement(row);
+                sql.Print();
+                db.ExecuteSql(sql);
+
+                row = db.SingleById<DefaultValues>(1);
 
-                row.PrintDump();
                 Assert.That(row.DefaultInt, Is.EqualTo(1));
+                Assert.That(row.DefaultIntNoDefault, Is.EqualTo(42));
                 Assert.That(row.NDefaultInt, Is.EqualTo(1));
                 Assert.That(row.DefaultDouble, Is.EqualTo(1.1).Within(.1d));
                 Assert.That(row.NDefaultDouble, Is.EqualTo(1.1).Within(.1d));
                 Assert.That(row.DefaultString, Is.EqualTo("String"));
-
-                var expectedDate = Dialect != Dialect.MySql && Dialect != Dialect.Firebird
-                    ? DateTime.UtcNow.Date
-                    : DateTime.Now.Date; //MySql CURRENT_TIMESTAMP == LOCAL_TIME
-
-                Assert.That(row.CreatedDateUtc, Is.GreaterThan(expectedDate));
-                Assert.That(row.NCreatedDateUtc, Is.GreaterThan(expectedDate));
             }
         }
     }
-}
+}