Add MergeQueryFiles config opt

simo7 · simo7 · commit b8217016eb59 · 2024-10-06T03:01:23.000+02:00
diff --git a/internal/config.go b/internal/config.go
@@ -11,6 +11,8 @@ type Config struct {
 	// When a query uses a table with RLS enforced fields, it will be required to
 	// parametrized those fields. Associate tables are not covered!
 	RLSEnforcedFields []string `json:"rls_enforced_fields"`
+	// Merge queries defined in different files into one output queries.py file
+	MergeQueryFiles bool `json:"merge_query_files"`
 }
 
 const MODELS_FILENAME = "db_models"
diff --git a/internal/gen.go b/internal/gen.go
@@ -1113,6 +1113,9 @@ type pyTmplCtx struct {
 }
 
 func (t *pyTmplCtx) OutputQuery(sourceName string) bool {
+	if t.C.MergeQueryFiles {
+		return true
+	}
 	return t.SourceName == sourceName
 }
 
@@ -1156,8 +1159,12 @@ func Generate(_ context.Context, req *plugin.GenerateRequest) (*plugin.GenerateR
 	output[MODELS_FILENAME+".py"] = string(result.Python)
 
 	files := map[string]struct{}{}
-	for _, q := range queries {
-		files[q.SourceName] = struct{}{}
+	if i.C.MergeQueryFiles {
+		files["db_queries.sql"] = struct{}{}
+	} else {
+		for _, q := range queries {
+			files[q.SourceName] = struct{}{}
+		}
 	}
 
 	for source := range files {
diff --git a/internal/imports.go b/internal/imports.go
@@ -113,7 +113,7 @@ func (i *importer) modelImports() []string {
 func (i *importer) queryImportSpecs(fileName string) (map[string]importSpec, map[string]importSpec) {
 	queryUses := func(name string) bool {
 		for _, q := range i.Queries {
-			if q.SourceName != fileName {
+			if !i.C.MergeQueryFiles && q.SourceName != fileName {
 				continue
 			}
 			if queryValueUses(name, q.Ret) {
@@ -144,7 +144,7 @@ func (i *importer) queryImportSpecs(fileName string) (map[string]importSpec, map
 	}
 
 	for _, q := range i.Queries {
-		if q.SourceName != fileName {
+		if !i.C.MergeQueryFiles && q.SourceName != fileName {
 			continue
 		}
 		if q.Cmd == ":one" {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ type Config struct {`
`11`	`11`	`// When a query uses a table with RLS enforced fields, it will be required to`
`12`	`12`	`// parametrized those fields. Associate tables are not covered!`
`13`	`13`	RLSEnforcedFields []string `json:"rls_enforced_fields"`
	`14`	`+ // Merge queries defined in different files into one output queries.py file`
	`15`	+ MergeQueryFiles bool `json:"merge_query_files"`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`const MODELS_FILENAME = "db_models"`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func (i *importer) modelImports() []string {`
`113`	`113`	`func (i *importer) queryImportSpecs(fileName string) (map[string]importSpec, map[string]importSpec) {`
`114`	`114`	`queryUses := func(name string) bool {`
`115`	`115`	`for _, q := range i.Queries {`
`116`		`- if q.SourceName != fileName {`
	`116`	`+ if !i.C.MergeQueryFiles && q.SourceName != fileName {`
`117`	`117`	`continue`
`118`	`118`	`}`
`119`	`119`	`if queryValueUses(name, q.Ret) {`
`@@ -144,7 +144,7 @@ func (i *importer) queryImportSpecs(fileName string) (map[string]importSpec, map`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`for _, q := range i.Queries {`
`147`		`- if q.SourceName != fileName {`
	`147`	`+ if !i.C.MergeQueryFiles && q.SourceName != fileName {`
`148`	`148`	`continue`
`149`	`149`	`}`
`150`	`150`	`if q.Cmd == ":one" {`