Skip to content

Commit

Permalink
fix incorrect generate model names for "bonuses" and "metadata"
Browse files Browse the repository at this point in the history
  • Loading branch information
qanghaa committed Aug 18, 2024
1 parent c582986 commit 43e2a7e
Show file tree
Hide file tree
Showing 23 changed files with 577 additions and 15 deletions.
72 changes: 61 additions & 11 deletions internal/endtoend/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,85 @@
module github.com/sqlc-dev/sqlc/endtoend

go 1.18
go 1.22

toolchain go1.22.3

require (
github.com/go-sql-driver/mysql v1.7.0
github.com/go-sql-driver/mysql v1.8.1
github.com/gofrs/uuid v4.0.0+incompatible
github.com/google/uuid v1.3.0
github.com/google/uuid v1.6.0
github.com/hexon/mysqltsv v0.1.0
github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853
github.com/jackc/pgtype v1.6.2
github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904
github.com/jackc/pgx/v5 v5.4.3
github.com/lib/pq v1.9.0
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgtype v1.14.0
github.com/jackc/pgx/v4 v4.18.3
github.com/jackc/pgx/v5 v5.6.0
github.com/lib/pq v1.10.9
github.com/sqlc-dev/pqtype v0.2.0
github.com/sqlc-dev/sqlc-testdata v1.0.0
github.com/volatiletech/null/v8 v8.1.2
gopkg.in/guregu/null.v4 v4.0.0
)

require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/cubicdaiya/gonp v1.0.4 // indirect
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/friendsofgo/errors v0.9.2 // indirect
github.com/google/cel-go v0.21.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.0.1 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/pganalyze/pg_query_go/v5 v5.1.0 // indirect
github.com/pgvector/pgvector-go v0.1.1 // indirect
github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63 // indirect
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
github.com/pingcap/log v1.1.0 // indirect
github.com/pingcap/tidb/pkg/parser v0.0.0-20231103154709-4f00ece106b1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/riza-io/grpc-go v0.2.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/sqlc-dev/sqlc v1.27.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/tetratelabs/wazero v1.7.3 // indirect
github.com/volatiletech/inflect v0.0.1 // indirect
github.com/volatiletech/randomize v0.0.1 // indirect
github.com/volatiletech/strmangle v0.0.1 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/text v0.9.0 // indirect
github.com/wasilibs/go-pgquery v0.0.0-20240606042535-c0843d6592cc // indirect
github.com/wasilibs/wazero-helpers v0.0.0-20240604052452-61d7981e9a38 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
modernc.org/libc v1.55.3 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.8.0 // indirect
modernc.org/sqlite v1.31.1 // indirect
modernc.org/strutil v1.2.0 // indirect
modernc.org/token v1.1.0 // indirect
)
169 changes: 169 additions & 0 deletions internal/endtoend/testdata/go.sum

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions internal/endtoend/testdata/inflection/mysql/go/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions internal/endtoend/testdata/inflection/mysql/go/query.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions internal/endtoend/testdata/inflection/mysql/query.sql
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ SELECT * FROM product_meta;

/* name: ListCalories :many */
SELECT * FROM calories;

/* name: GetProductMetadata :many */
SELECT * FROM product_metadata;

/* name: GetBonuses :many */
SELECT * FROM bonuses;
2 changes: 2 additions & 0 deletions internal/endtoend/testdata/inflection/mysql/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);
CREATE TABLE product_metadata (id text not null);
CREATE TABLE bonuses (id text not null);

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;

-- name: GetProductMetadata :many
SELECT * FROM product_metadata;

-- name: GetBonuses :many
SELECT * FROM bonuses;
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
CREATE TABLE bonuses (id text not null);

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ SELECT * FROM product_meta;

-- name: ListCalories :many
SELECT * FROM calories;

-- name: GetProductMetadata :many
SELECT * FROM product_metadata;

-- name: GetBonuses :many
SELECT * FROM bonuses;
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ CREATE TABLE campus (id text not null);
CREATE TABLE students (id text not null);
CREATE TABLE product_meta (id text not null);
CREATE TABLE calories (id text not null);

CREATE TABLE product_metadata (id text not null);
CREATE TABLE bonuses (id text not null);
Loading

0 comments on commit 43e2a7e

Please sign in to comment.