kept backward compativility in drivers/interface

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

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 	}