Npgsql.FSharp.Analyzer v3.16 detect and analyze top-level do expressi…

…ons on modules
Zaid-Ajaj · Dec 6, 2020 · 985f38c · 985f38c
1 parent 9ada119
commit 985f38c
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 50 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 3.16.0 - 2020-09-15
+* Analyze top level do expressions
+
 ### 3.15.0 - 2020-09-15
 * Analyze transaction parameter sets 
 * Allow for literal queries on transactions

diff --git a/src/FParsec/AssemblyInfo.fs b/src/FParsec/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("FParsec")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.15.0")>]
+[<assembly: AssemblyVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.15.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.15.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","b8f1eb5700564f78feb13f98df1d1228d34e4dda")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FParsec"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.15.0"
+    let [<Literal>] AssemblyVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.15.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.15.0"
+    let [<Literal>] AssemblyFileVersion = "3.16.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "b8f1eb5700564f78feb13f98df1d1228d34e4dda"
+    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Core")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.15.0")>]
+[<assembly: AssemblyVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.15.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.15.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","b8f1eb5700564f78feb13f98df1d1228d34e4dda")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.15.0"
+    let [<Literal>] AssemblyVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.15.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.15.0"
+    let [<Literal>] AssemblyFileVersion = "3.16.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "b8f1eb5700564f78feb13f98df1d1228d34e4dda"
+    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs
@@ -736,6 +736,8 @@ module SyntacticAnalysis =
                                 | SynModuleDecl.Types(definitions, range)  ->
                                     iterTypeDefs definitions
 
+                                | SynModuleDecl.DoExpr(debugInfo, expression, range) ->
+                                    operations.AddRange (visitSyntacticExpression expression range)
                                 | _ ->
                                     ()
 

diff --git a/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.15.0")>]
+[<assembly: AssemblyVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.15.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.15.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","b8f1eb5700564f78feb13f98df1d1228d34e4dda")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.15.0"
+    let [<Literal>] AssemblyVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.15.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.15.0"
+    let [<Literal>] AssemblyFileVersion = "3.16.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "b8f1eb5700564f78feb13f98df1d1228d34e4dda"
+    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
diff --git a/src/NpgsqlFSharpParser/AssemblyInfo.fs b/src/NpgsqlFSharpParser/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpParser")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.15.0")>]
+[<assembly: AssemblyVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.15.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.15.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","b8f1eb5700564f78feb13f98df1d1228d34e4dda")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpParser"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.15.0"
+    let [<Literal>] AssemblyVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.15.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.15.0"
+    let [<Literal>] AssemblyFileVersion = "3.16.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "b8f1eb5700564f78feb13f98df1d1228d34e4dda"
+    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
diff --git a/src/NpgsqlFSharpVs/source.extension.vsixmanifest b/src/NpgsqlFSharpVs/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
     xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.14.0" Language="en-US" Publisher="Zaid Ajaj" />
+        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.16.0" Language="en-US" Publisher="Zaid Ajaj" />
         <DisplayName>NpgsqlFSharpVs</DisplayName>
         <Description xml:space="preserve">F# Analyzer for embedded SQL syntax analysis, type-checking for parameters and result sets and nullable column detection when writing queries using Npgsql.FSharp.</Description>
         <MoreInfo>https://github.com/Zaid-Ajaj/Npgsql.FSharp.Analyzer</MoreInfo>

diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs b/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Tests")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.15.0")>]
+[<assembly: AssemblyVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.15.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.15.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","b8f1eb5700564f78feb13f98df1d1228d34e4dda")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.15.0"
+    let [<Literal>] AssemblyVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.15.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.15.0"
+    let [<Literal>] AssemblyFileVersion = "3.16.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "b8f1eb5700564f78feb13f98df1d1228d34e4dda"
+    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs
@@ -49,6 +49,14 @@ let tests =
                 Expect.isEmpty operations "There should be no syntactic blocks"
         }
 
+        test "Syntactic analysis: SQL block found from top-level expression in module" {
+            match context (find "../examples/hashing/topLevelExpressionIsDetected.fs") with
+            | None -> failwith "Could not crack project"
+            | Some context ->
+                let operations = SyntacticAnalysis.findSqlOperations context
+                Expect.equal 1 operations.Length "There should be one syntactic block found"
+        }
+
         test "Syntactic Analysis: reading queries with [<Literal>] query" {
             match context (find "../examples/hashing/syntacticAnalysis-literalStrings.fs") with
             | None -> failwith "Could not crack project"

diff --git a/tests/examples/hashing/AssemblyInfo.fs b/tests/examples/hashing/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("examples")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.15.0")>]
+[<assembly: AssemblyVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.15.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.15.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","b8f1eb5700564f78feb13f98df1d1228d34e4dda")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "examples"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.15.0"
+    let [<Literal>] AssemblyVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.15.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.15.0"
+    let [<Literal>] AssemblyFileVersion = "3.16.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "b8f1eb5700564f78feb13f98df1d1228d34e4dda"
+    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
diff --git a/tests/examples/hashing/examples.fsproj b/tests/examples/hashing/examples.fsproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="topLevelExpressionIsDetected.fs" />
     <Compile Include="usingLiteralQueriesWithTransactions.fs" />
     <Compile Include="detectingDynamicListsInTransactions.fs" />
     <Compile Include="detectingEmptyParameterSet.fs" />
@@ -35,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.FSharp" Version="3.7.0" />
+    <PackageReference Include="Npgsql.FSharp" Version="3.12.2" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/examples/hashing/topLevelExpressionIsDetected.fs b/tests/examples/hashing/topLevelExpressionIsDetected.fs
@@ -0,0 +1,10 @@
+module TopLevelExpressionIsDetected
+
+open Npgsql.FSharp
+
+"some connection string"
+|> Sql.connect
+|> Sql.query "SELECT * FROM users WHERE user_id = @user_id"
+|> Sql.parameters [ "@user_id", Sql.int 42 ]
+|> Sql.execute (fun read -> read.int "user_id")
+|> ignore