From b13c0dd2065897b4c471f413301b9e2d7bd20607 Mon Sep 17 00:00:00 2001 From: Kyle Gray Date: Thu, 2 Nov 2023 12:46:36 -0700 Subject: [PATCH] build: Upgrade to github.com/sqlc-dev/plugin-go-sdk@v1.23.0 (#33) --- go.mod | 2 +- go.sum | 4 ++-- internal/endtoend/testdata/emit_pydantic_models/sqlc.yaml | 2 +- internal/endtoend/testdata/exec_result/sqlc.yaml | 2 +- internal/endtoend/testdata/exec_rows/sqlc.yaml | 2 +- .../testdata/inflection_exclude_table_names/sqlc.yaml | 2 +- .../endtoend/testdata/query_parameter_limit_two/sqlc.yaml | 2 +- .../testdata/query_parameter_limit_undefined/sqlc.yaml | 2 +- .../endtoend/testdata/query_parameter_limit_zero/sqlc.yaml | 2 +- .../endtoend/testdata/query_parameter_no_limit/sqlc.yaml | 2 +- internal/gen.go | 6 +++--- internal/postgresql_type.go | 4 ++-- plugin/main.go | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index f36b1ee..4894ab0 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/google/go-cmp v0.6.0 github.com/jinzhu/inflection v1.0.0 - github.com/sqlc-dev/sqlc-go v1.22.1-0.20231102170509-ee94c710d92e + github.com/sqlc-dev/plugin-sdk-go v1.23.0 google.golang.org/protobuf v1.31.0 ) diff --git a/go.sum b/go.sum index 5a38b54..6339a96 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/sqlc-dev/sqlc-go v1.22.1-0.20231102170509-ee94c710d92e h1:fgvOWVSJLVvl1ETExPEw2okhTj2kbxvAQ5ECLrAtWbQ= -github.com/sqlc-dev/sqlc-go v1.22.1-0.20231102170509-ee94c710d92e/go.mod h1:SXs+GYtPBUfDJQWSOvcJesiAwj4HNfigK7EwzwpHNPk= +github.com/sqlc-dev/plugin-sdk-go v1.23.0 h1:iSeJhnXPlbDXlbzUEebw/DxsGzE9rdDJArl8Hvt0RMM= +github.com/sqlc-dev/plugin-sdk-go v1.23.0/go.mod h1:I1r4THOfyETD+LI2gogN2LX8wCjwUZrgy/NU4In3llA= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= diff --git a/internal/endtoend/testdata/emit_pydantic_models/sqlc.yaml b/internal/endtoend/testdata/emit_pydantic_models/sqlc.yaml index f3557b7..180ce29 100644 --- a/internal/endtoend/testdata/emit_pydantic_models/sqlc.yaml +++ b/internal/endtoend/testdata/emit_pydantic_models/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/exec_result/sqlc.yaml b/internal/endtoend/testdata/exec_result/sqlc.yaml index 107dd93..2adbd31 100644 --- a/internal/endtoend/testdata/exec_result/sqlc.yaml +++ b/internal/endtoend/testdata/exec_result/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/exec_rows/sqlc.yaml b/internal/endtoend/testdata/exec_rows/sqlc.yaml index 107dd93..2adbd31 100644 --- a/internal/endtoend/testdata/exec_rows/sqlc.yaml +++ b/internal/endtoend/testdata/exec_rows/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/inflection_exclude_table_names/sqlc.yaml b/internal/endtoend/testdata/inflection_exclude_table_names/sqlc.yaml index 45ff311..aba5400 100644 --- a/internal/endtoend/testdata/inflection_exclude_table_names/sqlc.yaml +++ b/internal/endtoend/testdata/inflection_exclude_table_names/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/query_parameter_limit_two/sqlc.yaml b/internal/endtoend/testdata/query_parameter_limit_two/sqlc.yaml index 3f4cfcc..e389988 100644 --- a/internal/endtoend/testdata/query_parameter_limit_two/sqlc.yaml +++ b/internal/endtoend/testdata/query_parameter_limit_two/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/query_parameter_limit_undefined/sqlc.yaml b/internal/endtoend/testdata/query_parameter_limit_undefined/sqlc.yaml index 95357f7..66d7a14 100644 --- a/internal/endtoend/testdata/query_parameter_limit_undefined/sqlc.yaml +++ b/internal/endtoend/testdata/query_parameter_limit_undefined/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/query_parameter_limit_zero/sqlc.yaml b/internal/endtoend/testdata/query_parameter_limit_zero/sqlc.yaml index dc6b25e..274f730 100644 --- a/internal/endtoend/testdata/query_parameter_limit_zero/sqlc.yaml +++ b/internal/endtoend/testdata/query_parameter_limit_zero/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/endtoend/testdata/query_parameter_no_limit/sqlc.yaml b/internal/endtoend/testdata/query_parameter_no_limit/sqlc.yaml index 76b5412..b563730 100644 --- a/internal/endtoend/testdata/query_parameter_no_limit/sqlc.yaml +++ b/internal/endtoend/testdata/query_parameter_no_limit/sqlc.yaml @@ -3,7 +3,7 @@ plugins: - name: py wasm: url: file://../../../../bin/sqlc-gen-python.wasm - sha256: "c8c759e80b7d66c728cf9d37674f8f5c9cc33774afa789dbceee0e3446773458" + sha256: "a6c5d174c407007c3717eea36ff0882744346e6ba991f92f71d6ab2895204c0e" sql: - schema: schema.sql queries: query.sql diff --git a/internal/gen.go b/internal/gen.go index 67dbe0b..f81c53b 100644 --- a/internal/gen.go +++ b/internal/gen.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - "github.com/sqlc-dev/sqlc-go/metadata" - "github.com/sqlc-dev/sqlc-go/plugin" - "github.com/sqlc-dev/sqlc-go/sdk" + "github.com/sqlc-dev/plugin-sdk-go/metadata" + "github.com/sqlc-dev/plugin-sdk-go/plugin" + "github.com/sqlc-dev/plugin-sdk-go/sdk" pyast "github.com/sqlc-dev/sqlc-gen-python/internal/ast" "github.com/sqlc-dev/sqlc-gen-python/internal/inflection" diff --git a/internal/postgresql_type.go b/internal/postgresql_type.go index 9af3324..3d0891b 100644 --- a/internal/postgresql_type.go +++ b/internal/postgresql_type.go @@ -3,8 +3,8 @@ package python import ( "log" - "github.com/sqlc-dev/sqlc-go/plugin" - "github.com/sqlc-dev/sqlc-go/sdk" + "github.com/sqlc-dev/plugin-sdk-go/plugin" + "github.com/sqlc-dev/plugin-sdk-go/sdk" ) func postgresType(req *plugin.GenerateRequest, col *plugin.Column) string { diff --git a/plugin/main.go b/plugin/main.go index b309fc9..9655347 100644 --- a/plugin/main.go +++ b/plugin/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/sqlc-dev/sqlc-go/codegen" + "github.com/sqlc-dev/plugin-sdk-go/codegen" python "github.com/sqlc-dev/sqlc-gen-python/internal" )