The AS key word is optional noise.

FoothillSolutions · Apr 24, 2021 · a12f633 · a12f633
1 parent fa40841
commit a12f633
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/NpgsqlFSharpParser/Parser.fs b/src/NpgsqlFSharpParser/Parser.fs
@@ -245,7 +245,7 @@ let optionalFrom =
     optionalExpr (
         attempt (
             text "FROM " >>. simpleIdentifier >>= fun table ->
-            text "AS" >>= fun _ ->
+            optional (text "AS") >>= fun _ ->
             simpleIdentifier >>= fun alias ->
             preturn (Expr.As(Expr.Ident table, Expr.Ident alias))
         )

diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/ParseSelectTests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/ParseSelectTests.fs
@@ -124,6 +124,12 @@ let selectQueryTests = testList "Parse SELECT tests" [
             From = Some (Expr.As(Expr.Ident "users", Expr.Ident "u"))
     }
 
+    testSelect "SELECT COUNT(*) AS user_count FROM users u" {
+        SelectExpr.Default with
+            Columns = [Expr.As(Expr.Function("COUNT", [Expr.Star]), Expr.Ident("user_count")) ]
+            From = Some (Expr.As(Expr.Ident "users", Expr.Ident "u"))
+    }
+
     testSelect "SELECT COUNT(*) FROM users LIMIT 10" {
         SelectExpr.Default with
             Columns = [Expr.Function("COUNT", [Expr.Star]) ]