Allow sql_driver: "github.com/go-sql-driver/mysql" (#2219)

In preparation of #2179 for LOAD DATA LOCAL INFILE
sqlc-dev · Apr 21, 2023 · 0cc1aad · 0cc1aad
1 parent c8594cb
commit 0cc1aad
Show file tree

Hide file tree

Showing 10 changed files with 228 additions and 160 deletions.
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
@@ -98,6 +98,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 		Package:                     s.Package,
 		Out:                         s.Out,
 		SqlPackage:                  s.SQLPackage,
+		SqlDriver:                   s.SQLDriver,
 		OutputDbFileName:            s.OutputDBFileName,
 		OutputBatchFileName:         s.OutputBatchFileName,
 		OutputModelsFileName:        s.OutputModelsFileName,

diff --git a/internal/codegen/golang/driver.go b/internal/codegen/golang/driver.go
@@ -14,6 +14,8 @@ const (
 	SQLDriverLibPQ
 )
 
+const SQLDriverGoSQLDriverMySQL = "github.com/go-sql-driver/mysql"
+
 func parseDriver(sqlPackage string) SQLDriver {
 	switch sqlPackage {
 	case SQLPackagePGXV4:

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -135,6 +135,7 @@ type SQLGo struct {
 	Overrides                   []Override        `json:"overrides,omitempty" yaml:"overrides"`
 	Rename                      map[string]string `json:"rename,omitempty" yaml:"rename"`
 	SQLPackage                  string            `json:"sql_package" yaml:"sql_package"`
+	SQLDriver                   string            `json:"sql_driver" yaml:"sql_driver"`
 	OutputBatchFileName         string            `json:"output_batch_file_name,omitempty" yaml:"output_batch_file_name"`
 	OutputDBFileName            string            `json:"output_db_file_name,omitempty" yaml:"output_db_file_name"`
 	OutputModelsFileName        string            `json:"output_models_file_name,omitempty" yaml:"output_models_file_name"`

diff --git a/internal/config/v_one.go b/internal/config/v_one.go
@@ -38,6 +38,7 @@ type v1PackageSettings struct {
 	EmitAllEnumValues         bool       `json:"emit_all_enum_values,omitempty" yaml:"emit_all_enum_values"`
 	JSONTagsCaseStyle         string     `json:"json_tags_case_style,omitempty" yaml:"json_tags_case_style"`
 	SQLPackage                string     `json:"sql_package" yaml:"sql_package"`
+	SQLDriver                 string     `json:"sql_driver" yaml:"sql_driver"`
 	Overrides                 []Override `json:"overrides" yaml:"overrides"`
 	OutputBatchFileName       string     `json:"output_batch_file_name,omitempty" yaml:"output_batch_file_name"`
 	OutputDBFileName          string     `json:"output_db_file_name,omitempty" yaml:"output_db_file_name"`
@@ -151,6 +152,7 @@ func (c *V1GenerateSettings) Translate() Config {
 					Package:                   pkg.Name,
 					Out:                       pkg.Path,
 					SQLPackage:                pkg.SQLPackage,
+					SQLDriver:                 pkg.SQLDriver,
 					Overrides:                 pkg.Overrides,
 					JSONTagsCaseStyle:         pkg.JSONTagsCaseStyle,
 					OutputBatchFileName:       pkg.OutputBatchFileName,

diff --git a/internal/endtoend/testdata/codegen_json/gen/codegen.json b/internal/endtoend/testdata/codegen_json/gen/codegen.json
@@ -30,6 +30,7 @@
       "package": "",
       "out": "",
       "sql_package": "",
+      "sql_driver": "",
       "output_db_file_name": "",
       "output_models_file_name": "",
       "output_querier_file_name": "",

diff --git a/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json b/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json
@@ -30,6 +30,7 @@
       "package": "",
       "out": "",
       "sql_package": "",
+      "sql_driver": "",
       "output_db_file_name": "",
       "output_models_file_name": "",
       "output_querier_file_name": "",

diff --git a/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json b/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json
@@ -30,6 +30,7 @@
       "package": "",
       "out": "",
       "sql_package": "",
+      "sql_driver": "",
       "output_db_file_name": "",
       "output_models_file_name": "",
       "output_querier_file_name": "",

diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
diff --git a/internal/plugin/codegen_vtproto.pb.go b/internal/plugin/codegen_vtproto.pb.go
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto
@@ -84,6 +84,7 @@ message GoCode
   string package = 12;
   string out = 13;
   string sql_package = 14;
+  string sql_driver = 25;
   string output_db_file_name = 15;
   string output_models_file_name = 16;
   string output_querier_file_name = 17;