Skip to content

Set the default schema name from configs. #2966

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Set the default schema name from configs. #2966

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
780b95d
Default schema
Dec 23, 2022
5b43680
change go mod
Dec 23, 2022
9634cc9
change go mod
Dec 23, 2022
a7a750d
Merge pull request #1 from kyleconroy/main
debugger84 Apr 4, 2023
fb94a8c
Re-run tests on GitHub Actions
kyleconroy Jun 7, 2023
dc21880
Merge branch 'sqlc-dev:main' into main
debugger84 Aug 25, 2023
b278d18
Merge branch 'main' into 1.23_release_sync
debugger84 Oct 31, 2023
5175969
Adding end-to-end tests for the generation of code with the default s…
debugger84 Nov 11, 2023
7309617
Merge branch 'sqlc-dev:main' into 1.23_release_sync
debugger84 Nov 11, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Default schema
  • Loading branch information
Andrey Yanakov committed Dec 23, 2022
commit 780b95d17d6fda6062cd7ca3451e1b83f26560ef
2 changes: 1 addition & 1 deletion internal/compiler/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func NewCompiler(conf config.SQL, combo config.CombinedSettings) *Compiler {
c.catalog = dolphin.NewCatalog()
case config.EnginePostgreSQL:
c.parser = postgresql.NewParser()
c.catalog = postgresql.NewCatalog()
c.catalog = postgresql.NewCatalog(c.conf.DefaultSchema)
default:
panic(fmt.Sprintf("unknown engine: %s", conf.Engine))
}
Expand Down
1 change: 1 addition & 0 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ type GenGo struct {
type SQL struct {
Engine Engine `json:"engine,omitempty" yaml:"engine"`
Schema Paths `json:"schema" yaml:"schema"`
DefaultSchema string `json:"default_schema" yaml:"default_schema"`
Queries Paths `json:"queries" yaml:"queries"`
StrictFunctionChecks bool `json:"strict_function_checks" yaml:"strict_function_checks"`
Gen SQLGen `json:"gen" yaml:"gen"`
Expand Down
7 changes: 5 additions & 2 deletions internal/engine/postgresql/catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ func toPointer(x int) *int {
return &x
}

func NewCatalog() *catalog.Catalog {
c := catalog.New("public")
func NewCatalog(defaultSchema string) *catalog.Catalog {
if defaultSchema == "" {
defaultSchema = "public"
}
c := catalog.New(defaultSchema)
c.Schemas = append(c.Schemas, pgTemp())
c.Schemas = append(c.Schemas, genPGCatalog())
c.Schemas = append(c.Schemas, genInformationSchema())
Expand Down