Skip to content

Ignore deprecated settings#1

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

Merged
kyleconroy merged 1 commit into from
Oct 23, 2022
Merged

Ignore deprecated settings #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions gen.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ func buildEnums(req *plugin.CodeGenRequest) []Enum{
return enums
}

func buildModels(req *plugin.CodeGenRequest) []Struct{
func buildModels(conf Config, req *plugin.CodeGenRequest) []Struct{
var structs []Struct
for _, schema := range req.Catalog.Schemas{
if schema.Name == "pg_catalog" || schema.Name == "information_schema"{
Expand All@@ -290,10 +290,10 @@ func buildModels(req *plugin.CodeGenRequest) []Struct{
tableName = schema.Name + "_" + table.Rel.Name
}
structName := tableName
if !req.Settings.Python.EmitExactTableNames{
if !conf.EmitExactTableNames{
structName = inflection.Singular(inflection.SingularParams{
Name: structName,
Exclusions: req.Settings.Python.InflectionExcludeTableNames,
Exclusions: conf.InflectionExcludeTableNames,
})
}
s := Struct{
Expand DownExpand Up@@ -1097,7 +1097,7 @@ func Generate(_ context.Context, req *plugin.Request) (*plugin.Response, error)
}

enums := buildEnums(req)
models := buildModels(req)
models := buildModels(conf, req)
queries, err := buildQueries(conf, req, models)
if err != nil{
return nil, err
Expand Down