fix tests

ent · Sep 27, 2022 · 25d7339 · 25d7339
1 parent f312edd
commit 25d7339
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/dialect/sql/schema/mysql_test.go b/dialect/sql/schema/mysql_test.go
@@ -1375,9 +1375,9 @@ type mysqlMock struct {
 }
 
 func (m mysqlMock) start(version string) {
-	m.ExpectBegin()
 	m.ExpectQuery(escape("SHOW VARIABLES LIKE 'version'")).
 		WillReturnRows(sqlmock.NewRows([]string{"Variable_name", "Value"}).AddRow("version", version))
+	m.ExpectBegin()
 }
 
 func (m mysqlMock) tableExists(table string, exists bool) {

diff --git a/dialect/sql/schema/postgres_test.go b/dialect/sql/schema/postgres_test.go
@@ -1010,9 +1010,9 @@ type pgMock struct {
 }
 
 func (m pgMock) start(version string) {
-	m.ExpectBegin()
 	m.ExpectQuery(escape("SHOW server_version_num")).
 		WillReturnRows(sqlmock.NewRows([]string{"server_version_num"}).AddRow(version))
+	m.ExpectBegin()
 }
 
 func (m pgMock) tableExists(table string, exists bool) {

diff --git a/dialect/sql/schema/sqlite.go b/dialect/sql/schema/sqlite.go
@@ -46,6 +46,9 @@ func (d *SQLite) Tx(ctx context.Context) (dialect.Tx, error) {
 	}
 	tx := &tx{t}
 	cm, err := sqlite.CommitFunc(ctx, db, tx, true)
+	if err != nil {
+		return nil, err
+	}
 	return &SQLiteTx{Tx: t, commit: cm, rollback: sqlite.RollbackFunc(ctx, db, tx, true)}, nil
 }