Merge branch 'master' into main-dmdb

# Conflicts:
#	db/db.go

db/transaction.go

@@ -39,21 +39,36 @@ func (that *HoTimeDB) Action(action func(db HoTimeDB) (isSuccess bool)) (isSucce
 		testLogBuf:  logBuf,
 	}
 
+	txFailed := false
+	db.txFailed = &txFailed
+
 	if that.testTx != nil {
 		spName := fmt.Sprintf("sp_%d", atomic.AddUint64(&savepointCounter, 1))
-		if that.testMu != nil { that.testMu.Lock() }
+		if that.testMu != nil {
+			that.testMu.Lock()
+		}
 		_, _ = that.testTx.Exec("SAVEPOINT " + spName)
-		if that.testMu != nil { that.testMu.Unlock() }
+		if that.testMu != nil {
+			that.testMu.Unlock()
+		}
 		db.Tx = that.testTx
 		isSuccess = action(db)
-		if !isSuccess {
-			if that.testMu != nil { that.testMu.Lock() }
+		if txFailed || !isSuccess {
+			if that.testMu != nil {
+				that.testMu.Lock()
+			}
 			_, _ = that.testTx.Exec("ROLLBACK TO SAVEPOINT " + spName)
-			if that.testMu != nil { that.testMu.Unlock() }
-		} else {
-			if that.testMu != nil { that.testMu.Lock() }
-			_, _ = that.testTx.Exec("RELEASE SAVEPOINT " + spName)
-			if that.testMu != nil { that.testMu.Unlock() }
+			if that.testMu != nil {
+				that.testMu.Unlock()
+			}
+			return false
+		}
+		if that.testMu != nil {
+			that.testMu.Lock()
+		}
+		_, _ = that.testTx.Exec("RELEASE SAVEPOINT " + spName)
+		if that.testMu != nil {
+			that.testMu.Unlock()
 		}
 		return isSuccess
 	}
@@ -69,6 +84,12 @@ func (that *HoTimeDB) Action(action func(db HoTimeDB) (isSuccess bool)) (isSucce
 
 	isSuccess = action(db)
 
+	// SQL 出过错 → 事务必须回滚，不管回调返回什么
+	if txFailed {
+		_ = db.Tx.Rollback()
+		return false
+	}
+
 	if !isSuccess {
 		err = db.Tx.Rollback()
 		if err != nil {