Merge pull request #589 from sl33kr/master

Allow ORMLite Extensions to be used without global dialect provider.

Author: mythz

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

@@ -114,10 +114,10 @@ public void EnsureUtc(bool shouldEnsureUtc)
         public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string schema = null)
         {
             var sql = "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = {0}"
-                .SqlFmt(tableName);
+                .SqlFmt(this, tableName);
 
             if (schema != null)
-                sql += " AND TABLE_SCHEMA = {0}".SqlFmt(schema);
+                sql += " AND TABLE_SCHEMA = {0}".SqlFmt(this, schema);
 
             var result = dbCmd.ExecLongScalar(sql);
 
@@ -127,7 +127,7 @@ public override bool DoesTableExist(IDbCommand dbCmd, string tableName, string s
         public override bool DoesColumnExist(IDbConnection db, string columnName, string tableName, string schema = null)
         {
             var sql = "SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = @tableName AND COLUMN_NAME = @columnName"
-                .SqlFmt(tableName, columnName);
+                .SqlFmt(this, tableName, columnName);
 
             if (schema != null)
                 sql += " AND TABLE_SCHEMA = @schema";

src/ServiceStack.OrmLite.SqlServerTests/TypedExtensionTests.cs

@@ -0,0 +1,68 @@
+using System.Configuration;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.OrmLite.SqlServer;
+
+namespace ServiceStack.OrmLite.SqlServerTests
+{
+    public class TypedExtensionTests
+    {
+        public class TestDao
+        {
+            [PrimaryKey]
+            public int Id { get; set; }
+
+            public string Thing { get; set; }
+        }
+
+        private IOrmLiteDialectProvider provider;
+        private OrmLiteConnectionFactory factory;
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            provider = new SqlServer2014OrmLiteDialectProvider();
+            factory = new OrmLiteConnectionFactory(ConfigurationManager.ConnectionStrings["testDb"].ConnectionString, provider, false);
+        }
+
+        [OneTimeTearDown]
+        public void Teardown()
+        {
+            OrmLiteConfig.DialectProvider = provider;
+
+            using (var connection = factory.OpenDbConnection())
+            {
+                if (connection.TableExists<TestDao>())
+                {
+                    connection.DropTable<TestDao>();
+                }
+            }
+        }
+
+        [Test]
+        public void GivenAnOrmLiteTypedConnectionFactory_WhenUsingOrmLiteExtensionsAndGlobalProviderNotSet_ThenArgumentNullExceptionIsNotThrown()
+        {
+            using (var connection = factory.OpenDbConnection())
+            {
+                Assert.That(() =>
+                {
+                    connection.CreateTableIfNotExists<TestDao>();
+
+                    var dao = new TestDao {Id = 1, Thing = "Thing"};
+
+                    connection.Insert(dao);
+                    connection.SingleById<TestDao>(1);
+
+                    dao.Thing = "New Thing";
+
+                    connection.Update(dao, d => d.Id == dao.Id);
+
+                    connection.Delete(dao);
+
+                    connection.DropTable<TestDao>();
+
+                }, Throws.Nothing);
+            }
+        }
+    }
+}

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -503,7 +503,7 @@ public virtual string ToSelectStatement(Type tableType, string sqlFilter, params
                 && sqlFilter.TrimStart().StartsWith(SelectStatement, StringComparison.OrdinalIgnoreCase);
 
             if (isFullSelectStatement)
-                return sqlFilter.SqlFmt(filterParams);
+                return sqlFilter.SqlFmt(this, filterParams);
 
             var modelDef = tableType.GetModelDefinition();
             var sql = StringBuilderCache.Allocate();
@@ -512,7 +512,7 @@ public virtual string ToSelectStatement(Type tableType, string sqlFilter, params
             if (string.IsNullOrEmpty(sqlFilter))
                 return StringBuilderCache.ReturnAndFree(sql);
 
-            sqlFilter = sqlFilter.SqlFmt(filterParams);
+            sqlFilter = sqlFilter.SqlFmt(this, filterParams);
             if (!sqlFilter.StartsWith("ORDER ", StringComparison.OrdinalIgnoreCase)
                 && !sqlFilter.StartsWith("LIMIT ", StringComparison.OrdinalIgnoreCase))
             {
@@ -1184,15 +1184,15 @@ public virtual string ToDeleteStatement(Type tableType, string sqlFilter, params
                 && sqlFilter.Substring(0, deleteStatement.Length).ToUpper().Equals(deleteStatement);
 
             if (isFullDeleteStatement)
-                return sqlFilter.SqlFmt(filterParams);
+                return sqlFilter.SqlFmt(this, filterParams);
 
             var modelDef = tableType.GetModelDefinition();
             sql.Append($"DELETE FROM {GetQuotedTableName(modelDef)}");
 
             if (string.IsNullOrEmpty(sqlFilter))
                 return StringBuilderCache.ReturnAndFree(sql);
 
-            sqlFilter = sqlFilter.SqlFmt(filterParams);
+            sqlFilter = sqlFilter.SqlFmt(this, filterParams);
             sql.Append(" WHERE ");
             sql.Append(sqlFilter);