Merge branch 'slack-19.0' into vitess-addons-0.19.8

slackhq · Jan 24, 2025 · a0f2a05 · a0f2a05
2 parents c845496 + 3f20a9d
commit a0f2a05
Show file tree

Hide file tree

Showing 16 changed files with 6,336 additions and 6,308 deletions.
diff --git a/go/test/endtoend/vtgate/queries/misc/misc_test.go b/go/test/endtoend/vtgate/queries/misc/misc_test.go
@@ -214,6 +214,7 @@ func TestHighNumberOfParams(t *testing.T) {
 }
 
 func TestPrepareStatements(t *testing.T) {
+	utils.SkipIfBinaryIsBelowVersion(t, 17, "vtgate")
 	mcmp, closer := start(t)
 	defer closer()
 

diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -2498,7 +2498,7 @@ type (
 	// supported functions are documented in the grammar
 	CurTimeFuncExpr struct {
 		Name IdentifierCI
-		Fsp  int // fractional seconds precision, integer from 0 to 6 or an Argument
+		Fsp  Expr // fractional seconds precision, integer from 0 to 6 or an Argument
 	}
 
 	// JSONPrettyExpr represents the function and argument for JSON_PRETTY()

diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
diff --git a/go/vt/sqlparser/ast_copy_on_rewrite.go b/go/vt/sqlparser/ast_copy_on_rewrite.go
diff --git a/go/vt/sqlparser/ast_equals.go b/go/vt/sqlparser/ast_equals.go
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -1548,8 +1548,8 @@ func (node *WeightStringFuncExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *CurTimeFuncExpr) Format(buf *TrackedBuffer) {
-	if node.Fsp > 0 {
-		buf.astPrintf(node, "%#s(%d)", node.Name.String(), node.Fsp)
+	if node.Fsp != nil {
+		buf.astPrintf(node, "%#s(%v)", node.Name.String(), node.Fsp)
 	} else {
 		buf.astPrintf(node, "%#s()", node.Name.String())
 	}

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
diff --git a/go/vt/sqlparser/ast_rewrite.go b/go/vt/sqlparser/ast_rewrite.go
diff --git a/go/vt/sqlparser/ast_visit.go b/go/vt/sqlparser/ast_visit.go
diff --git a/go/vt/sqlparser/cached_size.go b/go/vt/sqlparser/cached_size.go
diff --git a/go/vt/sqlparser/normalizer.go b/go/vt/sqlparser/normalizer.go
@@ -68,6 +68,10 @@ func (nz *normalizer) walkStatementUp(cursor *Cursor) bool {
 	if !isLiteral {
 		return true
 	}
+	_, isCurTimeFunc := cursor.Parent().(*CurTimeFuncExpr)
+	if isCurTimeFunc {
+		return true
+	}
 	nz.convertLiteral(node, cursor)
 	return nz.err == nil // only continue if we haven't found any errors
 }
@@ -133,6 +137,8 @@ func (nz *normalizer) walkDownSelect(node, parent SQLNode) bool {
 	case *ConvertType:
 		// we should not rewrite the type description
 		return false
+	case *CurTimeFuncExpr:
+		return false
 	}
 	return nz.err == nil // only continue if we haven't found any errors
 }

diff --git a/go/vt/sqlparser/normalizer_test.go b/go/vt/sqlparser/normalizer_test.go
@@ -421,6 +421,18 @@ func TestNormalize(t *testing.T) {
 			"bv1": sqltypes.Int64BindVariable(1),
 			"bv2": sqltypes.Int64BindVariable(0),
 		},
+	}, {
+		// we don't want to replace literals in cur time function calls.
+		in:      `insert into t1(id2) values (NOW(1))`,
+		outstmt: `insert into t1(id2) values (now(1))`,
+		outbv:   map[string]*querypb.BindVariable{},
+	}, {
+		// we don't want to replace literals in cur time function calls.
+		in:      `select (select now(2)) from (select 1 from dual where NOW(1) < 2) as t`,
+		outstmt: `select (select now(2) from dual) from (select 1 from dual where now(1) < :bv1 /* INT64 */) as t`,
+		outbv: map[string]*querypb.BindVariable{
+			"bv1": sqltypes.Int64BindVariable(2),
+		},
 	}}
 	parser := NewTestParser()
 	for _, tc := range testcases {

diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -1045,6 +1045,8 @@ var (
 		input: "select /* utc_timestamp as func */ utc_timestamp() from t",
 	}, {
 		input: "select /* utc_timestamp with fsp */ utc_timestamp(1) from t",
+	}, {
+		input: "select /* utc_timestamp with fsp */ utc_timestamp(:val1) from t",
 	}, {
 		input: "select /* utc_time */ utc_time() from t",
 	}, {