Skip to content

Commit 1138826

Browse files
kyleconroykyleconroy
authored
build: Upgrade to github.com/sqlc-dev/[email protected]
* build: Upgrade to github.com/sqlc-dev/[email protected] * go mod tidy
1 parent c82d80b commit 1138826

File tree

9 files changed

+47
-33
lines changed

9 files changed

+47
-33
lines changed

‎go.mod

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@ module github.com/sqlc-dev/sqlc-gen-kotlin
33
go 1.19
44

55
require (
6-
buf.build/gen/go/sqlc/sqlc/protocolbuffers/go v1.31.0-20231002190240-3f2d312ab6fd.1
76
github.com/jinzhu/inflection v1.0.0
8-
github.com/sqlc-dev/sqlc-go v1.22.0
7+
github.com/sqlc-dev/plugin-sdk-go v1.23.0
98
)
109

11-
require google.golang.org/protobuf v1.31.0 // indirect
10+
require (
11+
github.com/golang/protobuf v1.5.3 // indirect
12+
golang.org/x/net v0.14.0 // indirect
13+
golang.org/x/sys v0.11.0 // indirect
14+
golang.org/x/text v0.12.0 // indirect
15+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
16+
google.golang.org/grpc v1.59.0 // indirect
17+
google.golang.org/protobuf v1.31.0 // indirect
18+
)

‎go.sum

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
buf.build/gen/go/sqlc/sqlc/protocolbuffers/go v1.31.0-20231002190240-3f2d312ab6fd.1 h1:94JzirpGhebc3++MqmvWY0fi9TJxlle5M52NO4pTEZY=
2-
buf.build/gen/go/sqlc/sqlc/protocolbuffers/go v1.31.0-20231002190240-3f2d312ab6fd.1/go.mod h1:x7kMRcmAiYQXko+NDqLP2agondNlbHKUNGPXqU1nrOU=
31
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
2+
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
3+
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
44
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
55
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
66
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
77
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
8-
github.com/sqlc-dev/sqlc-go v1.22.0 h1:ivUplxHRkw1WZ++rs80OfoJLYbpXMXYGtc79e7z/0HA=
9-
github.com/sqlc-dev/sqlc-go v1.22.0/go.mod h1:/4snw3ucbglJfyLRxp8X2weM4pwT8w1NlEKm4PzxAuQ=
8+
github.com/sqlc-dev/plugin-sdk-go v1.23.0 h1:iSeJhnXPlbDXlbzUEebw/DxsGzE9rdDJArl8Hvt0RMM=
9+
github.com/sqlc-dev/plugin-sdk-go v1.23.0/go.mod h1:I1r4THOfyETD+LI2gogN2LX8wCjwUZrgy/NU4In3llA=
10+
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
11+
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
12+
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
13+
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
14+
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
15+
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
1016
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
17+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
18+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
19+
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
20+
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
1121
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
22+
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1223
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
1324
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

‎internal/core/gen.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strconv"
1010
"strings"
1111

12-
"buf.build/gen/go/sqlc/sqlc/protocolbuffers/go/protos/plugin"
13-
"github.com/sqlc-dev/sqlc-go/metadata"
14-
"github.com/sqlc-dev/sqlc-go/sdk"
12+
"github.com/sqlc-dev/plugin-sdk-go/metadata"
13+
"github.com/sqlc-dev/plugin-sdk-go/plugin"
14+
"github.com/sqlc-dev/plugin-sdk-go/sdk"
1515

1616
"github.com/sqlc-dev/sqlc-gen-kotlin/internal/inflection"
1717
)
@@ -230,7 +230,7 @@ func ktEnumValueName(value string) string {
230230
return strings.ToUpper(id)
231231
}
232232

233-
func BuildEnums(req *plugin.CodeGenRequest) []Enum {
233+
func BuildEnums(req *plugin.GenerateRequest) []Enum {
234234
var enums []Enum
235235
for _, schema := range req.Catalog.Schemas {
236236
if schema.Name == "pg_catalog" || schema.Name == "information_schema" {
@@ -264,9 +264,6 @@ func BuildEnums(req *plugin.CodeGenRequest) []Enum {
264264
}
265265

266266
func dataClassName(name string, settings *plugin.Settings) string {
267-
if rename := settings.Rename[name]; rename != "" {
268-
return rename
269-
}
270267
out := ""
271268
for _, p := range strings.Split(name, "_") {
272269
out += strings.Title(p)
@@ -278,7 +275,7 @@ func memberName(name string, settings *plugin.Settings) string {
278275
return sdk.LowerTitle(dataClassName(name, settings))
279276
}
280277

281-
func BuildDataClasses(conf Config, req *plugin.CodeGenRequest) []Struct {
278+
func BuildDataClasses(conf Config, req *plugin.GenerateRequest) []Struct {
282279
var structs []Struct
283280
for _, schema := range req.Catalog.Schemas {
284281
if schema.Name == "pg_catalog" || schema.Name == "information_schema" {
@@ -367,7 +364,7 @@ func (t ktType) IsUUID() bool {
367364
return t.Name == "UUID"
368365
}
369366

370-
func makeType(req *plugin.CodeGenRequest, col *plugin.Column) ktType {
367+
func makeType(req *plugin.GenerateRequest, col *plugin.Column) ktType {
371368
typ, isEnum := ktInnerType(req, col)
372369
return ktType{
373370
Name: typ,
@@ -379,7 +376,7 @@ func makeType(req *plugin.CodeGenRequest, col *plugin.Column) ktType {
379376
}
380377
}
381378

382-
func ktInnerType(req *plugin.CodeGenRequest, col *plugin.Column) (string, bool) {
379+
func ktInnerType(req *plugin.GenerateRequest, col *plugin.Column) (string, bool) {
383380
// TODO: Extend the engine interface to handle types
384381
switch req.Settings.Engine {
385382
case "mysql":
@@ -396,7 +393,7 @@ type goColumn struct {
396393
*plugin.Column
397394
}
398395

399-
func ktColumnsToStruct(req *plugin.CodeGenRequest, name string, columns []goColumn, namer func(*plugin.Column, int) string) *Struct {
396+
func ktColumnsToStruct(req *plugin.GenerateRequest, name string, columns []goColumn, namer func(*plugin.Column, int) string) *Struct {
400397
gs := Struct{
401398
Name: name,
402399
}
@@ -480,7 +477,7 @@ func parseInts(s []string) ([]int, error) {
480477
return refs, nil
481478
}
482479

483-
func BuildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error) {
480+
func BuildQueries(req *plugin.GenerateRequest, structs []Struct) ([]Query, error) {
484481
qs := make([]Query, 0, len(req.Queries))
485482
for _, query := range req.Queries {
486483
if query.Name == "" {

‎internal/core/imports.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sort"
55
"strings"
66

7-
"buf.build/gen/go/sqlc/sqlc/protocolbuffers/go/protos/plugin"
7+
"github.com/sqlc-dev/plugin-sdk-go/plugin"
88
)
99

1010
type Importer struct {

‎internal/core/maps.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package core
22

33
import (
4-
"github.com/sqlc-dev/sqlc-go/sdk"
4+
"github.com/sqlc-dev/plugin-sdk-go/sdk"
55
)
66

77
func DoubleSlashComment(f string) string {

‎internal/core/mysql_type.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package core
22

33
import (
4-
"buf.build/gen/go/sqlc/sqlc/protocolbuffers/go/protos/plugin"
5-
"github.com/sqlc-dev/sqlc-go/sdk"
4+
"github.com/sqlc-dev/plugin-sdk-go/plugin"
5+
"github.com/sqlc-dev/plugin-sdk-go/sdk"
66
)
77

8-
func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) (string, bool) {
8+
func mysqlType(req *plugin.GenerateRequest, col *plugin.Column) (string, bool) {
99
columnType := sdk.DataType(col.Type)
1010

1111
switch columnType {

‎internal/core/postgresql_type.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package core
33
import (
44
"log"
55

6-
"buf.build/gen/go/sqlc/sqlc/protocolbuffers/go/protos/plugin"
7-
"github.com/sqlc-dev/sqlc-go/sdk"
6+
"github.com/sqlc-dev/plugin-sdk-go/plugin"
7+
"github.com/sqlc-dev/plugin-sdk-go/sdk"
88
)
99

10-
func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) (string, bool) {
10+
func postgresType(req *plugin.GenerateRequest, col *plugin.Column) (string, bool) {
1111
columnType := sdk.DataType(col.Type)
1212

1313
switch columnType {

‎internal/gen.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import (
99
"strings"
1010
"text/template"
1111

12-
"buf.build/gen/go/sqlc/sqlc/protocolbuffers/go/protos/plugin"
13-
12+
"github.com/sqlc-dev/plugin-sdk-go/plugin"
13+
"github.com/sqlc-dev/plugin-sdk-go/sdk"
1414
"github.com/sqlc-dev/sqlc-gen-kotlin/internal/core"
15-
"github.com/sqlc-dev/sqlc-go/sdk"
1615
)
1716

1817
//go:embed tmpl/ktmodels.tmpl
@@ -28,7 +27,7 @@ func Offset(v int) int {
2827
return v + 1
2928
}
3029

31-
func Generate(ctx context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {
30+
func Generate(ctx context.Context, req *plugin.GenerateRequest) (*plugin.GenerateResponse, error) {
3231
var conf core.Config
3332
if len(req.PluginOptions) > 0 {
3433
if err := json.Unmarshal(req.PluginOptions, &conf); err != nil {
@@ -101,7 +100,7 @@ func Generate(ctx context.Context, req *plugin.CodeGenRequest) (*plugin.CodeGenR
101100
return nil, err
102101
}
103102

104-
resp := plugin.CodeGenResponse{}
103+
resp := plugin.GenerateResponse{}
105104

106105
for filename, code := range output {
107106
resp.Files = append(resp.Files, &plugin.File{

‎plugin/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/sqlc-dev/sqlc-go/codegen"
4+
"github.com/sqlc-dev/plugin-sdk-go/codegen"
55

66
kotlin "github.com/sqlc-dev/sqlc-gen-kotlin/internal"
77
)

0 commit comments

Comments
 (0)