Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add sqlc version to generated Kotlin code #1512

Merged
merged 2 commits into from
Mar 28, 2022
Merged

feat: Add sqlc version to generated Kotlin code #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa973e
feat: Add sqlc version to generated Kotlin code
kyleconroy Mar 28, 2022
4af1edd
Add version to all files
kyleconroy Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/authors/mysql/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.authors.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/authors/mysql/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.authors.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.authors.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/authors/postgresql/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.authors.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/authors/postgresql/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.authors.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.authors.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/booktest/mysql/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.booktest.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/booktest/mysql/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.booktest.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.booktest.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/booktest/postgresql/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.booktest.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/booktest/postgresql/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.booktest.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.booktest.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/jets/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.jets

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/jets/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.jets

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/jets/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.jets

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/ondeck/mysql/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.ondeck.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/ondeck/mysql/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.ondeck.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.ondeck.mysql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/ondeck/postgresql/Models.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.ondeck.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/ondeck/postgresql/Queries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.ondeck.postgresql

Expand Down
2 changes: 2 additions & 0 deletions examples/kotlin/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.12.0

package com.example.ondeck.postgresql

Expand Down
9 changes: 9 additions & 0 deletions internal/codegen/kotlin/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/kyleconroy/sqlc/internal/codegen/sdk"
"github.com/kyleconroy/sqlc/internal/inflection"
"github.com/kyleconroy/sqlc/internal/info"
"github.com/kyleconroy/sqlc/internal/metadata"
"github.com/kyleconroy/sqlc/internal/plugin"
)
Expand Down Expand Up @@ -533,6 +534,8 @@ func buildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error)
}

var ktIfaceTmpl = `// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc {{.SqlcVersion}}

package {{.Package}}

Expand Down Expand Up @@ -564,6 +567,8 @@ interface Queries {
`

var ktModelsTmpl = `// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc {{.SqlcVersion}}

package {{.Package}}

Expand Down Expand Up @@ -601,6 +606,8 @@ data class {{.Name}} ( {{- range $i, $e := .Fields}}
`

var ktSqlTmpl = `// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc {{.SqlcVersion}}

package {{.Package}}

Expand Down Expand Up @@ -723,6 +730,7 @@ type ktTmplCtx struct {
DataClasses []Struct
Queries []Query
Settings *plugin.Settings
SqlcVersion string

// TODO: Race conditions
SourceName string
Expand Down Expand Up @@ -785,6 +793,7 @@ func Generate(req *plugin.CodeGenRequest) (*plugin.CodeGenResponse, error) {
Queries: queries,
Enums: enums,
DataClasses: structs,
SqlcVersion: info.Version,
}

output := map[string]string{}
Expand Down