Skip to content

config: Remove "emit_single_file" option #367

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
merged 1 commit into from
Feb 29, 2020
Merged

config: Remove "emit_single_file" option #367

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ type SQLGo struct {
EmitInterface bool `json:"emit_interface" yaml:"emit_interface"`
EmitJSONTags bool `json:"emit_json_tags" yaml:"emit_json_tags"`
EmitPreparedQueries bool `json:"emit_prepared_queries" yaml:"emit_prepared_queries":`
EmitSingleFile bool `json:"emit_single_file" yaml:"emit_single_file":`
Package string `json:"package" yaml:"package"`
Out string `json:"out" yaml:"out"`
Overrides []Override `json:"overrides,omitempty" yaml:"overrides"`
Expand Down
2 changes: 0 additions & 2 deletions internal/config/v_one.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ type v1PackageSettings struct {
EmitInterface bool `json:"emit_interface" yaml:"emit_interface"`
EmitJSONTags bool `json:"emit_json_tags" yaml:"emit_json_tags"`
EmitPreparedQueries bool `json:"emit_prepared_queries" yaml:"emit_prepared_queries"`
EmitSingleFile bool `json:"emit_single_file" yaml:"emit_single_file"`
Overrides []Override `json:"overrides" yaml:"overrides"`
}

Expand Down Expand Up @@ -104,7 +103,6 @@ func (c *V1GenerateSettings) Translate() Config {
EmitInterface: pkg.EmitInterface,
EmitJSONTags: pkg.EmitJSONTags,
EmitPreparedQueries: pkg.EmitPreparedQueries,
EmitSingleFile: pkg.EmitSingleFile,
Package: pkg.Name,
Out: pkg.Path,
Overrides: pkg.Overrides,
Expand Down
43 changes: 2 additions & 41 deletions internal/dinosql/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,6 @@ func mergeImports(imps ...fileImports) [][]string {

func Imports(r Generateable, settings config.CombinedSettings) func(string) [][]string {
return func(filename string) [][]string {
if filename == "all.go" {
var imps []fileImports
imps = append(imps, dbImports(r, settings))
imps = append(imps, modelImports(r, settings))
imps = append(imps, interfaceImports(r, settings))
imps = append(imps, queryImports(r, settings, filename))
return mergeImports(imps...)
}

if filename == "db.go" {
return mergeImports(dbImports(r, settings))
}
Expand Down Expand Up @@ -401,7 +392,7 @@ func queryImports(r Generateable, settings config.CombinedSettings, filename str
// }
var gq []GoQuery
for _, query := range r.GoQueries(settings) {
if query.SourceName == filename || settings.Go.EmitSingleFile {
if query.SourceName == filename {
gq = append(gq, query)
}
}
Expand Down Expand Up @@ -1272,26 +1263,6 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) (int64, er
{{end}}
{{end}}
{{end}}

{{define "singleFile"}}// Code generated by sqlc. DO NOT EDIT.

package {{.Package}}

import (
{{range imports "all.go"}}
{{range .}}"{{.}}"
{{end}}
{{end}}
)

{{template "modelsCode" . }}

{{template "queryCode" . }}

{{template "dbCode" . }}

{{template "interfaceCode" . }}
{{end}}
`

type tmplCtx struct {
Expand All @@ -1308,11 +1279,10 @@ type tmplCtx struct {
EmitJSONTags bool
EmitPreparedQueries bool
EmitInterface bool
EmitSingleFile bool
}

func (t *tmplCtx) OutputQuery(sourceName string) bool {
return t.SourceName == sourceName || t.EmitSingleFile
return t.SourceName == sourceName
}

func LowerTitle(s string) string {
Expand Down Expand Up @@ -1340,7 +1310,6 @@ func Generate(r Generateable, settings config.CombinedSettings) (map[string]stri
EmitInterface: golang.EmitInterface,
EmitJSONTags: golang.EmitJSONTags,
EmitPreparedQueries: golang.EmitPreparedQueries,
EmitSingleFile: golang.EmitSingleFile,
Q: "`",
Package: golang.Package,
GoQueries: r.GoQueries(settings),
Expand Down Expand Up @@ -1371,14 +1340,6 @@ func Generate(r Generateable, settings config.CombinedSettings) (map[string]stri
return nil
}

// Output a single file with all code
if golang.EmitSingleFile {
if err := execute("db.go", "singleFile"); err != nil {
return nil, err
}
return output, nil
}

if err := execute("db.go", "dbFile"); err != nil {
return nil, err
}
Expand Down
Loading