Merge pull request #548 from KevinHoward/master

mythz · web-flow · commit 10b19cf6b084 · 2016-11-29T18:04:23.000-05:00
Fixed regression caused by last commit and fixed root issue.
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServer2012OrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServer2012OrmLiteDialectProvider.cs
@@ -1,4 +1,6 @@
-﻿using ServiceStack.Text;
+﻿using System.Data;
+using System.Text;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.SqlServer
 {
@@ -39,5 +41,40 @@ public override string ToSelectStatement(ModelDefinition modelDef,
 
             return StringBuilderCache.ReturnAndFree(sb);
         }
+
+        public override void AppendFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef, IDbCommand cmd)
+        {
+            if (!isSpatialField(fieldDef))
+            {
+                base.AppendFieldCondition(sqlFilter, fieldDef, cmd);
+            }
+            else 
+            {
+                sqlFilter
+                    .Append(GetQuotedColumnName(fieldDef.FieldName))
+                    .Append(".STEquals(")
+                    .Append(this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName)))
+                    .Append(") = 1");
+ 
+                AddParameter(cmd, fieldDef);
+            }
+        }
+
+        public override void AppendNullFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef)
+        {
+            if (!isSpatialField(fieldDef))
+            {
+                base.AppendNullFieldCondition(sqlFilter, fieldDef);
+            }
+            else
+            {
+                sqlFilter
+                    .Append(GetQuotedColumnName(fieldDef.FieldName))
+                    .Append(".IsNull = 1");
+            }
+        }
+
+        private bool isSpatialField(FieldDefinition fieldDef) => 
+            fieldDef.FieldType.Name == "SqlGeography" || fieldDef.FieldType.Name == "SqlGeometry";
     }
 }
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/Converters/ConvertersOrmLiteTestBase.cs b/src/ServiceStack.OrmLite.SqlServerTests/Converters/ConvertersOrmLiteTestBase.cs
@@ -40,10 +40,12 @@ public void Log(string text)
             Console.WriteLine(text);
         }
 
-        public virtual IDbConnection OpenDbConnection(string connString = null)
+        public virtual IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)
         {
+            dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;
             connString = connString ?? ConnectionString;
-            return connString.OpenDbConnection();
+
+            return new OrmLiteConnectionFactory(connString, dialectProvider).OpenDbConnection();
         }
     }
 }
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/Expressions/ExpressionsTestBase.cs b/src/ServiceStack.OrmLite.SqlServerTests/Expressions/ExpressionsTestBase.cs
@@ -16,12 +16,14 @@ public void Setup()
         //Avoid painful refactor to change all tests to use a using pattern
         private IDbConnection db;
 
-        public override IDbConnection OpenDbConnection(string connString = null)
+        public override IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)
         {
+            dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;
+
             if (db != null && db.State != ConnectionState.Open)
                 db = null;
 
-            return db ?? (db = base.OpenDbConnection(connString));
+            return db ?? (db = base.OpenDbConnection(connString, dialectProvider));
         }
 
         [TearDown]
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/Issues/DeleteWithGeoTypesIssue.cs b/src/ServiceStack.OrmLite.SqlServerTests/Issues/DeleteWithGeoTypesIssue.cs
@@ -34,7 +34,7 @@ public void Can_delete_entity_with_Geo_Type()
                 var bar = db.Single<ModelWithGeo>(x => x.Name == "Bar");
                 db.SqlScalar<int>(
                     "DELETE FROM ModelWithGeo WHERE Id=@Id AND Location.STEquals(@Location) = 1", 
-                    new { bar.Id, bar.Name, bar.Location });
+                    new { Id = bar.Id, Location = bar.Location });
 
                 Assert.That(db.Select<ModelWithGeo>().Count, Is.EqualTo(2));
 
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/OrmLiteTestBase.cs b/src/ServiceStack.OrmLite.SqlServerTests/OrmLiteTestBase.cs
@@ -24,10 +24,11 @@ public void Log(string text)
             Console.WriteLine(text);
         }
 
-        public virtual IDbConnection OpenDbConnection(string connString = null)
+        public virtual IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)
         {
+            dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;
             connString = connString ?? ConnectionString;
-            return connString.OpenDbConnection();
+            return new OrmLiteConnectionFactory(connString, dialectProvider).OpenDbConnection();
         }
     }
 }
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -764,7 +764,12 @@ public virtual bool PrepareParameterizedUpdateStatement<T>(IDbCommand cmd, IColl
                     if (sql.Length > 0)
                         sql.Append(", ");
 
-                    AppendFieldCondition(sql, fieldDef, cmd);
+                    sql
+                        .Append(GetQuotedColumnName(fieldDef.FieldName))
+                        .Append("=")
+                        .Append(this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName)));
+
+                    AddParameter(cmd, fieldDef);
                 }
                 catch (Exception ex)
                 {
@@ -782,6 +787,13 @@ public virtual bool PrepareParameterizedUpdateStatement<T>(IDbCommand cmd, IColl
             return hadRowVesion;
         }
 
+        public virtual void AppendNullFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef)
+        {
+            sqlFilter
+                .Append(GetQuotedColumnName(fieldDef.FieldName))
+                .Append(" IS NULL");
+        }
+
         public virtual void AppendFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef, IDbCommand cmd)
         {
             sqlFilter
@@ -827,9 +839,7 @@ public virtual bool PrepareParameterizedDeleteStatement<T>(IDbCommand cmd, IDict
                     }
                     else
                     {
-                        sqlFilter
-                            .Append(GetQuotedColumnName(fieldDef.FieldName))
-                            .Append(" IS NULL");
+                        AppendNullFieldCondition(sqlFilter, fieldDef);
                     }
                 }
                 catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,12 @@ public void Log(string text)`
`40`	`40`	`Console.WriteLine(text);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public virtual IDbConnection OpenDbConnection(string connString = null)`
	`43`	`+ public virtual IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)`
`44`	`44`	`{`
	`45`	`+ dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;`
`45`	`46`	`connString = connString ?? ConnectionString;`
`46`		`- return connString.OpenDbConnection();`
	`47`	`+`
	`48`	`+ return new OrmLiteConnectionFactory(connString, dialectProvider).OpenDbConnection();`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,14 @@ public void Setup()`
`16`	`16`	`//Avoid painful refactor to change all tests to use a using pattern`
`17`	`17`	`private IDbConnection db;`
`18`	`18`
`19`		`- public override IDbConnection OpenDbConnection(string connString = null)`
	`19`	`+ public override IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)`
`20`	`20`	`{`
	`21`	`+ dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;`
	`22`	`+`
`21`	`23`	`if (db != null && db.State != ConnectionState.Open)`
`22`	`24`	`db = null;`
`23`	`25`
`24`		`- return db ?? (db = base.OpenDbConnection(connString));`
	`26`	`+ return db ?? (db = base.OpenDbConnection(connString, dialectProvider));`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`[TearDown]`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,11 @@ public void Log(string text)`
`24`	`24`	`Console.WriteLine(text);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public virtual IDbConnection OpenDbConnection(string connString = null)`
	`27`	`+ public virtual IDbConnection OpenDbConnection(string connString = null, IOrmLiteDialectProvider dialectProvider = null)`
`28`	`28`	`{`
	`29`	`+ dialectProvider = dialectProvider ?? OrmLiteConfig.DialectProvider;`
`29`	`30`	`connString = connString ?? ConnectionString;`
`30`		`- return connString.OpenDbConnection();`
	`31`	`+ return new OrmLiteConnectionFactory(connString, dialectProvider).OpenDbConnection();`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -764,7 +764,12 @@ public virtual bool PrepareParameterizedUpdateStatement<T>(IDbCommand cmd, IColl`
`764`	`764`	`if (sql.Length > 0)`
`765`	`765`	`sql.Append(", ");`
`766`	`766`
`767`		`- AppendFieldCondition(sql, fieldDef, cmd);`
	`767`	`+ sql`
	`768`	`+ .Append(GetQuotedColumnName(fieldDef.FieldName))`
	`769`	`+ .Append("=")`
	`770`	`+ .Append(this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName)));`
	`771`	`+`
	`772`	`+ AddParameter(cmd, fieldDef);`
`768`	`773`	`}`
`769`	`774`	`catch (Exception ex)`
`770`	`775`	`{`
`@@ -782,6 +787,13 @@ public virtual bool PrepareParameterizedUpdateStatement<T>(IDbCommand cmd, IColl`
`782`	`787`	`return hadRowVesion;`
`783`	`788`	`}`
`784`	`789`
	`790`	`+ public virtual void AppendNullFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef)`
	`791`	`+ {`
	`792`	`+ sqlFilter`
	`793`	`+ .Append(GetQuotedColumnName(fieldDef.FieldName))`
	`794`	`+ .Append(" IS NULL");`
	`795`	`+ }`
	`796`	`+`
`785`	`797`	`public virtual void AppendFieldCondition(StringBuilder sqlFilter, FieldDefinition fieldDef, IDbCommand cmd)`
`786`	`798`	`{`
`787`	`799`	`sqlFilter`
`@@ -827,9 +839,7 @@ public virtual bool PrepareParameterizedDeleteStatement<T>(IDbCommand cmd, IDict`
`827`	`839`	`}`
`828`	`840`	`else`
`829`	`841`	`{`
`830`		`- sqlFilter`
`831`		`- .Append(GetQuotedColumnName(fieldDef.FieldName))`
`832`		`- .Append(" IS NULL");`
	`842`	`+ AppendNullFieldCondition(sqlFilter, fieldDef);`
`833`	`843`	`}`
`834`	`844`	`}`
`835`	`845`	`catch (Exception ex)`