Allow query_parameter_limit to be zero

Author: go-mez

docs/reference/config.md

@@ -127,6 +127,8 @@ The `gen` mapping supports the following keys:
   - Customize the name of generated struct fields. Explained in detail on the `Renaming fields` section.
 - `overrides`:
   - It is a collection of definitions that dictates which types are used to map a database types. Explained in detail on the  `Type overriding` section.
+  - `query_parameter_limit`:
+  - Positional arguments that will be generated in go functions (`>= 0`). To always emit a parameter struct, you would need to set it to `0`. Defaults to `1`.
 
 ##### Renaming fields
 
@@ -405,8 +407,9 @@ Each mapping in the `packages` collection has the following keys:
   - Customize the name of the querier file. Defaults to `querier.go`.
 - `output_files_suffix`:
   - If specified the suffix will be added to the name of the generated files.
-- `query_parameter_limit`:
-  - Positional arguments that will be generated in go functions (>= `1` or `-1`). To always emit a parameter struct, you would need to set it to `-1`. `0` is invalid. Defaults to `1`.
+  - `query_parameter_limit`:
+  - Positional arguments that will be generated in go functions (`>= 0`). To always emit a parameter struct, you would need to set it to `0`. Defaults to `1`.
+
 
 ### overrides
 

internal/cmd/shim.go

@@ -77,6 +77,7 @@ func pluginCodegen(s config.Codegen) *plugin.Codegen {
 func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 	if s.QueryParameterLimit == nil {
 		s.QueryParameterLimit = new(int32)
+		*s.QueryParameterLimit = 1
 	}
 
 	return &plugin.GoCode{
@@ -102,7 +103,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 		OutputQuerierFileName:       s.OutputQuerierFileName,
 		OutputFilesSuffix:           s.OutputFilesSuffix,
 		InflectionExcludeTableNames: s.InflectionExcludeTableNames,
-		QueryParameterLimit:         *s.QueryParameterLimit,
+		QueryParameterLimit:         s.QueryParameterLimit,
 	}
 }
 

internal/codegen/golang/result.go

@@ -202,9 +202,9 @@ func buildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error)
 		}
 		sqlpkg := parseDriver(req.Settings.Go.SqlPackage)
 
-		qpl := int(req.Settings.Go.QueryParameterLimit)
+		qpl := int(*req.Settings.Go.QueryParameterLimit)
 
-		if len(query.Params) == 1 && qpl != -1 {
+		if len(query.Params) == 1 && qpl != 0 {
 			p := query.Params[0]
 			gq.Arg = QueryValue{
 				Name:      paramName(p),
@@ -213,7 +213,7 @@ func buildQueries(req *plugin.CodeGenRequest, structs []Struct) ([]Query, error)
 				SQLDriver: sqlpkg,
 				Column:    p.Column,
 			}
-		} else if len(query.Params) >= 1 && (qpl >= 1 || qpl == -1) {
+		} else if len(query.Params) >= 1 && (qpl >= 0) {
 			var cols []goColumn
 			for _, p := range query.Params {
 				cols = append(cols, goColumn{

internal/config/v_one.go

@@ -76,8 +76,7 @@ func v1ParseConfig(rd io.Reader) (Config, error) {
 			return config, ErrNoPackagePath
 		}
 
-		if settings.Packages[j].QueryParameterLimit != nil && (*settings.Packages[j].QueryParameterLimit < -1 ||
-			*settings.Packages[j].QueryParameterLimit == 0) {
+		if settings.Packages[j].QueryParameterLimit != nil && (*settings.Packages[j].QueryParameterLimit < 0) {
 			return config, ErrInvalidQueryParameterLimit
 		}
 

internal/config/v_two.go

@@ -75,8 +75,7 @@ func v2ParseConfig(rd io.Reader) (Config, error) {
 				conf.SQL[j].Gen.Go.Package = filepath.Base(conf.SQL[j].Gen.Go.Out)
 			}
 
-			if conf.SQL[j].Gen.Go.QueryParameterLimit != nil && (*conf.SQL[j].Gen.Go.QueryParameterLimit < -1 ||
-				*conf.SQL[j].Gen.Go.QueryParameterLimit == 0) {
+			if conf.SQL[j].Gen.Go.QueryParameterLimit != nil && (*conf.SQL[j].Gen.Go.QueryParameterLimit < 0) {
 				return conf, ErrInvalidQueryParameterLimit
 			}
 

internal/endtoend/testdata/codegen_json/gen/codegen.json

@@ -37,7 +37,8 @@
       "emit_enum_valid_method": false,
       "emit_all_enum_values": false,
       "inflection_exclude_table_names": [],
-      "emit_pointers_for_null_types": false
+      "emit_pointers_for_null_types": false,
+      "query_parameter_limit": 1
     },
     "json": {
       "out": "gen",

internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json

@@ -37,7 +37,8 @@
       "emit_enum_valid_method": false,
       "emit_all_enum_values": false,
       "inflection_exclude_table_names": [],
-      "emit_pointers_for_null_types": false
+      "emit_pointers_for_null_types": false,
+      "query_parameter_limit": 1
     },
     "json": {
       "out": "",

internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json

@@ -37,7 +37,8 @@
       "emit_enum_valid_method": false,
       "emit_all_enum_values": false,
       "inflection_exclude_table_names": [],
-      "emit_pointers_for_null_types": false
+      "emit_pointers_for_null_types": false,
+      "query_parameter_limit": 1
     },
     "json": {
       "out": "",

internal/endtoend/testdata/query_parameter_limit_invalid/postgresql/sqlc.json

@@ -7,7 +7,7 @@
         "name": "querytest",
         "schema": "query.sql",
         "queries": "query.sql",
-        "query_parameter_limit": 0
+        "query_parameter_limit": -1
       }
     ]
   }

internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/db.go

@@ -7,7 +7,7 @@
         "name": "querytest",
         "schema": "query.sql",
         "queries": "query.sql",
-        "query_parameter_limit": -1
+        "query_parameter_limit": 0
       }
     ]
   }