Skip to content

Commit e8d5428

Browse files
walterwanderleywalterwanderley
committed
update dependencies
1 parent a7d7a47 commit e8d5428

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ version: '2'
99
plugins:
1010
- name: go-server
1111
wasm:
12-
url: https://github.com/walterwanderley/sqlc-gen-go-server/releases/download/v0.0.9/sqlc-gen-go-server.wasm
13-
sha256: "788b0e5d63719c993df1aeb920c2cd2edc37114021223b14375abdc360ed6f43"
12+
url: https://github.com/walterwanderley/sqlc-gen-go-server/releases/download/v0.1.0/sqlc-gen-go-server.wasm
13+
sha256: "bdd6fd13a062f9319c4ab13cbdc359c0275b531b8698be51ff843904bf919a5c"
1414
sql:
1515
- schema: schema.sql
1616
queries: query.sql
@@ -123,8 +123,8 @@ version: 2
123123
plugins:
124124
- name: go-server
125125
wasm:
126-
url: https://github.com/walterwanderley/sqlc-gen-go-server/releases/download/v0.0.9/sqlc-gen-go-server.wasm
127-
sha256: "788b0e5d63719c993df1aeb920c2cd2edc37114021223b14375abdc360ed6f43"
126+
url: https://github.com/walterwanderley/sqlc-gen-go-server/releases/download/v0.1.0/sqlc-gen-go-server.wasm
127+
sha256: "bdd6fd13a062f9319c4ab13cbdc359c0275b531b8698be51ff843904bf919a5c"
128128
sql:
129129
- schema: "query.sql"
130130
queries: "query.sql"

‎go.mod‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ require (
99
github.com/google/go-cmp v0.6.0
1010
github.com/jinzhu/inflection v1.0.0
1111
github.com/sqlc-dev/plugin-sdk-go v1.23.0
12-
github.com/walterwanderley/sqlc-connect v0.3.3
13-
github.com/walterwanderley/sqlc-grpc v0.19.4
14-
github.com/walterwanderley/sqlc-http v0.0.4
12+
github.com/walterwanderley/sqlc-connect v0.3.4
13+
github.com/walterwanderley/sqlc-grpc v0.19.5
14+
github.com/walterwanderley/sqlc-http v0.1.3
1515
)
1616

1717
require (
1818
github.com/emicklei/proto v1.13.2 // indirect
1919
github.com/gogo/protobuf v1.3.2 // indirect
2020
github.com/golang/protobuf v1.5.3 // indirect
21-
golang.org/x/mod v0.15.0 // indirect
22-
golang.org/x/net v0.20.0 // indirect
23-
golang.org/x/sys v0.16.0 // indirect
21+
golang.org/x/net v0.21.0 // indirect
22+
golang.org/x/sys v0.17.0 // indirect
2423
golang.org/x/text v0.14.0 // indirect
25-
golang.org/x/tools v0.17.0 // indirect
2624
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
2725
google.golang.org/grpc v1.60.1 // indirect
2826
google.golang.org/protobuf v1.32.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,33 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
1616
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
1717
github.com/sqlc-dev/plugin-sdk-go v1.23.0 h1:iSeJhnXPlbDXlbzUEebw/DxsGzE9rdDJArl8Hvt0RMM=
1818
github.com/sqlc-dev/plugin-sdk-go v1.23.0/go.mod h1:I1r4THOfyETD+LI2gogN2LX8wCjwUZrgy/NU4In3llA=
19-
github.com/walterwanderley/sqlc-connect v0.3.3 h1:5bELXGS1lUUUFNVDiW1LgC2g4x+lBV3Sj5a4wV/QBjE=
20-
github.com/walterwanderley/sqlc-connect v0.3.3/go.mod h1:vosmBJhzJv5ySuFzijWbp24+ddtD8JcAaelxeFzjorA=
21-
github.com/walterwanderley/sqlc-grpc v0.19.4 h1:UY4Q4SpMFGTAZ6PmWabnLEUa14rfYZja1bX31lXdLlI=
22-
github.com/walterwanderley/sqlc-grpc v0.19.4/go.mod h1:bfMjDJUNyUkk3+OM/we8OKDYPVodms+ekOgHvV2hXFY=
23-
github.com/walterwanderley/sqlc-http v0.0.3 h1:wK2VmDYblY39deO4tO5tRLAZf0A33cjxT4YK0KcWAbw=
24-
github.com/walterwanderley/sqlc-http v0.0.3/go.mod h1:VXP/qWJU+NPuD8+7C3zPwd88WNmAmDrKvaXkYZS+mQw=
25-
github.com/walterwanderley/sqlc-http v0.0.4 h1:921NfRBcb0+7HnfLgVsj6v95903lHIdGfhpg9SsWCGk=
26-
github.com/walterwanderley/sqlc-http v0.0.4/go.mod h1:VXP/qWJU+NPuD8+7C3zPwd88WNmAmDrKvaXkYZS+mQw=
19+
github.com/walterwanderley/sqlc-connect v0.3.4 h1:Fw8+kV1Omv0tWKjwR8E18m9b+ob872Nc2nqhsCK8om4=
20+
github.com/walterwanderley/sqlc-connect v0.3.4/go.mod h1:npw3YULt5cGELEm7CXJbl9kgFzRHS5HaSuxY55d8dKQ=
21+
github.com/walterwanderley/sqlc-grpc v0.19.5 h1:IfI29n+sW45IumnjA0NBUQp9RThXZ/fKy7v/UgMy4Wc=
22+
github.com/walterwanderley/sqlc-grpc v0.19.5/go.mod h1:nTnF5NTVCQtUNc/0ymSgJhhX/70Ithh8+/GaaKlmS+o=
23+
github.com/walterwanderley/sqlc-http v0.1.3 h1:wtHfKkfQM5eyVWvbxNfCWCzRuRIhVovW9d0AvpQMvJI=
24+
github.com/walterwanderley/sqlc-http v0.1.3/go.mod h1:YGYzkgmFvXTfcCmizxXPkOTTOCU4T+sLDGf2vv74StE=
2725
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2826
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2927
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3028
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
3129
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
3230
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
3331
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
34-
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
35-
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
3632
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
3733
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
3834
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
3935
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
40-
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
41-
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
36+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
37+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
4238
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4339
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4440
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4541
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
4642
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4743
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
48-
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
49-
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
44+
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
45+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5046
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5147
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
5248
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -55,8 +51,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
5551
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
5652
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
5753
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
58-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
59-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
6054
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6155
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6256
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/server.go‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ func toServerDefinition(req *plugin.GenerateRequest, options *opts.Options, enum
298298
out.WriteString(typ)
299299
}
300300
httpSpecs := make([]metadata.HttpSpec, 0)
301+
customSpecs := make(map[string][]string)
301302
for _, doc := range query.Comments {
302303
doc = strings.TrimSpace(doc)
303304
if strings.HasPrefix(doc, "http: ") {
@@ -315,16 +316,23 @@ func toServerDefinition(req *plugin.GenerateRequest, options *opts.Options, enum
315316
Method: httpMethod,
316317
Path: httpPath,
317318
})
319+
} else {
320+
k, v, ok := strings.Cut(doc, ":")
321+
if !ok {
322+
continue
323+
}
324+
customSpecs[k] = append(customSpecs[k], v)
318325
}
319326
}
320327
services = append(services, &metadata.Service{
321-
Name: query.MethodName,
322-
Sql: query.SQL,
323-
Messages: messages,
324-
Output: out.String(),
325-
InputNames: inputNames,
326-
InputTypes: inputTypes,
327-
HttpSpecs: httpSpecs,
328+
Name: query.MethodName,
329+
Sql: query.SQL,
330+
Messages: messages,
331+
Output: out.String(),
332+
InputNames: inputNames,
333+
InputTypes: inputTypes,
334+
HttpSpecs: httpSpecs,
335+
CustomSpecs: customSpecs,
328336
})
329337
}
330338
sort.SliceStable(services, func(i, j int) bool {

0 commit comments

Comments
 (0)