diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9d4cee0..74115a1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 3.25.0 - 2021-04-26
+* Improvements to the SQL parser 
+
 ### 3.24.0 - 2021-04-09
 * fixes dynamically applied parameters with more complex expressions 
 
diff --git a/src/FParsec/AssemblyInfo.fs b/src/FParsec/AssemblyInfo.fs
index bc4e4dd..7e609ed 100644
--- 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.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FParsec"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs
index ac5c6a5..571af11 100644
--- 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.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"
diff --git a/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs b/src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs
index e3d4e11..8bd0272 100644
--- 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.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"
diff --git a/src/NpgsqlFSharpParser/AssemblyInfo.fs b/src/NpgsqlFSharpParser/AssemblyInfo.fs
index e2232a8..b98df2a 100644
--- 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.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpParser"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"
diff --git a/src/NpgsqlFSharpVs/source.extension.vsixmanifest b/src/NpgsqlFSharpVs/source.extension.vsixmanifest
index 8abe11c..e769566 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">
     <Metadata>
-        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.24.0" Language="en-US" Publisher="Zaid Ajaj" />
+        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.25.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/src/Ubik/AssemblyInfo.fs b/src/Ubik/AssemblyInfo.fs
index d7e72f0..bcea35d 100644
--- a/src/Ubik/AssemblyInfo.fs
+++ b/src/Ubik/AssemblyInfo.fs
@@ -4,20 +4,20 @@ open System.Reflection
 
 [<assembly: AssemblyTitleAttribute("Ubik")>]
 [<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
-[<assembly: AssemblyVersionAttribute("3.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Ubik"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"
diff --git a/src/Ubik/Ubik.fsproj b/src/Ubik/Ubik.fsproj
index 730bf8a..3bcd2b6 100644
--- a/src/Ubik/Ubik.fsproj
+++ b/src/Ubik/Ubik.fsproj
@@ -7,7 +7,7 @@
     <PackAsTool>true</PackAsTool>
     <IsPackable>true</IsPackable>
     <RollForward>Major</RollForward>
-    <Version>3.24.0</Version>
+    <Version>3.25.0</Version>
     <PackageReleaseNotes>Fixes complex applied expressions to the </PackageReleaseNotes>
   </PropertyGroup>
 
diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs b/tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs
index 92fbad8..f737040 100644
--- 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.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"
diff --git a/tests/examples/hashing/AssemblyInfo.fs b/tests/examples/hashing/AssemblyInfo.fs
index aedc145..f519152 100644
--- 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.24.0")>]
-[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-09T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.24.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.24.0")>]
+[<assembly: AssemblyVersionAttribute("3.25.0")>]
+[<assembly: AssemblyMetadataAttribute("ReleaseDate","2021-04-26T00:00:00.0000000")>]
+[<assembly: AssemblyFileVersionAttribute("3.25.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.25.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","025b5de26ae76e867d47a4047d85d2ab5683940b")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","675b6e17d558a9f77d590af1e6a5277572770739")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "examples"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.24.0"
-    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-09T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.24.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.24.0"
+    let [<Literal>] AssemblyVersion = "3.25.0"
+    let [<Literal>] AssemblyMetadata_ReleaseDate = "2021-04-26T00:00:00.0000000"
+    let [<Literal>] AssemblyFileVersion = "3.25.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.25.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "025b5de26ae76e867d47a4047d85d2ab5683940b"
+    let [<Literal>] AssemblyMetadata_GitHash = "675b6e17d558a9f77d590af1e6a5277572770739"