From dda941f811cafaf7f699b5f65376ebf91f08c5d0 Mon Sep 17 00:00:00 2001 From: Pavel Krush Date: Thu, 7 Jul 2022 16:50:59 +0700 Subject: [PATCH] kept backward compativility in drivers/interface --- drivers/interface.go | 8 +++++++- drivers/interface_test.go | 2 +- drivers/mocks/mock.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 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/interface.go b/drivers/interface.go index af1594739..9eabf19b5 100644 --- a/drivers/interface.go +++ b/drivers/interface.go @@ -106,7 +106,13 @@ type TableColumnTypeTranslator interface { // Tables returns the metadata for all tables, minus the tables // specified in the blacklist. -func Tables(c Constructor, schema string, whitelist, blacklist []string, concurrency int) ([]Table, error) { +func Tables(c Constructor, schema string, whitelist, blacklist []string) ([]Table, error) { + return TablesConcurrently(c, schema, whitelist, blacklist, 1) +} + +// TablesConcurrently is a concurrent version of Tables. It returns the +// metadata for all tables, minus the tables specified in the blacklist. +func TablesConcurrently(c Constructor, schema string, whitelist, blacklist []string, concurrency int) ([]Table, error) { var err error var ret []Table diff --git a/drivers/interface_test.go b/drivers/interface_test.go index 3d8ed0128..06c77cd31 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, 1) + tables, err := TablesConcurrently(testMockDriver{}, "public", nil, nil, 1) if err != nil { t.Error(err) } diff --git a/drivers/mocks/mock.go b/drivers/mocks/mock.go index 66a67f291..63d1fc5ec 100644 --- a/drivers/mocks/mock.go +++ b/drivers/mocks/mock.go @@ -66,7 +66,7 @@ func (m *MockDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, er whitelist, _ := config.StringSlice(drivers.ConfigWhitelist) blacklist, _ := config.StringSlice(drivers.ConfigBlacklist) - dbinfo.Tables, err = drivers.Tables(m, schema, whitelist, blacklist, 1) + dbinfo.Tables, err = drivers.TablesConcurrently(m, schema, whitelist, blacklist, 1) if err != nil { return nil, err } diff --git a/drivers/sqlboiler-mssql/driver/mssql.go b/drivers/sqlboiler-mssql/driver/mssql.go index 13ad6e0f7..27764954c 100644 --- a/drivers/sqlboiler-mssql/driver/mssql.go +++ b/drivers/sqlboiler-mssql/driver/mssql.go @@ -111,7 +111,7 @@ func (m *MSSQLDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, e UseCaseWhenExistsClause: true, }, } - dbinfo.Tables, err = drivers.Tables(m, schema, whitelist, blacklist, concurrency) + dbinfo.Tables, err = drivers.TablesConcurrently(m, schema, whitelist, blacklist, concurrency) if err != nil { return nil, err } diff --git a/drivers/sqlboiler-mysql/driver/mysql.go b/drivers/sqlboiler-mysql/driver/mysql.go index 8d07d4e93..b6d73133e 100644 --- a/drivers/sqlboiler-mysql/driver/mysql.go +++ b/drivers/sqlboiler-mysql/driver/mysql.go @@ -117,7 +117,7 @@ func (m *MySQLDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, e }, } - dbinfo.Tables, err = drivers.Tables(m, schema, whitelist, blacklist, concurrency) + dbinfo.Tables, err = drivers.TablesConcurrently(m, schema, whitelist, blacklist, concurrency) if err != nil { return nil, err } diff --git a/drivers/sqlboiler-psql/driver/psql.go b/drivers/sqlboiler-psql/driver/psql.go index 1aa4efee6..2e701beff 100644 --- a/drivers/sqlboiler-psql/driver/psql.go +++ b/drivers/sqlboiler-psql/driver/psql.go @@ -123,7 +123,7 @@ func (p *PostgresDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo UseDefaultKeyword: true, }, } - dbinfo.Tables, err = drivers.Tables(p, schema, whitelist, blacklist, concurrency) + dbinfo.Tables, err = drivers.TablesConcurrently(p, schema, whitelist, blacklist, concurrency) if err != nil { return nil, err } diff --git a/drivers/sqlboiler-sqlite3/driver/sqlite3.go b/drivers/sqlboiler-sqlite3/driver/sqlite3.go index 908919795..1f98357be 100644 --- a/drivers/sqlboiler-sqlite3/driver/sqlite3.go +++ b/drivers/sqlboiler-sqlite3/driver/sqlite3.go @@ -96,7 +96,7 @@ func (s SQLiteDriver) Assemble(config drivers.Config) (dbinfo *drivers.DBInfo, e }, } - dbinfo.Tables, err = drivers.Tables(s, "", whitelist, blacklist, concurrency) + dbinfo.Tables, err = drivers.TablesConcurrently(s, "", whitelist, blacklist, concurrency) if err != nil { return nil, err }