Skip to content

Commit 031cd20

Browse files
kyleconroykyleconroy
authored
feat: Add sqlc version to generated Go code (#1513)
1 parent 99a069a commit 031cd20

File tree

1,286 files changed

+2590
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,286 files changed

+2590
-7
lines changed

‎examples/authors/mysql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/authors/mysql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/authors/mysql/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/authors/postgresql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/authors/postgresql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/authors/postgresql/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/batch/postgresql/batch.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/batch/postgresql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/batch/postgresql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/batch/postgresql/querier.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/batch/postgresql/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/booktest/mysql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/booktest/mysql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/booktest/mysql/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/booktest/postgresql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/booktest/postgresql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/booktest/postgresql/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/jets/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/jets/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/jets/query-building.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/mysql/city.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/mysql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/mysql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/mysql/querier.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/mysql/venue.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/postgresql/city.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/postgresql/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/postgresql/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/postgresql/querier.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/postgresql/venue.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/codegen/golang/gen.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ import (
1010
"text/template"
1111

1212
"github.com/kyleconroy/sqlc/internal/codegen/sdk"
13+
"github.com/kyleconroy/sqlc/internal/info"
1314
"github.com/kyleconroy/sqlc/internal/metadata"
1415
"github.com/kyleconroy/sqlc/internal/plugin"
1516
)
1617

1718
type tmplCtx struct {
18-
Q string
19-
Package string
20-
SQLPackage SQLPackage
21-
Enums []Enum
22-
Structs []Struct
23-
GoQueries []Query
19+
Q string
20+
Package string
21+
SQLPackage SQLPackage
22+
Enums []Enum
23+
Structs []Struct
24+
GoQueries []Query
25+
SqlcVersion string
2426

2527
// TODO: Race conditions
2628
SourceName string
@@ -91,6 +93,7 @@ func generate(req *plugin.CodeGenRequest, enums []Enum, structs []Struct, querie
9193
GoQueries: queries,
9294
Enums: enums,
9395
Structs: structs,
96+
SqlcVersion: info.Version,
9497
}
9598

9699
if tctx.UsesCopyFrom && tctx.SQLPackage != SQLPackagePGX {

‎internal/codegen/golang/templates/template.tmpl

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{{define "dbFile"}}// Code generated by sqlc. DO NOT EDIT.
2+
// versions:
3+
// sqlc {{.SqlcVersion}}
24

35
package {{.Package}}
46

@@ -23,6 +25,8 @@ import (
2325
{{end}}
2426

2527
{{define "interfaceFile"}}// Code generated by sqlc. DO NOT EDIT.
28+
// versions:
29+
// sqlc {{.SqlcVersion}}
2630

2731
package {{.Package}}
2832

@@ -45,6 +49,8 @@ import (
4549
{{end}}
4650

4751
{{define "modelsFile"}}// Code generated by sqlc. DO NOT EDIT.
52+
// versions:
53+
// sqlc {{.SqlcVersion}}
4854

4955
package {{.Package}}
5056

@@ -95,6 +101,8 @@ type {{.Name}} struct { {{- range .Fields}}
95101
{{end}}
96102

97103
{{define "queryFile"}}// Code generated by sqlc. DO NOT EDIT.
104+
// versions:
105+
// sqlc {{.SqlcVersion}}
98106
// source: {{.SourceName}}
99107

100108
package {{.Package}}
@@ -118,6 +126,8 @@ import (
118126
{{end}}
119127

120128
{{define "copyfromFile"}}// Code generated by sqlc. DO NOT EDIT.
129+
// versions:
130+
// sqlc {{.SqlcVersion}}
121131
// source: {{.SourceName}}
122132

123133
package {{.Package}}
@@ -139,6 +149,8 @@ import (
139149
{{end}}
140150

141151
{{define "batchFile"}}// Code generated by sqlc. DO NOT EDIT.
152+
// versions:
153+
// sqlc {{.SqlcVersion}}
142154
// source: {{.SourceName}}
143155
package {{.Package}}
144156

@@ -155,4 +167,4 @@ import (
155167
{{if eq .SQLPackage "pgx/v4"}}
156168
{{- template "batchCodePgx" .}}
157169
{{end}}
158-
{{end}}
170+
{{end}}

‎internal/endtoend/testdata/alias/mysql/go/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/mysql/go/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/mysql/go/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/postgresql/pgx/go/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/postgresql/pgx/go/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/postgresql/pgx/go/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/postgresql/stdlib/go/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/postgresql/stdlib/go/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/alias/postgresql/stdlib/go/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/any/pgx/go/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/any/pgx/go/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/any/pgx/go/query.sql.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/any/stdlib/go/db.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)