apache
diff --git a/‎go.mod‎
Lines changed: 33 additions & 4 deletions b/‎go.mod‎
Lines changed: 33 additions & 4 deletions
diff --git a/‎go.sum‎
Lines changed: 232 additions & 6 deletions b/‎go.sum‎
Lines changed: 232 additions & 6 deletions
diff --git a/‎pkg/datasource/sql/at_resource_manager.go‎
Lines changed: 11 additions & 1 deletion b/‎pkg/datasource/sql/at_resource_manager.go‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎pkg/datasource/sql/conn.go‎
Lines changed: 42 additions & 1 deletion b/‎pkg/datasource/sql/conn.go‎
Lines changed: 42 additions & 1 deletion
diff --git a/‎pkg/datasource/sql/conn_at.go‎
Lines changed: 2 additions & 0 deletions b/‎pkg/datasource/sql/conn_at.go‎
Lines changed: 2 additions & 0 deletions
@@ -37,7 +37,13 @@ require (
 	google.golang.org/protobuf v1.30.0
 )
 
-require github.com/knadh/koanf v1.5.0
+require (
+	github.com/auxten/postgresql-parser v1.0.1
+	github.com/blastrain/vitess-sqlparser v0.0.0-20201030050434-a139afbb1aba
+	github.com/jackc/pgx/v4 v4.18.3
+	github.com/knadh/koanf v1.5.0
+	github.com/lib/pq v1.10.9
+)
 
 require (
 	github.com/RoaringBitmap/roaring v1.2.0 // indirect
@@ -46,24 +52,43 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.2.0 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/cockroachdb/apd v1.1.1-0.20181017181144-bced77f817b4 // indirect
+	github.com/cockroachdb/errors v1.8.2 // indirect
+	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
+	github.com/cockroachdb/redact v1.0.8 // indirect
+	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/creasty/defaults v1.5.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/getsentry/raven-go v0.2.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.14.3 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgtype v1.14.0 // indirect
 	github.com/jinzhu/copier v0.3.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5 // indirect
 	github.com/k0kubun/pp v3.0.1+incompatible // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
@@ -80,8 +105,11 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
 	github.com/shirou/gopsutil/v3 v3.22.2 // indirect
+	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -90,7 +118,8 @@ require (
 	go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
@@ -103,9 +132,9 @@ require (
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pelletier/go-toml v1.9.3 // indirect
 	github.com/pingcap/log v0.0.0-20210906054005-afc726e70354 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.37.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	vimagination.zapto.org/memio v0.0.0-20200222190306-588ebc67b97d // indirect
 )
 
@@ -31,6 +31,7 @@ import (
 	"seata.apache.org/seata-go/pkg/protocol/branch"
 	"seata.apache.org/seata-go/pkg/rm"
 	serr "seata.apache.org/seata-go/pkg/util/errors"
+	"seata.apache.org/seata-go/pkg/util/log"
 )
 
 func InitAT(cfg undo.Config, asyncCfg AsyncWorkerConfig) {
@@ -74,20 +75,28 @@ func (a *ATSourceManager) UnregisterResource(res rm.Resource) error {
 
 // BranchRollback rollback a branch transaction
 func (a *ATSourceManager) BranchRollback(ctx context.Context, branchResource rm.BranchResource) (branch.BranchStatus, error) {
+	log.Infof("[BranchRollback] Starting rollback for xid=%s, branchId=%d, resourceId=%s",
+		branchResource.Xid, branchResource.BranchId, branchResource.ResourceId)
+
 	var dbResource *DBResource
 	if resource, ok := a.resourceCache.Load(branchResource.ResourceId); !ok {
 		err := fmt.Errorf("DB resource is not exist, resourceId: %s", branchResource.ResourceId)
+		log.Errorf("[BranchRollback] DB resource not found: %v", err)
 		return branch.BranchStatusUnknown, err
 	} else {
 		dbResource, _ = resource.(*DBResource)
+		log.Infof("[BranchRollback] Found DB resource, dbType=%v, dbName=%s", dbResource.dbType, dbResource.dbName)
 	}
 
 	undoMgr, err := undo.GetUndoLogManager(dbResource.dbType)
 	if err != nil {
+		log.Errorf("[BranchRollback] Failed to get undo log manager: %v", err)
 		return branch.BranchStatusUnknown, err
 	}
 
-	if err := undoMgr.RunUndo(ctx, branchResource.Xid, branchResource.BranchId, dbResource.db, dbResource.dbName); err != nil {
+	log.Infof("[BranchRollback] Calling undoMgr.RunUndo...")
+	if err := undoMgr.RunUndo(ctx, branchResource.Xid, branchResource.BranchId, dbResource.db, dbResource.dbName, dbResource.cfg); err != nil {
+		log.Errorf("[BranchRollback] RunUndo failed: %v", err)
 		transErr, ok := err.(*serr.SeataError)
 		if !ok {
 			return branch.BranchStatusPhaseoneFailed, err
@@ -100,6 +109,7 @@ func (a *ATSourceManager) BranchRollback(ctx context.Context, branchResource rm.
 		return branch.BranchStatusPhasetwoRollbackFailedRetryable, nil
 	}
 
+	log.Infof("[BranchRollback] RunUndo completed successfully")
 	return branch.BranchStatusPhasetwoRollbacked, nil
 }
 
 
@@ -20,6 +20,8 @@ package sql
 import (
 	"context"
 	"database/sql/driver"
+	"fmt"
+	"github.com/pkg/errors"
 
 	"seata.apache.org/seata-go/pkg/datasource/sql/exec"
 	"seata.apache.org/seata-go/pkg/datasource/sql/types"
@@ -37,6 +39,29 @@ type Conn struct {
 	autoCommit bool
 	dbName     string
 	dbType     types.DBType
+	isTestMode bool
+}
+
+// Implement the Connect method of the driver.Connector interface for *Conn
+func (c *Conn) Connect(ctx context.Context) (driver.Conn, error) {
+	// For test scenarios: Return self directly (since *Conn already implements the driver.Conn interface)
+	// No need to create an additional connection; reuse the existing mockDriverConn instance
+	fmt.Printf("[*Conn.Connect] Implement driver.Connector, return self as connection instance → isTestMode=%v\n", c.isTestMode)
+	return c, nil // Return *Conn instance (complies with driver.Conn type requirement)
+}
+
+// (Optional) Implement the Driver method of the driver.Connector interface (required in some scenarios to avoid potential errors)
+func (c *Conn) Driver() driver.Driver {
+	// For test scenarios: Return an empty Driver implementation (or mock Driver)
+	return &mockDriver{}
+}
+
+// Define an empty mockDriver struct (used to implement the driver.Driver interface)
+type mockDriver struct{}
+
+// Implement the Open method of the driver.Driver interface (empty implementation; no real logic needed for test scenarios)
+func (d *mockDriver) Open(name string) (driver.Conn, error) {
+	return nil, errors.New("mockDriver: Open method not implemented (no invocation needed in test scenarios)")
 }
 
 // ResetSession is called prior to executing a query on the connection
@@ -213,10 +238,26 @@ func (c *Conn) Begin() (driver.Tx, error) {
 func (c *Conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
 	if c.txCtx.TransactionMode == types.XAMode {
 		c.autoCommit = false
+
+		var originTx driver.Tx
+		if c.isTestMode {
+			var err error
+			if conn, ok := c.targetConn.(driver.ConnBeginTx); ok {
+				originTx, err = conn.BeginTx(ctx, opts)
+			} else {
+				originTx, err = c.targetConn.Begin()
+			}
+			if err != nil {
+				return nil, fmt.Errorf("xa test mode: targetConn begin tx failed: %w", err)
+			}
+		} else {
+			originTx = nil
+		}
+
 		return newTx(
 			withDriverConn(c),
 			withTxCtx(c.txCtx),
-			withOriginTx(nil),
+			withOriginTx(originTx),
 		)
 	}
 
 
@@ -62,7 +62,9 @@ func (c *ATConn) ExecContext(ctx context.Context, query string, args []driver.Na
 			Query:                query,
 			NamedValues:          args,
 			Conn:                 c.targetConn,
+			DB:                   c.res.GetDB(),
 			DBName:               c.dbName,
+			DBType:               c.res.dbType,
 			DbVersion:            c.GetDbVersion(),
 			IsSupportsSavepoints: true,
 			IsAutoCommit:         c.GetAutoCommit(),