Npgsql.FSharp.Analyzer v3.17 support datetimeOffset and datetimeOffse…

…tOrNone when reading columns
Zaid-Ajaj · Dec 6, 2020 · 8d5412f · 8d5412f
1 parent 985f38c
commit 8d5412f
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 57 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 3.17.0 - 2020-09-15
+* Support for datetimeOffset and datetimeOffsetOrNone when reading columns of type timestamptz
+
 ### 3.16.0 - 2020-09-15
 * Analyze top level do expressions
 

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.16.0")>]
+[<assembly: AssemblyVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FParsec"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.16.0"
+    let [<Literal>] AssemblyVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.16.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
+    let [<Literal>] AssemblyFileVersion = "3.17.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
+    let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"
diff --git a/src/FParsecCS/Cloning.cs b/src/FParsecCS/Cloning.cs
@@ -1,9 +1,6 @@
 // Copyright (c) Stephan Tolksdorf 2010-2011
 // License: Simplified BSD License. See accompanying documentation.
 
-using System.Reflection;
-using System.Reflection.Emit;
-
 #if !LOW_TRUST
 
 using System;

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.16.0")>]
+[<assembly: AssemblyVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.16.0"
+    let [<Literal>] AssemblyVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.16.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
+    let [<Literal>] AssemblyFileVersion = "3.17.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
+    let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"
diff --git a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs
@@ -875,15 +875,15 @@ module SqlAnalysis =
                                 else ()
 
                             | ("timestamptz"|"timestamp with time zone") ->
-                                if column.Nullable && notUsing "timestamptzOrNone" && notUsing "dateTimeOrNone"
-                                then yield typeMismatch [ replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
+                                if column.Nullable && notUsing "timestamptzOrNone" && notUsing "dateTimeOrNone" && notUsing "datetimeOffsetOrNone"
+                                then yield typeMismatch [ replace "datetimeOffsetOrNone"; replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
                                 //else if not column.Nullable && (using "timestamptzOrNone" || using "dateTimeOrNone")
                                 //then yield typeMismatch [ replace "dateTime"; replace "timestamptz" ]
-                                else if notUsing "timestamptzOrNone" && notUsing "timestamptz" && notUsing "dateTimeOrNone" && notUsing "dateTime"
+                                else if notUsing "timestamptzOrNone" && notUsing "timestamptz" && notUsing "dateTimeOrNone" && notUsing "dateTime" && notUsing "datetimeOffsetOrNone" && notUsing "datetimeOffset"
                                 then
                                     if column.Nullable
-                                    then yield typeMismatch [ replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
-                                    else yield typeMismatch [ replace "dateTime"; replace "timestamptz" ]
+                                    then yield typeMismatch [ replace "datetimeOffsetOrNone"; replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
+                                    else yield typeMismatch [ replace "datetimeOffset"; replace "dateTime"; replace "timestamptz" ]
                                 else ()
 
                             | "bytea" ->

diff --git a/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs
@@ -305,6 +305,8 @@ module SyntacticAnalysis =
                     ".dateOrNone"
                     ".dateTime"
                     ".dateTimeOrNone"
+                    ".datetimeOffset"
+                    ".datetimeOffsetOrNone"
                     ".intArray"
                     ".intArrayOrNone"
                     ".stringArray"

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.16.0")>]
+[<assembly: AssemblyVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.16.0"
+    let [<Literal>] AssemblyVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.16.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
+    let [<Literal>] AssemblyFileVersion = "3.17.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
+    let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"
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.16.0")>]
+[<assembly: AssemblyVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpParser"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.16.0"
+    let [<Literal>] AssemblyVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.16.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
+    let [<Literal>] AssemblyFileVersion = "3.17.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
+    let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"
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.16.0" Language="en-US" Publisher="Zaid Ajaj" />
+        <Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.17.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.16.0")>]
+[<assembly: AssemblyVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.16.0"
+    let [<Literal>] AssemblyVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.16.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
+    let [<Literal>] AssemblyFileVersion = "3.17.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
+    let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"
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.16.0")>]
+[<assembly: AssemblyVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
-[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
 [<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
-[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
+[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "examples"
     let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
-    let [<Literal>] AssemblyVersion = "3.16.0"
+    let [<Literal>] AssemblyVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
-    let [<Literal>] AssemblyFileVersion = "3.16.0"
-    let [<Literal>] AssemblyInformationalVersion = "3.16.0"
+    let [<Literal>] AssemblyFileVersion = "3.17.0"
+    let [<Literal>] AssemblyInformationalVersion = "3.17.0"
     let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
-    let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
+    let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"