Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed transformation of like node for ci_as collation #3442

Open
wants to merge 2 commits into
base: BABEL_5_X_DEV
Choose a base branch
from
Open

Fixed transformation of like node for ci_as collation #3442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9515de
Fixed transformation of like node for ci_as collation
Jan 31, 2025
5fd4e45
Fixed Collate expr appearing on left node
Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions contrib/babelfishpg_tsql/src/collation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,13 @@ transform_from_ci_as_for_likenode(Node *node, OpExpr *op, like_ilike_info_t like
}

patt = (Const *) rightop;
patt->constcollid = op->inputcollid;

/* we also want left operand to match this expected cs_as collation */
if (IsA(linitial(op->args), CollateExpr))
{
((CollateExpr *) linitial(op->args))->collOid = op->inputcollid;
}

/* extract pattern */
pstatus = pattern_fixed_prefix_wrapper(patt, 1, coll_info_of_inputcollid.oid,
Expand All @@ -409,7 +416,7 @@ transform_from_ci_as_for_likenode(Node *node, OpExpr *op, like_ilike_info_t like
if (pstatus == Pattern_Prefix_Exact)
{
op_str = like_entry.is_not_match ? "<>" : "=";
optup = compatible_oper(NULL, list_make1(makeString(op_str)), ltypeId, ltypeId,
optup = compatible_oper(NULL, list_make1(makeString(op_str)), ltypeId, rtypeId,
true, -1);
if (optup == (Operator) NULL)
return node;
Expand All @@ -429,7 +436,7 @@ transform_from_ci_as_for_likenode(Node *node, OpExpr *op, like_ilike_info_t like
Const *highest_sort_key;

/* construct leftop >= pattern */
optup = compatible_oper(NULL, list_make1(makeString(">=")), ltypeId, ltypeId,
optup = compatible_oper(NULL, list_make1(makeString(">=")), ltypeId, rtypeId,
true, -1);
if (optup == (Operator) NULL)
return node;
Expand All @@ -438,7 +445,7 @@ transform_from_ci_as_for_likenode(Node *node, OpExpr *op, like_ilike_info_t like
InvalidOid, coll_info_of_inputcollid.oid, oprfuncid(optup));
ReleaseSysCache(optup);
/* construct pattern||E'\uFFFF' */
highest_sort_key = makeConst(TEXTOID, -1, coll_info_of_inputcollid.oid, -1,
highest_sort_key = makeConst(TEXTOID, -1, DEFAULT_COLLATION_OID, -1,
PointerGetDatum(cstring_to_text(SORT_KEY_STR)), false, false);

optup = compatible_oper(NULL, list_make1(makeString("||")), rtypeId, rtypeId,
Expand All @@ -447,10 +454,10 @@ transform_from_ci_as_for_likenode(Node *node, OpExpr *op, like_ilike_info_t like
return node;
concat_expr = make_op_with_func(oprid(optup), rtypeId, false,
(Expr *) prefix, (Expr *) highest_sort_key,
InvalidOid, coll_info_of_inputcollid.oid, oprfuncid(optup));
DEFAULT_COLLATION_OID, DEFAULT_COLLATION_OID, oprfuncid(optup));
ReleaseSysCache(optup);
/* construct leftop < pattern */
optup = compatible_oper(NULL, list_make1(makeString("<")), ltypeId, ltypeId,
optup = compatible_oper(NULL, list_make1(makeString("<")), ltypeId, rtypeId,
true, -1);
if (optup == (Operator) NULL)
return node;
Expand Down
Loading