fix integration test cases

Author: dk-lockdown

pkg/listener/mysql.go

@@ -548,8 +548,14 @@ func (l *MysqlListener) ExecuteCommand(ctx context.Context, c *mysql.Conn, data
 				return nil
 			}
 
-			if showStmt, ok := stmt.(*ast.ShowStmt); ok && showStmt.Tp == ast.ShowTables {
-				showStmt.DBName = c.Database()
+			if showStmt, ok := stmt.(*ast.ShowStmt); ok {
+				switch showStmt.Tp {
+				case ast.ShowTables, ast.ShowTableStatus, ast.ShowColumns, ast.ShowIndex, ast.ShowTriggers:
+					if misc.IsBlank(showStmt.DBName) {
+						showStmt.DBName = c.Database()
+					}
+				default:
+				}
 			}
 
 			if !misc.IsBlank(c.Database()) {

pkg/sql/db.go

@@ -19,6 +19,7 @@ package sql
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -31,6 +32,7 @@ import (
 	"github.com/cectc/dbpack/pkg/misc"
 	"github.com/cectc/dbpack/pkg/proto"
 	"github.com/cectc/dbpack/pkg/tracing"
+	"github.com/cectc/dbpack/third_party/parser/format"
 	"github.com/cectc/dbpack/third_party/pools"
 )
 
@@ -363,7 +365,11 @@ func (db *DB) QueryDirectly(query string) (proto.Result, uint16, error) {
 }
 
 func (db *DB) ExecuteStmt(ctx context.Context, stmt *proto.Stmt) (proto.Result, uint16, error) {
-	query := stmt.StmtNode.Text()
+	var sb strings.Builder
+	if err := stmt.StmtNode.Restore(format.NewRestoreCtx(constant.DBPackRestoreFormat, &sb)); err != nil {
+		return nil, 0, err
+	}
+	query := sb.String()
 	spanCtx, span := tracing.GetTraceSpan(ctx, tracing.DBExecStmt)
 	span.SetAttributes(attribute.KeyValue{Key: "db", Value: attribute.StringValue(db.name)},
 		attribute.KeyValue{Key: "sql", Value: attribute.StringValue(query)})

pkg/sql/tx.go

@@ -19,6 +19,7 @@ package sql
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/uber-go/atomic"
 	"go.opentelemetry.io/otel/attribute"
@@ -29,6 +30,7 @@ import (
 	"github.com/cectc/dbpack/pkg/proto"
 	"github.com/cectc/dbpack/pkg/tracing"
 	"github.com/cectc/dbpack/third_party/parser/ast"
+	"github.com/cectc/dbpack/third_party/parser/format"
 )
 
 type Tx struct {
@@ -69,7 +71,11 @@ func (tx *Tx) QueryDirectly(query string) (proto.Result, uint16, error) {
 }
 
 func (tx *Tx) ExecuteStmt(ctx context.Context, stmt *proto.Stmt) (proto.Result, uint16, error) {
-	query := stmt.StmtNode.Text()
+	var sb strings.Builder
+	if err := stmt.StmtNode.Restore(format.NewRestoreCtx(constant.DBPackRestoreFormat, &sb)); err != nil {
+		return nil, 0, err
+	}
+	query := sb.String()
 	spanCtx, span := tracing.GetTraceSpan(ctx, tracing.TxExecStmt)
 	span.SetAttributes(attribute.KeyValue{Key: "db", Value: attribute.StringValue(tx.db.name)},
 		attribute.KeyValue{Key: "sql", Value: attribute.StringValue(query)})