Merge pull request #158 from mk3008/157-parse-of-type-conversion-usin…

…g-bracket-does-not-work Supports type conversion parsing using Bracket
mk3008 · Nov 16, 2022 · 3990de5 · 3990de5
2 parents f6901e1 + b324c4c
commit 3990de5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/SqModel/Analysis/ValueClauseParser.cs b/src/SqModel/Analysis/ValueClauseParser.cs
@@ -130,7 +130,7 @@ private static IValueClause ParseCore(SqlParser parser)
 
         q.First();
 
-        if (parser.CurrentToken.ToLower() == "over")
+        if (parser.CurrentToken.ToLower() == "over" || parser.CurrentToken == "(")
         {
             return recursiveParse();
         }
@@ -163,7 +163,7 @@ private static CommandValue ToCommandValue(List<string> cache)
             {
                 sb.Append(x);
             }
-            else if (x == "." || x == "(" || x == ")" || x.StartsWith("::"))
+            else if (x == "." || x.StartsWith("(") || x == ")" || x.StartsWith("::"))
             {
                 sb.Append(x);
             }

diff --git a/src/SqModel/SqModel.csproj b/src/SqModel/SqModel.csproj
@@ -8,7 +8,7 @@
 		<PackageProjectUrl>https://github.com/mk3008/SqModel</PackageProjectUrl>
 		<AssemblyVersion></AssemblyVersion>
 		<FileVersion></FileVersion>
-		<Version>0.8.5</Version>
+		<Version>0.8.6</Version>
 		<PackageTags>Sql;QueryBuilder;SqlParser;ORM;</PackageTags>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<Description>Parse and build select queries.</Description>

diff --git a/test/SqModelTest/AnalysisTest/ParseTest.cs b/test/SqModelTest/AnalysisTest/ParseTest.cs
@@ -419,6 +419,17 @@ public void CaseElseTest()
         Assert.Equal(expect, text);
     }
 
+    [Fact]
+    public void TypeConvertWithBracket()
+    {
+        var sq = SqlParser.Parse("select 3.1415::numeric(8,2) as val1");
+        var text = sq.ToQuery().CommandText;
+        var expect = @"select
+    3.1415::numeric(8,2) as val1";
+        Assert.Equal(expect, text);
+    }
+
+
     [Fact]
     public void Full()
     {