Upgrade gopkg.in/testfixtures.v2 (#4999)

vendor/gopkg.in/testfixtures.v2/sqlserver.go

@@ -3,6 +3,7 @@ package testfixtures
 import (
 	"database/sql"
 	"fmt"
+	"strings"
 )
 
 // SQLServer is the helper for SQL Server for this package.
@@ -16,7 +17,7 @@ type SQLServer struct {
 func (h *SQLServer) init(db *sql.DB) error {
 	var err error
 
-	h.tables, err = h.getTables(db)
+	h.tables, err = h.tableNames(db)
 	if err != nil {
 		return err
 	}
@@ -28,46 +29,62 @@ func (*SQLServer) paramType() int {
 	return paramTypeQuestion
 }
 
-func (*SQLServer) quoteKeyword(str string) string {
-	return fmt.Sprintf("[%s]", str)
+func (*SQLServer) quoteKeyword(s string) string {
+	parts := strings.Split(s, ".")
+	for i, p := range parts {
+		parts[i] = fmt.Sprintf(`[%s]`, p)
+	}
+	return strings.Join(parts, ".")
 }
 
-func (*SQLServer) databaseName(db *sql.DB) (dbname string) {
-	db.QueryRow("SELECT DB_NAME()").Scan(&dbname)
-	return
+func (*SQLServer) databaseName(q queryable) (string, error) {
+	var dbName string
+	err := q.QueryRow("SELECT DB_NAME()").Scan(&dbName)
+	return dbName, err
 }
 
-func (*SQLServer) getTables(db *sql.DB) ([]string, error) {
-	rows, err := db.Query("SELECT table_name FROM information_schema.tables")
+func (*SQLServer) tableNames(q queryable) ([]string, error) {
+	rows, err := q.Query("SELECT table_schema + '.' + table_name FROM information_schema.tables")
 	if err != nil {
 		return nil, err
 	}
-
-	tables := make([]string, 0)
 	defer rows.Close()
+
+	var tables []string
 	for rows.Next() {
 		var table string
-		rows.Scan(&table)
+		if err = rows.Scan(&table); err != nil {
+			return nil, err
+		}
 		tables = append(tables, table)
 	}
+	if err = rows.Err(); err != nil {
+		return nil, err
+	}
 	return tables, nil
 }
 
-func (*SQLServer) tableHasIdentityColumn(tx *sql.Tx, tableName string) bool {
+func (h *SQLServer) tableHasIdentityColumn(q queryable, tableName string) bool {
 	sql := `
-SELECT COUNT(*)
-FROM SYS.IDENTITY_COLUMNS
-WHERE OBJECT_NAME(OBJECT_ID) = ?
-`
+		SELECT COUNT(*)
+		FROM SYS.IDENTITY_COLUMNS
+		WHERE OBJECT_ID = OBJECT_ID(?)
+	`
 	var count int
-	tx.QueryRow(sql, tableName).Scan(&count)
+	q.QueryRow(sql, h.quoteKeyword(tableName)).Scan(&count)
 	return count > 0
 
 }
 
-func (h *SQLServer) whileInsertOnTable(tx *sql.Tx, tableName string, fn func() error) error {
+func (h *SQLServer) whileInsertOnTable(tx *sql.Tx, tableName string, fn func() error) (err error) {
 	if h.tableHasIdentityColumn(tx, tableName) {
-		defer tx.Exec(fmt.Sprintf("SET IDENTITY_INSERT %s OFF", h.quoteKeyword(tableName)))
+		defer func() {
+			_, err2 := tx.Exec(fmt.Sprintf("SET IDENTITY_INSERT %s OFF", h.quoteKeyword(tableName)))
+			if err2 != nil && err == nil {
+				err = err2
+			}
+		}()
+
 		_, err := tx.Exec(fmt.Sprintf("SET IDENTITY_INSERT %s ON", h.quoteKeyword(tableName)))
 		if err != nil {
 			return err
@@ -76,19 +93,19 @@ func (h *SQLServer) whileInsertOnTable(tx *sql.Tx, tableName string, fn func() e
 	return fn()
 }
 
-func (h *SQLServer) disableReferentialIntegrity(db *sql.DB, loadFn loadFunction) error {
+func (h *SQLServer) disableReferentialIntegrity(db *sql.DB, loadFn loadFunction) (err error) {
 	// ensure the triggers are re-enable after all
 	defer func() {
-		sql := ""
+		var sql string
 		for _, table := range h.tables {
 			sql += fmt.Sprintf("ALTER TABLE %s WITH CHECK CHECK CONSTRAINT ALL;", h.quoteKeyword(table))
 		}
-		if _, err := db.Exec(sql); err != nil {
-			fmt.Printf("Error on re-enabling constraints: %v\n", err)
+		if _, err2 := db.Exec(sql); err2 != nil && err == nil {
+			err = err2
 		}
 	}()
 
-	sql := ""
+	var sql string
 	for _, table := range h.tables {
 		sql += fmt.Sprintf("ALTER TABLE %s NOCHECK CONSTRAINT ALL;", h.quoteKeyword(table))
 	}
@@ -100,11 +117,19 @@ func (h *SQLServer) disableReferentialIntegrity(db *sql.DB, loadFn loadFunction)
 	if err != nil {
 		return err
 	}
+	defer tx.Rollback()
 
 	if err = loadFn(tx); err != nil {
-		tx.Rollback()
 		return err
 	}
 
 	return tx.Commit()
 }
+
+// splitter is a batchSplitter interface implementation. We need it for
+// SQL Server because commands like a `CREATE SCHEMA...` and a `CREATE TABLE...`
+// could not be executed in the same batch.
+// See https://docs.microsoft.com/en-us/previous-versions/sql/sql-server-2008-r2/ms175502(v=sql.105)#rules-for-using-batches
+func (*SQLServer) splitter() []byte {
+	return []byte("GO\n")
+}