fixed tests, renamed ConfigDefaultConcurrency to DefaultConcurrency

volatiletech · Jul 7, 2022 · e44ae05 · e44ae05
1 parent a5fd3f0
commit e44ae05
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/drivers/interface.go b/drivers/interface.go
@@ -13,20 +13,22 @@ import (
 
 // These constants are used in the config map passed into the driver
 const (
-	ConfigBlacklist          = "blacklist"
-	ConfigWhitelist          = "whitelist"
-	ConfigSchema             = "schema"
-	ConfigAddEnumTypes       = "add-enum-types"
-	ConfigEnumNullPrefix     = "enum-null-prefix"
-	ConfigConcurrency        = "concurrency"
-	ConfigDefaultConcurrency = 10
+	ConfigBlacklist      = "blacklist"
+	ConfigWhitelist      = "whitelist"
+	ConfigSchema         = "schema"
+	ConfigAddEnumTypes   = "add-enum-types"
+	ConfigEnumNullPrefix = "enum-null-prefix"
+	ConfigConcurrency    = "concurrency"
 
 	ConfigUser    = "user"
 	ConfigPass    = "pass"
 	ConfigHost    = "host"
 	ConfigPort    = "port"
 	ConfigDBName  = "dbname"
 	ConfigSSLMode = "sslmode"
+
+	// DefaultConcurrency defines the default amount of threads to use when loading tables info
+	DefaultConcurrency = 10
 )
 
 // Interface abstracts either a side-effect imported driver or a binary

diff --git a/drivers/interface_test.go b/drivers/interface_test.go
@@ -115,7 +115,7 @@ func (m testMockDriver) UseIndexPlaceholders() bool {
 func TestTables(t *testing.T) {
 	t.Parallel()
 
-	tables, err := Tables(testMockDriver{}, "public", nil, nil)
+	tables, err := Tables(testMockDriver{}, "public", nil, nil, 1)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/drivers/sqlboiler-mssql/driver/mssql.go b/drivers/sqlboiler-mssql/driver/mssql.go
@@ -81,7 +81,7 @@ func (m *MSSQLDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, e
 	schema := config.DefaultString(drivers.ConfigSchema, "dbo")
 	whitelist, _ := config.StringSlice(drivers.ConfigWhitelist)
 	blacklist, _ := config.StringSlice(drivers.ConfigBlacklist)
-	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.ConfigDefaultConcurrency)
+	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.DefaultConcurrency)
 
 	m.connStr = MSSQLBuildQueryString(user, pass, dbname, host, port, sslmode)
 	m.conn, err = sql.Open("mssql", m.connStr)

diff --git a/drivers/sqlboiler-mysql/driver/mysql.go b/drivers/sqlboiler-mysql/driver/mysql.go
@@ -83,7 +83,7 @@ func (m *MySQLDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, e
 	schema := dbname
 	whitelist, _ := config.StringSlice(drivers.ConfigWhitelist)
 	blacklist, _ := config.StringSlice(drivers.ConfigBlacklist)
-	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.ConfigDefaultConcurrency)
+	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.DefaultConcurrency)
 
 	tinyIntAsIntIntf, ok := config["tinyint_as_int"]
 	if ok {

diff --git a/drivers/sqlboiler-psql/driver/psql.go b/drivers/sqlboiler-psql/driver/psql.go
@@ -88,7 +88,7 @@ func (p *PostgresDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo
 	schema := config.DefaultString(drivers.ConfigSchema, "public")
 	whitelist, _ := config.StringSlice(drivers.ConfigWhitelist)
 	blacklist, _ := config.StringSlice(drivers.ConfigBlacklist)
-	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.ConfigDefaultConcurrency)
+	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.DefaultConcurrency)
 
 	useSchema := schema != "public"
 

diff --git a/drivers/sqlboiler-sqlite3/driver/sqlite3.go b/drivers/sqlboiler-sqlite3/driver/sqlite3.go
@@ -70,7 +70,7 @@ func (s SQLiteDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, e
 	dbname := config.MustString(drivers.ConfigDBName)
 	whitelist, _ := config.StringSlice(drivers.ConfigWhitelist)
 	blacklist, _ := config.StringSlice(drivers.ConfigBlacklist)
-	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.ConfigDefaultConcurrency)
+	concurrency := config.DefaultInt(drivers.ConfigConcurrency, drivers.DefaultConcurrency)
 
 	s.connStr = SQLiteBuildQueryString(dbname)
 	s.dbConn, err = sql.Open("sqlite", s.connStr)