Detect queries after calling print expressions; Fixes Zaid-Ajaj#16

FoothillSolutions · Dec 8, 2020 · 21211a8 · 21211a8
1 parent 784bcf6
commit 21211a8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs
@@ -646,6 +646,12 @@ module SyntacticAnalysis =
         | SynExpr.Lambda (fromMethod, inSeq, args, body, range) ->
             visitSyntacticExpression body range
 
+        | SynExpr.Sequential (debugSeqPoint, isTrueSeq, expr1, expr2, range) ->
+            [
+                yield! visitSyntacticExpression expr1 range
+                yield! visitSyntacticExpression expr2 range
+            ]
+
         | otherwise ->
             [ ]
 

diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs
@@ -38,7 +38,7 @@ let tests =
             | None -> failwith "Could not crack project"
             | Some context ->
                 let operationBlocks = SyntacticAnalysis.findSqlOperations context
-                Expect.equal 10 (List.length operationBlocks) "Found ten operation blocks"
+                Expect.equal 11 (List.length operationBlocks) "Found ten operation blocks"
         }
 
         test "Syntactic analysis: no SQL blocks should be found using sprintf" {

diff --git a/tests/examples/hashing/syntacticAnalysis.fs b/tests/examples/hashing/syntacticAnalysis.fs
@@ -37,6 +37,14 @@ let findNumberOfUsers() =
     |> Sql.query "SELECT COUNT(*) as count FROM users"
     |> Sql.execute (fun read -> read.int64 "count")
 
+let findNumberOfUsersAfterCallingPrintExpressions () =
+    printfn "Non blocking expression"
+    printf "Non blocking expression"
+    Sql.host "localhost"
+    |> Sql.connectFromConfig
+    |> Sql.query "SELECT COUNT(*) as count FROM users"
+    |> Sql.execute (fun read -> read.int64 "count")
+
 let executeFunction() =
     Sql.host "localhost"
     |> Sql.connectFromConfig