issue #189 merge oracle compilers

move extension classes

initial merge of oracle compilers

update unit tests part one

rename test cs file

remove commented / obsolete tests

Author: ceastwood

QueryBuilder.Tests/OracleLegacyLimit.cs

@@ -5,25 +5,15 @@
 
 namespace SqlKata.Tests
 {
-    public class Oracle11gLimitTests
+    public class OracleLegacyLimitTests
     {
         private const string TableName = "Table";
         private const string SqlPlaceholder = "GENERATED_SQL";
 
-        private Oracle11gCompiler compiler = new Oracle11gCompiler();
-
-        [Fact]
-        public void CompileLimitThrowsException()
+        private OracleCompiler compiler = new OracleCompiler()
         {
-            // Arrange:
-            var query = new Query(TableName);
-            var ctx = new SqlResult { Query = query };
-
-            // Act:
-            Assert.Throws<NotSupportedException>(() => compiler.CompileLimit(ctx));
-
-            // Assert: Assertion is handled by Throws
-        }
+            UseLegacyPagination = true
+        };
 
         [Fact]
         public void WithNoLimitNorOffset()
@@ -33,7 +23,7 @@ public void WithNoLimitNorOffset()
             var ctx = new SqlResult { Query = query, RawSql = SqlPlaceholder };
 
             // Act:
-            compiler.ApplyLimit(ctx);
+            compiler.ApplyLegacyLimit(ctx);
 
             // Assert:
             Assert.Equal(SqlPlaceholder, ctx.RawSql);
@@ -47,7 +37,7 @@ public void WithNoOffset()
             var ctx = new SqlResult { Query = query, RawSql = SqlPlaceholder };
 
             // Act:
-            compiler.ApplyLimit(ctx);
+            compiler.ApplyLegacyLimit(ctx);
 
             // Assert:
             Assert.Matches($"SELECT \\* FROM \\({SqlPlaceholder}\\) WHERE ROWNUM <= ?", ctx.RawSql);
@@ -63,7 +53,7 @@ public void WithNoLimit()
             var ctx = new SqlResult { Query = query, RawSql = SqlPlaceholder };
 
             // Act:
-            compiler.ApplyLimit(ctx);
+            compiler.ApplyLegacyLimit(ctx);
 
             // Assert:
             Assert.Matches($"SELECT \\* FROM \\(SELECT \"(SqlKata_.*__)\"\\.\\*, ROWNUM \"(SqlKata_.*__)\" FROM \\({SqlPlaceholder}\\) \"(SqlKata_.*__)\"\\) WHERE \"(SqlKata_.*__)\" > \\?", ctx.RawSql);
@@ -79,7 +69,7 @@ public void WithLimitAndOffset()
             var ctx = new SqlResult { Query = query, RawSql = SqlPlaceholder };
 
             // Act:
-            compiler.ApplyLimit(ctx);
+            compiler.ApplyLegacyLimit(ctx);
 
             // Assert:
             Assert.Matches($"SELECT \\* FROM \\(SELECT \"(SqlKata_.*__)\"\\.\\*, ROWNUM \"(SqlKata_.*__)\" FROM \\({SqlPlaceholder}\\) \"(SqlKata_.*__)\" WHERE ROWNUM <= \\?\\) WHERE \"(SqlKata_.*__)\" > \\?", ctx.RawSql);

QueryBuilder.Tests/Oracle11gLimitTests.cs …yBuilder.Tests/OracleLegacyLimitTests.csQueryBuilder.Tests/Oracle11gLimitTests.cs renamed to QueryBuilder.Tests/OracleLegacyLimitTests.cs QueryBuilder.Tests/Oracle11gLimitTests.cs renamed to QueryBuilder.Tests/OracleLegacyLimitTests.cs

@@ -3,6 +3,7 @@
 using SqlKata.Execution;
 using SqlKata;
 using SqlKata.Compilers;
+using SqlKata.Compilers.Extensions;
 using Xunit;
 
 namespace SqlKata.Tests
@@ -12,7 +13,7 @@ public class QueryBuilderTest
         private readonly Compiler pgsql;
         private readonly MySqlCompiler mysql;
         private readonly FirebirdCompiler fbsql;
-        private readonly Oracle11gCompiler oracle;
+        private readonly OracleCompiler oracle;
         public SqlServerCompiler mssql { get; private set; }
 
         private string[] Compile(Query q)
@@ -23,7 +24,7 @@ private string[] Compile(Query q)
                 mysql.Compile(q.Clone()).ToString(),
                 pgsql.Compile(q.Clone()).ToString(),
                 fbsql.Compile(q.Clone()).ToString(),
-                oracle.Compile(q.Clone()).ToString(),
+                oracle.Compile(q.Clone()).ToString()
             };
         }
 
@@ -33,7 +34,7 @@ public QueryBuilderTest()
             mysql = new MySqlCompiler();
             pgsql = new PostgresCompiler();
             fbsql = new FirebirdCompiler();
-            oracle = new Oracle11gCompiler();
+            oracle = new OracleCompiler();
         }
 
         [Fact]

QueryBuilder.Tests/QueryBuilderTest.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace SqlKata.Compilers.Extensions
+{
+    public static class FirebirdCompilerExtensions
+    {
+        public static string ENGINE_CODE = "firebird";
+
+        public static Query ForFirebird(this Query src, Func<Query, Query> fn)
+        {
+            return src.For(FirebirdCompilerExtensions.ENGINE_CODE, fn);
+        }
+    }
+}

QueryBuilder/Compilers/Extensions/FirebirdCompilerExtensions.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace SqlKata.Compilers.Extensions
+{
+    public static class MySqlCompilerExtensions
+    {
+        public static string ENGINE_CODE = "mysql";
+        public static Query ForMySql(this Query src, Func<Query, Query> fn)
+        {
+            return src.For(MySqlCompilerExtensions.ENGINE_CODE, fn);
+        }
+    }
+}

QueryBuilder/Compilers/Extensions/MySqlCompilerExtensions.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace SqlKata.Compilers.Extensions
+{
+    public static class OracleCompilerExtensions
+    {
+        public static string ENGINE_CODE = "oracle";
+
+        public static Query ForOracle(this Query src, Func<Query, Query> fn)
+        {
+            return src.For(ENGINE_CODE, fn);
+        }
+    }
+}

QueryBuilder/Compilers/Extensions/OracleCompilerExtensions.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace SqlKata.Compilers.Extensions
+{
+    public static class PostgresCompilerExtensions
+    {
+        public static string ENGINE_CODE = "postgres";
+
+        public static Query ForPostgres(this Query src, Func<Query, Query> fn)
+        {
+            return src.For(PostgresCompilerExtensions.ENGINE_CODE, fn);
+        }
+    }
+}

QueryBuilder/Compilers/Extensions/PostgresCompilerExtensions.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace SqlKata.Compilers.Extensions
+{
+    public static class SqlServerCompilerExtensions
+    {
+        public static string ENGINE_CODE = "sqlsrv";
+        public static Query ForSqlServer(this Query src, Func<Query, Query> fn)
+        {
+            return src.For(SqlServerCompilerExtensions.ENGINE_CODE, fn);
+        }
+    }
+}

QueryBuilder/Compilers/Extensions/SqlServerCompilerExtensions.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace SqlKata.Compilers.Extensions
+{
+    public static class SqliteCompilerExtensions
+    {
+        public static string ENGINE_CODE = "sqlite";
+        public static Query ForSqlite(this Query src, Func<Query, Query> fn)
+        {
+            return src.For(SqliteCompilerExtensions.ENGINE_CODE, fn);
+        }
+    }
+}

QueryBuilder/Compilers/Extensions/SqliteCompilerExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -154,14 +153,4 @@ public override string CompileFalse()
             return "0";
         }
     }
-
-    public static class FirebirdCompilerExtensions
-    {
-        public static string ENGINE_CODE = "firebird";
-
-        public static Query ForFirebird(this Query src, Func<Query, Query> fn)
-        {
-            return src.For(FirebirdCompilerExtensions.ENGINE_CODE, fn);
-        }
-    }
 }