Skip to content

Commit 8d5412f

Browse files
committed
Npgsql.FSharp.Analyzer v3.17 support datetimeOffset and datetimeOffsetOrNone when reading columns
1 parent 985f38c commit 8d5412f

File tree

11 files changed

+59
-57
lines changed

11 files changed

+59
-57
lines changed

RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 3.17.0 - 2020-09-15
2+
* Support for datetimeOffset and datetimeOffsetOrNone when reading columns of type timestamptz
3+
14
### 3.16.0 - 2020-09-15
25
* Analyze top level do expressions
36

src/FParsec/AssemblyInfo.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ open System.Reflection
44

55
[<assembly: AssemblyTitleAttribute("FParsec")>]
66
[<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
7-
[<assembly: AssemblyVersionAttribute("3.16.0")>]
7+
[<assembly: AssemblyVersionAttribute("3.17.0")>]
88
[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
9-
[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
1111
[<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
12-
[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
12+
[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
1313
do ()
1414

1515
module internal AssemblyVersionInformation =
1616
let [<Literal>] AssemblyTitle = "FParsec"
1717
let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
18-
let [<Literal>] AssemblyVersion = "3.16.0"
18+
let [<Literal>] AssemblyVersion = "3.17.0"
1919
let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
20-
let [<Literal>] AssemblyFileVersion = "3.16.0"
21-
let [<Literal>] AssemblyInformationalVersion = "3.16.0"
20+
let [<Literal>] AssemblyFileVersion = "3.17.0"
21+
let [<Literal>] AssemblyInformationalVersion = "3.17.0"
2222
let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
23-
let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
23+
let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"

src/FParsecCS/Cloning.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// Copyright (c) Stephan Tolksdorf 2010-2011
22
// License: Simplified BSD License. See accompanying documentation.
33

4-
using System.Reflection;
5-
using System.Reflection.Emit;
6-
74
#if !LOW_TRUST
85

96
using System;

src/NpgsqlFSharpAnalyzer.Core/AssemblyInfo.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ open System.Reflection
44

55
[<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Core")>]
66
[<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
7-
[<assembly: AssemblyVersionAttribute("3.16.0")>]
7+
[<assembly: AssemblyVersionAttribute("3.17.0")>]
88
[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
9-
[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
1111
[<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
12-
[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
12+
[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
1313
do ()
1414

1515
module internal AssemblyVersionInformation =
1616
let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Core"
1717
let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
18-
let [<Literal>] AssemblyVersion = "3.16.0"
18+
let [<Literal>] AssemblyVersion = "3.17.0"
1919
let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
20-
let [<Literal>] AssemblyFileVersion = "3.16.0"
21-
let [<Literal>] AssemblyInformationalVersion = "3.16.0"
20+
let [<Literal>] AssemblyFileVersion = "3.17.0"
21+
let [<Literal>] AssemblyInformationalVersion = "3.17.0"
2222
let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
23-
let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
23+
let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"

src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -875,15 +875,15 @@ module SqlAnalysis =
875875
else ()
876876

877877
| ("timestamptz"|"timestamp with time zone") ->
878-
if column.Nullable && notUsing "timestamptzOrNone" && notUsing "dateTimeOrNone"
879-
then yield typeMismatch [ replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
878+
if column.Nullable && notUsing "timestamptzOrNone" && notUsing "dateTimeOrNone" && notUsing "datetimeOffsetOrNone"
879+
then yield typeMismatch [ replace "datetimeOffsetOrNone"; replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
880880
//else if not column.Nullable && (using "timestamptzOrNone" || using "dateTimeOrNone")
881881
//then yield typeMismatch [ replace "dateTime"; replace "timestamptz" ]
882-
else if notUsing "timestamptzOrNone" && notUsing "timestamptz" && notUsing "dateTimeOrNone" && notUsing "dateTime"
882+
else if notUsing "timestamptzOrNone" && notUsing "timestamptz" && notUsing "dateTimeOrNone" && notUsing "dateTime" && notUsing "datetimeOffsetOrNone" && notUsing "datetimeOffset"
883883
then
884884
if column.Nullable
885-
then yield typeMismatch [ replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
886-
else yield typeMismatch [ replace "dateTime"; replace "timestamptz" ]
885+
then yield typeMismatch [ replace "datetimeOffsetOrNone"; replace "dateTimeOrNone"; replace "timestamptzOrNone" ]
886+
else yield typeMismatch [ replace "datetimeOffset"; replace "dateTime"; replace "timestamptz" ]
887887
else ()
888888

889889
| "bytea" ->

src/NpgsqlFSharpAnalyzer.Core/SyntacticAnalysis.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ module SyntacticAnalysis =
305305
".dateOrNone"
306306
".dateTime"
307307
".dateTimeOrNone"
308+
".datetimeOffset"
309+
".datetimeOffsetOrNone"
308310
".intArray"
309311
".intArrayOrNone"
310312
".stringArray"

src/NpgsqlFSharpAnalyzer/AssemblyInfo.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ open System.Reflection
44

55
[<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer")>]
66
[<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
7-
[<assembly: AssemblyVersionAttribute("3.16.0")>]
7+
[<assembly: AssemblyVersionAttribute("3.17.0")>]
88
[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
9-
[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
1111
[<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
12-
[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
12+
[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
1313
do ()
1414

1515
module internal AssemblyVersionInformation =
1616
let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer"
1717
let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
18-
let [<Literal>] AssemblyVersion = "3.16.0"
18+
let [<Literal>] AssemblyVersion = "3.17.0"
1919
let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
20-
let [<Literal>] AssemblyFileVersion = "3.16.0"
21-
let [<Literal>] AssemblyInformationalVersion = "3.16.0"
20+
let [<Literal>] AssemblyFileVersion = "3.17.0"
21+
let [<Literal>] AssemblyInformationalVersion = "3.17.0"
2222
let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
23-
let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
23+
let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"

src/NpgsqlFSharpParser/AssemblyInfo.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ open System.Reflection
44

55
[<assembly: AssemblyTitleAttribute("NpgsqlFSharpParser")>]
66
[<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
7-
[<assembly: AssemblyVersionAttribute("3.16.0")>]
7+
[<assembly: AssemblyVersionAttribute("3.17.0")>]
88
[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
9-
[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
1111
[<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
12-
[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
12+
[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
1313
do ()
1414

1515
module internal AssemblyVersionInformation =
1616
let [<Literal>] AssemblyTitle = "NpgsqlFSharpParser"
1717
let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
18-
let [<Literal>] AssemblyVersion = "3.16.0"
18+
let [<Literal>] AssemblyVersion = "3.17.0"
1919
let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
20-
let [<Literal>] AssemblyFileVersion = "3.16.0"
21-
let [<Literal>] AssemblyInformationalVersion = "3.16.0"
20+
let [<Literal>] AssemblyFileVersion = "3.17.0"
21+
let [<Literal>] AssemblyInformationalVersion = "3.17.0"
2222
let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
23-
let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
23+
let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"

src/NpgsqlFSharpVs/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
44
xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
55
<Metadata>
6-
<Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.16.0" Language="en-US" Publisher="Zaid Ajaj" />
6+
<Identity Id="FSharpLintVs.ef00bfc3-a899-45fc-aae8-afecf8673aaf" Version="3.17.0" Language="en-US" Publisher="Zaid Ajaj" />
77
<DisplayName>NpgsqlFSharpVs</DisplayName>
88
<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>
99
<MoreInfo>https://github.com/Zaid-Ajaj/Npgsql.FSharp.Analyzer</MoreInfo>

tests/NpgsqlFSharpAnalyzer.Tests/AssemblyInfo.fs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ open System.Reflection
44

55
[<assembly: AssemblyTitleAttribute("NpgsqlFSharpAnalyzer.Tests")>]
66
[<assembly: AssemblyProductAttribute("NpgsqlFSharpAnalyzer")>]
7-
[<assembly: AssemblyVersionAttribute("3.16.0")>]
7+
[<assembly: AssemblyVersionAttribute("3.17.0")>]
88
[<assembly: AssemblyMetadataAttribute("ReleaseDate","2020-09-15T00:00:00.0000000")>]
9-
[<assembly: AssemblyFileVersionAttribute("3.16.0")>]
10-
[<assembly: AssemblyInformationalVersionAttribute("3.16.0")>]
9+
[<assembly: AssemblyFileVersionAttribute("3.17.0")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("3.17.0")>]
1111
[<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
12-
[<assembly: AssemblyMetadataAttribute("GitHash","9ada11966d9a0a63829dd0976addedf8d6224a15")>]
12+
[<assembly: AssemblyMetadataAttribute("GitHash","985f38c696391f5c8f38f4498e3a59db66ffe3c6")>]
1313
do ()
1414

1515
module internal AssemblyVersionInformation =
1616
let [<Literal>] AssemblyTitle = "NpgsqlFSharpAnalyzer.Tests"
1717
let [<Literal>] AssemblyProduct = "NpgsqlFSharpAnalyzer"
18-
let [<Literal>] AssemblyVersion = "3.16.0"
18+
let [<Literal>] AssemblyVersion = "3.17.0"
1919
let [<Literal>] AssemblyMetadata_ReleaseDate = "2020-09-15T00:00:00.0000000"
20-
let [<Literal>] AssemblyFileVersion = "3.16.0"
21-
let [<Literal>] AssemblyInformationalVersion = "3.16.0"
20+
let [<Literal>] AssemblyFileVersion = "3.17.0"
21+
let [<Literal>] AssemblyInformationalVersion = "3.17.0"
2222
let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
23-
let [<Literal>] AssemblyMetadata_GitHash = "9ada11966d9a0a63829dd0976addedf8d6224a15"
23+
let [<Literal>] AssemblyMetadata_GitHash = "985f38c696391f5c8f38f4498e3a59db66ffe3c6"

0 commit comments

Comments
 (0)