|
@@ -1081,15 +1081,15 @@ func sqlCommonExecSQLAndUpdateDBVersion(dbHandle *sql.DB, sqlQueries []string, n
|
|
}
|
|
}
|
|
|
|
|
|
func sqlCommonExecuteTx(ctx context.Context, dbHandle *sql.DB, txFn func(*sql.Tx) error) error {
|
|
func sqlCommonExecuteTx(ctx context.Context, dbHandle *sql.DB, txFn func(*sql.Tx) error) error {
|
|
|
|
+ if config.Driver == CockroachDataProviderName {
|
|
|
|
+ return crdb.ExecuteTx(ctx, dbHandle, nil, txFn)
|
|
|
|
+ }
|
|
|
|
+
|
|
tx, err := dbHandle.BeginTx(ctx, nil)
|
|
tx, err := dbHandle.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
|
|
|
|
- if config.Driver == CockroachDataProviderName {
|
|
|
|
- return crdb.ExecuteTx(ctx, dbHandle, nil, txFn)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
err = txFn(tx)
|
|
err = txFn(tx)
|
|
if err != nil {
|
|
if err != nil {
|
|
// we don't change the returned error
|
|
// we don't change the returned error
|