Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(sql): record the statement SQL Server and Spanner ran (#21476)

Danny Xu7c1b6bb52669
diff --git a/backend/plugin/db/mssql/mssql.go b/backend/plugin/db/mssql/mssql.go
index f964ed4032..72647a08fe 100644
--- a/backend/plugin/db/mssql/mssql.go
+++ b/backend/plugin/db/mssql/mssql.go
@@ -506,6 +506,7 @@ func (*Driver) queryBatch(ctx context.Context, conn *sql.Conn, batch string, que
// Regular query processing for non-EXPLAIN queries
startTime := time.Now()
var stmtTypes []stmtType
+ var refinedSQLs []string
batchBuf := new(strings.Builder)
for _, singleSQL := range singleSQLs {
stmtType, err := getStmtType(singleSQL.Text)
@@ -518,6 +519,7 @@ func (*Driver) queryBatch(ctx context.Context, conn *sql.Conn, batch string, que
if queryContext.Limit > 0 {
s = getStatementWithResultLimit(s, queryContext.Limit)
}
+ refinedSQLs = append(refinedSQLs, s)
if _, err := batchBuf.WriteString(s); err != nil {
return nil, err
}
@@ -604,7 +606,7 @@ func (*Driver) queryBatch(ctx context.Context, conn *sql.Conn, batch string, que
latency := time.Since(startTime)
for i, res := range ret {
res.Latency = durationpb.New(latency)
- res.Statement = singleSQLs[i].Text
+ res.Statement = refinedSQLs[i]
}
return ret, nil
diff --git a/backend/plugin/db/mssql/mssql_test.go b/backend/plugin/db/mssql/mssql_test.go
index c51ee1916a..93a2a32474 100644
--- a/backend/plugin/db/mssql/mssql_test.go
+++ b/backend/plugin/db/mssql/mssql_test.go
@@ -1,11 +1,14 @@
package mssql
import (
+ "context"
"testing"
"github.com/stretchr/testify/require"
+ "github.com/bytebase/bytebase/backend/common/testcontainer"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+ "github.com/bytebase/bytebase/backend/plugin/db"
)
func TestShowplanStatistic(t *testing.T) {
@@ -32,3 +35,25 @@ func TestShowplanStatistic(t *testing.T) {
})
}
}
+
+func TestQueryConnRecordsLimitedStatement(t *testing.T) {
+ t.Parallel()
+ ctx := context.Background()
+ driver := newSyncTestDatabase(ctx, t, testcontainer.SharedMSSQLContainer(t))
+ executeBatches(ctx, t, driver, "CREATE TABLE dbo.t (id INT PRIMARY KEY);\nINSERT INTO dbo.t VALUES (1), (2), (3);")
+
+ conn, err := driver.GetDB().Conn(ctx)
+ require.NoError(t, err)
+ defer conn.Close()
+
+ // SET returns nothing, so the driver pads an empty result in for it.
+ results, err := driver.QueryConn(ctx, conn, "SET NOCOUNT OFF;\nSELECT TOP 3 id FROM dbo.t ORDER BY id;", db.QueryContext{
+ Limit: 2,
+ MaximumSQLResultSize: 1 << 30,
+ })
+ require.NoError(t, err)
+ require.Len(t, results, 2)
+ require.Equal(t, "SET NOCOUNT OFF;", results[0].GetStatement())
+ require.Equal(t, "\nSELECT TOP 2 id FROM dbo.t ORDER BY id;", results[1].GetStatement())
+ require.Len(t, results[1].GetRows(), 2)
+}
diff --git a/backend/plugin/db/spanner/spanner.go b/backend/plugin/db/spanner/spanner.go
index 06129c76c5..c1cf1849bf 100644
--- a/backend/plugin/db/spanner/spanner.go
+++ b/backend/plugin/db/spanner/spanner.go
@@ -358,11 +358,10 @@ func (d *Driver) QueryConn(ctx context.Context, _ *sql.Conn, statement string, q
queryResult, err := func() (*v1pb.QueryResult, error) {
if util.IsSelect(statement) {
// Only apply limit wrapper for SELECT statements
- limitedStatement := statement
if queryContext.Limit > 0 {
- limitedStatement = getStatementWithResultLimit(statement, queryContext.Limit)
+ statement = getStatementWithResultLimit(statement, queryContext.Limit)
}
- return d.queryStatement(ctx, limitedStatement, queryContext)
+ return d.queryStatement(ctx, statement, queryContext)
}
if util.IsDDL(statement) {
op, err := d.dbClient.UpdateDatabaseDdl(ctx, &databasepb.UpdateDatabaseDdlRequest{