Handle line wrapped FROM queries

FoothillSolutions · Apr 27, 2021 · 6d4efb8 · 6d4efb8
1 parent 46d4e2d
commit 6d4efb8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/src/NpgsqlFSharpParser/Parser.fs b/src/NpgsqlFSharpParser/Parser.fs
@@ -109,15 +109,15 @@ let simpleIdentifier =
     attempt(
         stringIdentifier >>= fun schema ->
         text "." >>. stringIdentifier >>= fun table ->
-        text "." >>. stringIdentifier .>> spaces >>= fun column ->
+        text "." >>. stringIdentifier >>= fun column ->
         preturn (sprintf "%s.%s.%s" schema table column))
     <|>
     attempt(
         stringIdentifier >>= fun table ->
-        text "." >>. stringIdentifier .>> spaces >>= fun column ->
+        text "." >>. stringIdentifier >>= fun column ->
         preturn (sprintf "%s.%s" table column))
     <|>
-    stringIdentifier
+    attempt stringIdentifier
 
 let identifier : Parser<Expr, unit> =
     simpleIdentifier |>> Expr.Ident
@@ -261,14 +261,14 @@ let optionalHavingClause = optionalExpr (text "HAVING" >>. expr)
 let optionalFrom =
     optionalExpr (
         attempt (
-            text "FROM " >>. (parens selectQuery) >>= fun subQuery ->
+            text "FROM" >>. (parens selectQuery) >>= fun subQuery ->
             optional (text "AS") >>= fun _ ->
             simpleIdentifier >>= fun alias ->
             preturn (Expr.As(subQuery, Expr.Ident alias))
         )
         <|>
         attempt (
-            text "FROM " >>. simpleIdentifier >>= fun table ->
+            text "FROM" >>. simpleIdentifier >>= fun table ->
             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
@@ -442,6 +442,21 @@ let selectQueryTests = testList "Parse SELECT tests" [
             Limit = Some (Expr.Integer 1)
     }
 
+    testSelect """
+        SELECT *
+        FROM
+        (SELECT NOW()) time
+        LIMIT 1
+    """ {
+        SelectExpr.Default with
+            Columns = [Expr.Star]
+            From = Some (Expr.As (Expr.SelectQuery {
+                SelectExpr.Default with
+                    Columns = [Expr.Function ("NOW", [])]
+            }, Expr.Ident "time"))
+            Limit = Some (Expr.Integer 1)
+    }
+
     testSelect """
         SELECT "username" FROM "users"
     """ {
@@ -451,7 +466,7 @@ let selectQueryTests = testList "Parse SELECT tests" [
         }
 
     testSelect """
-        SELECT "username" as "name" FROM "users"
+        SELECT "username" AS "name" FROM "users"
     """ {
         SelectExpr.Default with
             Columns = [ Expr.As(Expr.Ident "username", Expr.Ident "name") ]
@@ -467,7 +482,7 @@ let selectQueryTests = testList "Parse SELECT tests" [
         }
 
     testSelect """
-        SELECT "$Table".timestamp as ts FROM "$Table"
+        SELECT "$Table".timestamp AS ts FROM "$Table"
     """ {
         SelectExpr.Default with
             Columns = [ Expr.As(Expr.Ident("$Table.timestamp"), Expr.Ident("ts")) ]
@@ -481,4 +496,21 @@ let selectQueryTests = testList "Parse SELECT tests" [
             Columns = [ Expr.Ident("public.$Table.timestamp") ]
             From = Expr.Ident "$Table" |> Some
         }
+
+    testSelect """
+        SELECT public."$Table"."timestamp" FROM "$Table" AS tbl
+    """ {
+        SelectExpr.Default with
+            Columns = [ Expr.Ident("public.$Table.timestamp") ]
+            From = Expr.As(Expr.Ident "$Table", Expr.Ident "tbl") |> Some
+        }
+
+    testSelect """
+        SELECT public."$Table"."timestamp" FROM "$Table" tbl LIMIT 100
+    """ {
+        SelectExpr.Default with
+            Columns = [ Expr.Ident("public.$Table.timestamp") ]
+            From = Expr.As(Expr.Ident "$Table", Expr.Ident "tbl") |> Some
+            Limit = Some (Expr.Integer 100)
+        }
 ]