-
Notifications
You must be signed in to change notification settings - Fork 802
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Rename argument when conflicted to imported package (#2048)
- Loading branch information
Showing
7 changed files
with
130 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
internal/endtoend/testdata/conflicted_arg_name/postgresql/db/db.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
18 changes: 18 additions & 0 deletions
18
internal/endtoend/testdata/conflicted_arg_name/postgresql/db/models.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
internal/endtoend/testdata/conflicted_arg_name/postgresql/db/query.sql.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
internal/endtoend/testdata/conflicted_arg_name/postgresql/query.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
CREATE TABLE foo ( | ||
time date NOT NULL, | ||
time2 date NOT NULL, | ||
uuid uuid NOT NULL, | ||
uuid2 uuid NOT NULL | ||
); | ||
|
||
-- name: Time2ByTime :one | ||
SELECT time2 FROM foo WHERE time=$1; | ||
|
||
-- name: Uuid2ByUuid :one | ||
SELECT uuid2 FROM foo WHERE uuid=$1; |
11 changes: 11 additions & 0 deletions
11
internal/endtoend/testdata/conflicted_arg_name/postgresql/sqlc.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"version": "1", | ||
"packages": [ | ||
{ | ||
"path": "db", | ||
"engine": "postgresql", | ||
"schema": "query.sql", | ||
"queries": "query.sql" | ||
} | ||
] | ||
} |