modify aliases

Author: ceastwood

QueryBuilder.Tests/OracleLegacyLimitTests.cs

@@ -56,7 +56,7 @@ public void WithNoLimit()
             compiler.ApplyLegacyLimit(ctx);
 
             // Assert:
-            Assert.Matches($"SELECT \\* FROM \\(SELECT \"(SqlKata_.*__)\"\\.\\*, ROWNUM \"(SqlKata_.*__)\" FROM \\({SqlPlaceholder}\\) \"(SqlKata_.*__)\"\\) WHERE \"(SqlKata_.*__)\" > \\?", ctx.RawSql);
+            Assert.Equal("SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM (GENERATED_SQL) \"results_wrapper\") WHERE \"row_num\" > ?", ctx.RawSql);
             Assert.Equal(20, ctx.Bindings[0]);
             Assert.Single(ctx.Bindings);
         }
@@ -72,7 +72,7 @@ public void WithLimitAndOffset()
             compiler.ApplyLegacyLimit(ctx);
 
             // Assert:
-            Assert.Matches($"SELECT \\* FROM \\(SELECT \"(SqlKata_.*__)\"\\.\\*, ROWNUM \"(SqlKata_.*__)\" FROM \\({SqlPlaceholder}\\) \"(SqlKata_.*__)\" WHERE ROWNUM <= \\?\\) WHERE \"(SqlKata_.*__)\" > \\?", ctx.RawSql);
+            Assert.Equal("SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM (GENERATED_SQL) \"results_wrapper\" WHERE ROWNUM <= ?) WHERE \"row_num\" > ?", ctx.RawSql);
             Assert.Equal(25, ctx.Bindings[0]);
             Assert.Equal(20, ctx.Bindings[1]);
             Assert.Equal(2, ctx.Bindings.Count);

QueryBuilder/Compilers/OracleCompiler.cs

@@ -74,14 +74,10 @@ internal void ApplyLegacyLimit(SqlResult ctx)
                 return;
             }
 
-            //@todo replace with alias generator
-            var alias1 = WrapValue("SqlKata_A__");
-            var alias2 = WrapValue("SqlKata_B__");
-
             string newSql;
             if (limit == 0)
             {
-                newSql = $"SELECT * FROM (SELECT {alias1}.*, ROWNUM {alias2} FROM ({ctx.RawSql}) {alias1}) WHERE {alias2} > ?";
+                newSql = $"SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM ({ctx.RawSql}) \"results_wrapper\") WHERE \"row_num\" > ?";
                 ctx.Bindings.Add(offset);
             }
             else if (offset == 0)
@@ -91,7 +87,7 @@ internal void ApplyLegacyLimit(SqlResult ctx)
             }
             else
             {
-                newSql = $"SELECT * FROM (SELECT {alias1}.*, ROWNUM {alias2} FROM ({ctx.RawSql}) {alias1} WHERE ROWNUM <= ?) WHERE {alias2} > ?";
+                newSql = $"SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM ({ctx.RawSql}) \"results_wrapper\" WHERE ROWNUM <= ?) WHERE \"row_num\" > ?";
                 ctx.Bindings.Add(limit + offset);
                 ctx.Bindings.Add(offset);
             }