sql: remove unnecessary casts in @@ operator type-checking

Release note: None
cockroachdb · Apr 5, 2023 · 7cfbd81 · 7cfbd81
1 parent 3d96b13
commit 7cfbd81
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/tsvector b/pkg/sql/logictest/testdata/logic_test/tsvector
@@ -402,10 +402,10 @@ SELECT 'fat cats ate fat bats' @@ a FROM ab
 ----
 false
 
-statement error pq: syntax error in TSQuery: fat cats chased fat, out of shape rats
+statement error pgcode 22023 unsupported comparison operator: <string> @@ <tsvector>
 SELECT b @@ a::tsvector FROM ab
 
-statement error pq: syntax error in TSQuery: fat cats chased fat, out of shape rats
+statement error pgcode 22023 unsupported comparison operator: <tsvector> @@ <string>
 SELECT a::tsvector @@ b FROM ab
 
 query B
@@ -418,9 +418,20 @@ SELECT 'bats fats' @@ 'fat bat cat'
 ----
 false
 
-statement error pq: syntax error in TSQuery: fat cats chased fat, out of shape rats
+query B
+SELECT 'fat' @@ 'fat rats'::tsvector
+----
+true
+
+# TODO(#75101): The error should be "syntax error in TSQuery".
+statement error pgcode 22023 unsupported comparison operator: <string> @@ <tsvector>
 SELECT 'fat cats chased fat, out of shape rats' @@ 'fat rats'::tsvector
 
-statement error pq: syntax error in TSQuery: fat cats chased fat, out of shape rats
-SELECT 'fat rats'::tsvector @@ 'fat cats chased fat, out of shape rats'
+query B
+SELECT 'fat rats'::tsvector @@ 'fat'
+----
+true
 
+# TODO(#75101): The error should be "syntax error in TSQuery".
+statement error pgcode 22023 unsupported comparison operator: <tsvector> @@ <string>
+SELECT 'fat rats'::tsvector @@ 'fat cats chased fat, out of shape rats'
diff --git a/pkg/sql/sem/tree/type_check.go b/pkg/sql/sem/tree/type_check.go
@@ -2345,8 +2345,6 @@ func typeCheckComparisonOp(
 				leftExprs := make(Exprs, 1)
 				leftExprs[0] = typedLeft
 				foldedLeft = &FuncExpr{Func: WrapFunction("to_tsvector"), Exprs: leftExprs, AggType: GeneralAgg}
-			} else if rightFamily == types.TSVectorFamily {
-				foldedLeft = &CastExpr{Expr: typedLeft, Type: types.TSQuery, SyntaxMode: CastShort}
 			}
 		}
 
@@ -2359,8 +2357,6 @@ func typeCheckComparisonOp(
 				rightExprs := make(Exprs, 1)
 				rightExprs[0] = typedRight
 				foldedRight = &FuncExpr{Func: WrapFunction(funcName), Exprs: rightExprs, AggType: GeneralAgg}
-			} else if leftFamily == types.TSVectorFamily {
-				foldedRight = &CastExpr{Expr: typedRight, Type: types.TSQuery, SyntaxMode: CastShort}
 			}
 		}
 	}