Skip to content

Commit e30cde1

Browse files
committed
gen: Allow table names to be renamed
1 parent 55bf48b commit e30cde1

File tree

7 files changed

+89
-4
lines changed

7 files changed

+89
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ sqlc-dev:
88
go build -o ~/bin/sqlc-dev --tags=exp ./cmd/sqlc/
99

1010
regen:
11-
cd internal/endtoend && ./regenerate.sh
11+
./scripts/regenerate.sh

internal/dinosql/gen.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ import (
1414

1515
"github.com/kyleconroy/sqlc/internal/catalog"
1616
"github.com/kyleconroy/sqlc/internal/config"
17+
"github.com/kyleconroy/sqlc/internal/inflection"
1718
core "github.com/kyleconroy/sqlc/internal/pg"
18-
19-
"github.com/jinzhu/inflection"
2019
)
2120

2221
var identPattern = regexp.MustCompile("[^a-zA-Z0-9_]+")
@@ -598,7 +597,7 @@ func (r Result) Structs(settings config.CombinedSettings) []GoStruct {
598597
}
599598
s := GoStruct{
600599
Table: core.FQN{Schema: name, Rel: table.Name},
601-
Name: inflection.Singular(StructName(tableName, settings)),
600+
Name: StructName(inflection.Singular(tableName), settings),
602601
Comment: table.Comment,
603602
}
604603
for _, column := range table.Columns {

internal/endtoend/testdata/inflection/go/db.go

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

internal/endtoend/testdata/inflection/go/models.go

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

internal/endtoend/testdata/inflection/go/query.sql.go

Lines changed: 35 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CREATE TABLE campus (id serial not null);
2+
3+
-- name: ListCampus :many
4+
SELECT * FROM campus;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"version": "1",
3+
"packages": [{
4+
"path": "go",
5+
"name": "querytest",
6+
"schema": "query.sql",
7+
"queries": "query.sql"
8+
}]
9+
}

0 commit comments

Comments
 (0)