Merge pull request #176 from mk3008/173-where-token-is-mistaken-for-a-table-alias

Supports uppercase tokens

Author: mk3008

src/SqModel/Analysis/ConditionGroupParser.cs

@@ -20,7 +20,7 @@ internal static ConditionGroup Parse(SqlParser parser, string starttoken)
         q.First(); //skip start token token
 
         var isFirst = true;
-        while (!parser.ConditionBreakTokens.Contains(parser.CurrentToken) && parser.CurrentToken.IsNotEmpty())
+        while (!parser.ConditionBreakTokens.Contains(parser.CurrentToken.ToLower()) && parser.CurrentToken.IsNotEmpty())
         {
             var op = string.Empty;
             var sop = string.Empty;

src/SqModel/Analysis/ValueClauseParser.cs

@@ -96,7 +96,7 @@ private static IValueClause ParseCore(SqlParser parser)
         }
 
         q.First();
-        if (parser.CurrentToken.IsEmpty() || parser.ValueBreakTokens.Contains(parser.CurrentToken)) return ToCommandValue(cache);
+        if (parser.CurrentToken.IsEmpty() || parser.ValueBreakTokens.Contains(parser.CurrentToken.ToLower())) return ToCommandValue(cache);
         if (parser.CurrentToken.IsWord() && parser.CurrentToken.ToLower() != "is" && parser.CurrentToken.ToLower() != "null") return ToCommandValue(cache);
         if (parser.CurrentToken.IsConjunction()) return ToCommandValue(cache);
 

src/SqModel/SqModel.csproj

@@ -8,7 +8,7 @@
 		<PackageProjectUrl>https://github.com/mk3008/SqModel</PackageProjectUrl>
 		<AssemblyVersion></AssemblyVersion>
 		<FileVersion></FileVersion>
-		<Version>0.8.14</Version>
+		<Version>0.8.15</Version>
 		<PackageTags>Sql;QueryBuilder;SqlParser;SqlBuilder;</PackageTags>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<Description>Parse and build select queries.</Description>

test/SqModelTest/AnalysisTest/ParseTest.cs

@@ -47,6 +47,28 @@ from A
         Assert.Equal(expect, text);
     }
 
+    [Fact]
+    public void UpperCaseGroupByHavingByOrderBy()
+    {
+        var sq = SqlParser.Parse(@"SELECT SUM(V.VAL) FROM dbo.V WHERE (V.VAL = 1) GROUP BY V.VAL, V.VAL2 HAVING SUM(V.VAL) > 10 ORDER BY V.VAL");
+
+        var text = sq.ToQuery().CommandText;
+        var expect = @"select
+    SUM(V.VAL)
+from dbo.V
+where
+    (V.VAL = 1)
+group by
+    V.VAL
+    , V.VAL2
+having
+    SUM(V.VAL) > 10
+order by
+    V.VAL";
+        Assert.Equal(expect, text);
+    }
+
+
     [Fact]
     public void Parameter()
     {