From e44ae05aa52196094d1ca40ba6ac1dbd5582d732 Mon Sep 17 00:00:00 2001 From: Pavel Krush Date: Thu, 7 Jul 2022 15:56:50 +0700 Subject: [PATCH] fixed tests, renamed ConfigDefaultConcurrency to DefaultConcurrency --- drivers/interface.go | 16 +++++++++------- drivers/interface_test.go | 2 +- drivers/sqlboiler-mssql/driver/mssql.go | 2 +- drivers/sqlboiler-mysql/driver/mysql.go | 2 +- drivers/sqlboiler-psql/driver/psql.go | 2 +- drivers/sqlboiler-sqlite3/driver/sqlite3.go | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/interface.go b/drivers/interface.go index 1b663c1df..af1594739 100644 --- a/drivers/interface.go +++ b/drivers/interface.go @@ -13,13 +13,12 @@ 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" @@ -27,6 +26,9 @@ const ( 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 index 64d0afe69..3d8ed0128 100644 --- 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 index 590687dc1..13ad6e0f7 100644 --- 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 index 5c5ef1621..8d07d4e93 100644 --- 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 index f0147b233..1aa4efee6 100644 --- 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 index 8d3230175..908919795 100644 --- 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)