From abd856743a8d6002f1ade153132a2054a6206896 Mon Sep 17 00:00:00 2001 From: Sasha Melentyev Date: Tue, 15 Aug 2023 21:43:02 +0300 Subject: [PATCH] feat: update go and add new time consts (#91) feat: update go and add new time consts Signed-off-by: Sasha Melentyev --- .github/workflows/ci.yaml | 2 +- go.mod | 8 ++++---- go.sum | 14 +++++++------- pkg/analyzer/internal/mapping/mapping.go | 3 +++ pkg/analyzer/testdata/src/a/time/layout.go | 9 +++++++++ 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1a030aa..989ccb1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: branches: [ main ] env: - GO_VERSION: 1.20.1 + GO_VERSION: 1.20.6 jobs: run: diff --git a/go.mod b/go.mod index 7bdb45e..ff8b067 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/sashamelentyev/usestdlibvars -go 1.19 +go 1.20 -require golang.org/x/tools v0.6.0 +require golang.org/x/tools v0.12.0 require ( - golang.org/x/mod v0.8.0 // indirect - golang.org/x/sys v0.5.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.11.0 // indirect ) diff --git a/go.sum b/go.sum index 44d387e..14a6610 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= diff --git a/pkg/analyzer/internal/mapping/mapping.go b/pkg/analyzer/internal/mapping/mapping.go index b081ede..5bad23d 100644 --- a/pkg/analyzer/internal/mapping/mapping.go +++ b/pkg/analyzer/internal/mapping/mapping.go @@ -161,6 +161,9 @@ var TimeLayout = map[string]string{ time.StampMilli: "time.StampMilli", time.StampMicro: "time.StampMicro", time.StampNano: "time.StampNano", + time.DateTime: "time.DateTime", + time.DateOnly: "time.DateOnly", + time.TimeOnly: "time.TimeOnly", } var SQLIsolationLevel = map[string]string{ diff --git a/pkg/analyzer/testdata/src/a/time/layout.go b/pkg/analyzer/testdata/src/a/time/layout.go index aea9daf..e445862 100644 --- a/pkg/analyzer/testdata/src/a/time/layout.go +++ b/pkg/analyzer/testdata/src/a/time/layout.go @@ -6,6 +6,9 @@ var ( _ = "01/02 03:04:05PM '06 -0700" // want `"01/02 03:04:05PM '06 -0700" can be replaced by time\.Layout` _ = "02 Jan 06 15:04 -0700" // want `"02 Jan 06 15:04 -0700" can be replaced by time\.RFC822Z` _ = "02 Jan 06 15:04 MST" // want `"02 Jan 06 15:04 MST" can be replaced by time\.RFC822` + _ = "15:04:05" // want `"15:04:05" can be replaced by time\.TimeOnly` + _ = "2006-01-02" // want `"2006-01-02" can be replaced by time\.DateOnly` + _ = "2006-01-02 15:04:05" // want `"2006-01-02 15:04:05" can be replaced by time\.DateTime` _ = "2006-01-02T15:04:05.999999999Z07:00" // want `"2006-01-02T15:04:05\.999999999Z07:00" can be replaced by time\.RFC3339Nano` _ = "2006-01-02T15:04:05Z07:00" // want `"2006-01-02T15:04:05Z07:00" can be replaced by time\.RFC3339` _ = "3:04PM" // want `"3:04PM" can be replaced by time\.Kitchen` @@ -25,6 +28,9 @@ const ( _ = "01/02 03:04:05PM '06 -0700" // want `"01/02 03:04:05PM '06 -0700" can be replaced by time\.Layout` _ = "02 Jan 06 15:04 -0700" // want `"02 Jan 06 15:04 -0700" can be replaced by time\.RFC822Z` _ = "02 Jan 06 15:04 MST" // want `"02 Jan 06 15:04 MST" can be replaced by time\.RFC822` + _ = "15:04:05" // want `"15:04:05" can be replaced by time\.TimeOnly` + _ = "2006-01-02" // want `"2006-01-02" can be replaced by time\.DateOnly` + _ = "2006-01-02 15:04:05" // want `"2006-01-02 15:04:05" can be replaced by time\.DateTime` _ = "2006-01-02T15:04:05.999999999Z07:00" // want `"2006-01-02T15:04:05\.999999999Z07:00" can be replaced by time\.RFC3339Nano` _ = "2006-01-02T15:04:05Z07:00" // want `"2006-01-02T15:04:05Z07:00" can be replaced by time\.RFC3339` _ = "3:04PM" // want `"3:04PM" can be replaced by time\.Kitchen` @@ -44,6 +50,9 @@ var ( _ = func(s string) string { return s }("01/02 03:04:05PM '06 -0700") // want `"01/02 03:04:05PM '06 -0700" can be replaced by time\.Layout` _ = func(s string) string { return s }("02 Jan 06 15:04 -0700") // want `"02 Jan 06 15:04 -0700" can be replaced by time\.RFC822Z` _ = func(s string) string { return s }("02 Jan 06 15:04 MST") // want `"02 Jan 06 15:04 MST" can be replaced by time\.RFC822` + _ = func(s string) string { return s }("15:04:05") // want `"15:04:05" can be replaced by time\.TimeOnly` + _ = func(s string) string { return s }("2006-01-02") // want `"2006-01-02" can be replaced by time\.DateOnly` + _ = func(s string) string { return s }("2006-01-02 15:04:05") // want `"2006-01-02 15:04:05" can be replaced by time\.DateTime` _ = func(s string) string { return s }("2006-01-02T15:04:05.999999999Z07:00") // want `"2006-01-02T15:04:05\.999999999Z07:00" can be replaced by time\.RFC3339Nano` _ = func(s string) string { return s }("2006-01-02T15:04:05Z07:00") // want `"2006-01-02T15:04:05Z07:00" can be replaced by time\.RFC3339` _ = func(s string) string { return s }("3:04PM") // want `"3:04PM" can be replaced by time\.Kitchen`