Dear patchers,
Please find my second micro-patch submission for this minor inconsistency.
I put comments about why "SIMILAR TO" cannot be handled simply in the code
rather that in the test, as it seemed more logical.
Have a nice day,
--
Fabien Coelho - [EMAIL PROTECTED]
*** ./src/backend/parser/gram.y.orig Thu Mar 18 09:01:11 2004
--- ./src/backend/parser/gram.y Fri Mar 26 19:23:56 2004
***************
*** 194,200 ****
database_name access_method_clause access_method
attr_name
index_name name function_name file_name
! %type <list> func_name handler_name qual_Op qual_all_Op
opt_class opt_validator
%type <range> qualified_name OptConstrFromTable
--- 194,200 ----
database_name access_method_clause access_method
attr_name
index_name name function_name file_name
! %type <list> func_name handler_name qual_Op qual_all_Op subquery_Op
opt_class opt_validator
%type <range> qualified_name OptConstrFromTable
***************
*** 5692,5698 ****
/* Stick a NOT on top */
$$ = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL,
(Node *) n);
}
! | row qual_all_Op sub_type select_with_parens
%prec Op
{
SubLink *n = makeNode(SubLink);
--- 5692,5698 ----
/* Stick a NOT on top */
$$ = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL,
(Node *) n);
}
! | row subquery_Op sub_type select_with_parens
%prec Op
{
SubLink *n = makeNode(SubLink);
***************
*** 5702,5708 ****
n->subselect = $4;
$$ = (Node *)n;
}
! | row qual_all_Op select_with_parens
%prec Op
{
SubLink *n = makeNode(SubLink);
--- 5702,5708 ----
n->subselect = $4;
$$ = (Node *)n;
}
! | row subquery_Op select_with_parens
%prec Op
{
SubLink *n = makeNode(SubLink);
***************
*** 5712,5718 ****
n->subselect = $3;
$$ = (Node *)n;
}
! | row qual_all_Op row
%prec Op
{
$$ = makeRowExpr($2, $1, $3);
--- 5712,5718 ----
n->subselect = $3;
$$ = (Node *)n;
}
! | row subquery_Op row
%prec Op
{
$$ = makeRowExpr($2, $1, $3);
***************
*** 5807,5812 ****
--- 5807,5829 ----
| OPERATOR '(' any_operator ')' { $$ = $3; }
;
+ subquery_Op:
+ all_Op { $$ = makeList1(makeString($1)); }
+ | OPERATOR '(' any_operator ')' { $$ = $3; }
+ | LIKE { $$ = makeList1(makeString("~~")); }
+ | NOT LIKE { $$ = makeList1(makeString("!~~")); }
+ | ILIKE { $$ = makeList1(makeString("~~*")); }
+ | NOT ILIKE { $$ = makeList1(makeString("!~~*")); }
+ /* cannot put SIMILAR TO here, because SIMILAR TO is a hack.
+ * the regular expression is preprocessed by a function (similar_escape),
+ * and the ~ operator for posix regular expressions is used.
+ * x SIMILAR TO y -> x ~ similar_escape(y)
+ * this transformation is made on the fly by the parser upwards.
+ * however the SubLink structure which handles any/some/all stuff
+ * is not ready for such a thing.
+ */
+ ;
+
/*
* General expressions
* This is the heart of the expression syntax.
***************
*** 6132,6138 ****
$$ = n;
}
}
! | a_expr qual_all_Op sub_type select_with_parens %prec Op
{
SubLink *n = makeNode(SubLink);
n->subLinkType = $3;
--- 6149,6155 ----
$$ = n;
}
}
! | a_expr subquery_Op sub_type select_with_parens %prec Op
{
SubLink *n = makeNode(SubLink);
n->subLinkType = $3;
***************
*** 6141,6147 ****
n->subselect = $4;
$$ = (Node *)n;
}
! | a_expr qual_all_Op sub_type '(' a_expr ')' %prec Op
{
if ($3 == ANY_SUBLINK)
$$ = (Node *) makeA_Expr(AEXPR_OP_ANY,
$2, $1, $5);
--- 6158,6164 ----
n->subselect = $4;
$$ = (Node *)n;
}
! | a_expr subquery_Op sub_type '(' a_expr ')' %prec Op
{
if ($3 == ANY_SUBLINK)
$$ = (Node *) makeA_Expr(AEXPR_OP_ANY,
$2, $1, $5);
*** ./src/test/regress/expected/arrays.out.orig Thu Mar 25 15:59:21 2004
--- ./src/test/regress/expected/arrays.out Fri Mar 26 19:26:19 2004
***************
*** 377,379 ****
--- 377,428 ----
-- note: if above select doesn't produce the expected tuple order,
-- then you didn't get an indexscan plan, and something is busted.
+ -- test [not] (like|ilike) (any|all) (...)
+ select 'foo' like any (array['%a', '%o']); -- t
+ ?column?
+ ----------
+ t
+ (1 row)
+
+ select 'foo' like any (array['%a', '%b']); -- f
+ ?column?
+ ----------
+ f
+ (1 row)
+
+ select 'foo' like all (array['f%', '%o']); -- t
+ ?column?
+ ----------
+ t
+ (1 row)
+
+ select 'foo' like all (array['f%', '%b']); -- f
+ ?column?
+ ----------
+ f
+ (1 row)
+
+ select 'foo' not like any (array['%a', '%b']); -- t
+ ?column?
+ ----------
+ t
+ (1 row)
+
+ select 'foo' not like all (array['%a', '%o']); -- f
+ ?column?
+ ----------
+ f
+ (1 row)
+
+ select 'foo' ilike any (array['%A', '%O']); -- t
+ ?column?
+ ----------
+ t
+ (1 row)
+
+ select 'foo' ilike all (array['F%', '%O']); -- t
+ ?column?
+ ----------
+ t
+ (1 row)
+
*** ./src/test/regress/sql/arrays.sql.orig Mon Aug 18 01:43:27 2003
--- ./src/test/regress/sql/arrays.sql Fri Mar 26 19:21:44 2004
***************
*** 183,185 ****
--- 183,195 ----
select * from arr_tbl where f1 > '{1,2,3}' and f1 <= '{1,5,3}';
-- note: if above select doesn't produce the expected tuple order,
-- then you didn't get an indexscan plan, and something is busted.
+
+ -- test [not] (like|ilike) (any|all) (...)
+ select 'foo' like any (array['%a', '%o']); -- t
+ select 'foo' like any (array['%a', '%b']); -- f
+ select 'foo' like all (array['f%', '%o']); -- t
+ select 'foo' like all (array['f%', '%b']); -- f
+ select 'foo' not like any (array['%a', '%b']); -- t
+ select 'foo' not like all (array['%a', '%o']); -- f
+ select 'foo' ilike any (array['%A', '%O']); -- t
+ select 'foo' ilike all (array['F%', '%O']); -- t
---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster
