From 9ab30a3cae3aad4a688e0548af7641e1f516985a Mon Sep 17 00:00:00 2001 From: Zaid Date: Tue, 8 Dec 2020 15:47:47 +0100 Subject: [PATCH] v3.22 Detect queries within sequential expressions or statements (fixes #16) --- .config/dotnet-tools.json | 4 ++-- RELEASE_NOTES.md | 3 +++ paket.dependencies | 3 ++- paket.lock | 1 + src/FParsec/AssemblyInfo.fs | 16 +++++++-------- src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs | 16 +++++++-------- src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs | 16 +++++++-------- .../NpgsqlFSharpAnalyzer.fsproj | 4 ++++ src/NpgsqlFSharpParser/AssemblyInfo.fs | 16 +++++++-------- src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj | 20 +++++++++++++++++++ .../source.extension.vsixmanifest | 2 +- src/Ubik/AssemblyInfo.fs | 16 +++++++-------- src/Ubik/Ubik.fsproj | 4 ++-- .../AssemblyInfo.fs | 16 +++++++-------- tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 2 +- tests/examples/hashing/AssemblyInfo.fs | 16 +++++++-------- 16 files changed, 92 insertions(+), 63 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f881e8a..500b8c6 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "fake-cli": { - "version": "5.19.0", + "version": "5.20.3", "commands": [ "fake" ] @@ -27,7 +27,7 @@ ] }, "paket": { - "version": "5.247.4", + "version": "5.257.0", "commands": [ "paket" ] diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index bc4f582..2904eb6 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +### 3.22.0 - 2020-12-08 +* Detect queries within sequential expressions or statements + ### 3.21.0 - 2020-12-08 * Detect queries within lambda expressions wrapped in single case unions diff --git a/paket.dependencies b/paket.dependencies index ccf660b..61e0b63 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,8 +1,9 @@ source https://www.nuget.org/api/v2 source https://api.nuget.org/v3/index.json storage: none +lowest_matching: true clitool dotnet-mono 0.5.2 -nuget FSharp.Core +nuget FSharp.Core ~> 4.7.2 nuget Microsoft.SourceLink.GitHub prerelease copy_local: true nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true nuget Expecto 8.13.1 diff --git a/paket.lock b/paket.lock index 44bb0da..8e68c9a 100644 --- a/paket.lock +++ b/paket.lock @@ -1,4 +1,5 @@ STORAGE: NONE +LOWEST_MATCHING: TRUE NUGET remote: https://www.nuget.org/api/v2 altcover (6.7.750) diff --git a/src/FParsec/AssemblyInfo.fs b/src/FParsec/AssemblyInfo.fs index ef4d605..6adb72c 100644 --- a/src/FParsec/AssemblyInfo.fs +++ b/src/FParsec/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "FParsec" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652" diff --git a/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs index d5d4212..d68186c 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652" diff --git a/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs index e7107cf..a8ef9ae 100644 --- a/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs +++ b/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "NpgsqlFSharpAnalyzer" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652" diff --git a/src/NpgsqlFSharpAnalyzer/NpgsqlFSharpAnalyzer.fsproj b/src/NpgsqlFSharpAnalyzer/NpgsqlFSharpAnalyzer.fsproj index 2e855e6..0dab416 100644 --- a/src/NpgsqlFSharpAnalyzer/NpgsqlFSharpAnalyzer.fsproj +++ b/src/NpgsqlFSharpAnalyzer/NpgsqlFSharpAnalyzer.fsproj @@ -4,6 +4,7 @@ NpgsqlFSharpAnalyzer netcoreapp2.0 true + true Advanced embedded static analysis and type-checking for SQL code from F# true @@ -14,6 +15,9 @@ + + + diff --git a/src/NpgsqlFSharpParser/AssemblyInfo.fs b/src/NpgsqlFSharpParser/AssemblyInfo.fs index 447a8a1..a7eaa6d 100644 --- a/src/NpgsqlFSharpParser/AssemblyInfo.fs +++ b/src/NpgsqlFSharpParser/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "NpgsqlFSharpParser" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652" diff --git a/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj b/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj index 6ccbe98..1fa6634 100644 --- a/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj +++ b/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj @@ -159,4 +159,24 @@ + + + + + ..\..\..\..\Users\zaidn\.nuget\packages\fsharp.core\4.7.2\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\..\..\Users\zaidn\.nuget\packages\fsharp.core\4.7.2\lib\netstandard2.0\FSharp.Core.dll + True + True + + + + \ No newline at end of file diff --git a/src/NpgsqlFSharpVs/source.extension.vsixmanifest b/src/NpgsqlFSharpVs/source.extension.vsixmanifest index 7e301e8..4f5267b 100644 --- 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"> - + NpgsqlFSharpVs F# Analyzer for embedded SQL syntax analysis, type-checking for parameters and result sets and nullable column detection when writing queries using Npgsql.FSharp. https://github.com/Zaid-Ajaj/Npgsql.FSharp.Analyzer diff --git a/src/Ubik/AssemblyInfo.fs b/src/Ubik/AssemblyInfo.fs index 928eda2..2edacf8 100644 --- a/src/Ubik/AssemblyInfo.fs +++ b/src/Ubik/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "Ubik" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652" diff --git a/src/Ubik/Ubik.fsproj b/src/Ubik/Ubik.fsproj index baea4cb..fca342f 100644 --- a/src/Ubik/Ubik.fsproj +++ b/src/Ubik/Ubik.fsproj @@ -7,8 +7,8 @@ true true Major - 3.21.0 - Detect queries within lambda expressions wrapped in single case unions + 3.22.0 + Detect queries within sequential expressions or statements diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs b/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs index f092d49..9e9d498 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652" diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index 536e1b9..3284600 100644 --- 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 11 (List.length operationBlocks) "Found ten operation blocks" + Expect.equal 11 (List.length operationBlocks) "Found 11 operation blocks" } test "Syntactic analysis: no SQL blocks should be found using sprintf" { diff --git a/tests/examples/hashing/AssemblyInfo.fs b/tests/examples/hashing/AssemblyInfo.fs index 27e8993..925a8b5 100644 --- a/tests/examples/hashing/AssemblyInfo.fs +++ b/tests/examples/hashing/AssemblyInfo.fs @@ -4,20 +4,20 @@ open System.Reflection [] [] -[] +[] [] -[] -[] +[] +[] [] -[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "examples" let [] AssemblyProduct = "NpgsqlFSharpAnalyzer" - let [] AssemblyVersion = "3.21.0" + let [] AssemblyVersion = "3.22.0" let [] AssemblyMetadata_ReleaseDate = "2020-12-08T00:00:00.0000000" - let [] AssemblyFileVersion = "3.21.0" - let [] AssemblyInformationalVersion = "3.21.0" + let [] AssemblyFileVersion = "3.22.0" + let [] AssemblyInformationalVersion = "3.22.0" let [] AssemblyMetadata_ReleaseChannel = "release" - let [] AssemblyMetadata_GitHash = "2d384f746febd40976d8f3f2cc4314f4d0c05681" + let [] AssemblyMetadata_GitHash = "ad927a4fc51c240225e8bec9af7799527f392652"