Allow LIKE/ILIKE to appear in more places in a query.

bmomjian · bmomjian · commit 0969dc867b9e · 2004-04-05T03:07:26.000Z
Fabien COELHO
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.449 2004/03/17 20:48:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.450 2004/04/05 03:07:26 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -194,7 +194,7 @@ static void doNegateFloat(Value *v);
 				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
+%type <list>	func_name handler_name qual_Op qual_all_Op subquery_Op
 				opt_class opt_validator
 
 %type <range>	qualified_name OptConstrFromTable
@@ -5692,7 +5692,7 @@ r_expr:  row IN_P select_with_parens
 					/* Stick a NOT on top */
 					$$ = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL, (Node *) n);
 				}
-			| row qual_all_Op sub_type select_with_parens
+			| row subquery_Op sub_type select_with_parens
 			%prec Op
 				{
 					SubLink *n = makeNode(SubLink);
@@ -5702,7 +5702,7 @@ r_expr:  row IN_P select_with_parens
 					n->subselect = $4;
 					$$ = (Node *)n;
 				}
-			| row qual_all_Op select_with_parens
+			| row subquery_Op select_with_parens
 			%prec Op
 				{
 					SubLink *n = makeNode(SubLink);
@@ -5712,7 +5712,7 @@ r_expr:  row IN_P select_with_parens
 					n->subselect = $3;
 					$$ = (Node *)n;
 				}
-			| row qual_all_Op row
+			| row subquery_Op row
 			%prec Op
 				{
 					$$ = makeRowExpr($2, $1, $3);
@@ -5807,6 +5807,23 @@ qual_all_Op:
 			| 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,7 +6149,7 @@ a_expr:		c_expr									{ $$ = $1; }
 						$$ = n;
 					}
 				}
-			| a_expr qual_all_Op sub_type select_with_parens %prec Op
+			| a_expr subquery_Op sub_type select_with_parens %prec Op
 				{
 					SubLink *n = makeNode(SubLink);
 					n->subLinkType = $3;
@@ -6141,7 +6158,7 @@ a_expr:		c_expr									{ $$ = $1; }
 					n->subselect = $4;
 					$$ = (Node *)n;
 				}
-			| a_expr qual_all_Op sub_type '(' a_expr ')' %prec Op
+			| a_expr subquery_Op sub_type '(' a_expr ')' %prec Op
 				{
 					if ($3 == ANY_SUBLINK)
 						$$ = (Node *) makeA_Expr(AEXPR_OP_ANY, $2, $1, $5);
diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out
@@ -377,3 +377,52 @@ 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
+ ?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)
+
diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql
@@ -183,3 +183,13 @@ set enable_seqscan to off;
 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

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.449 2004/03/17 20:48:42 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.450 2004/04/05 03:07:26 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -194,7 +194,7 @@ static void doNegateFloat(Value *v);`
`194`	`194`	`database_name access_method_clause access_method attr_name`
`195`	`195`	`index_name name function_name file_name`
`196`	`196`
`197`		`-%type <list> func_name handler_name qual_Op qual_all_Op`
	`197`	`+%type <list> func_name handler_name qual_Op qual_all_Op subquery_Op`
`198`	`198`	`opt_class opt_validator`
`199`	`199`
`200`	`200`	`%type <range> qualified_name OptConstrFromTable`
`@@ -5692,7 +5692,7 @@ r_expr: row IN_P select_with_parens`
`5692`	`5692`	`/* Stick a NOT on top */`
`5693`	`5693`	`$$ = (Node ) makeA_Expr(AEXPR_NOT, NIL, NULL, (Node ) n);`
`5694`	`5694`	`}`
`5695`		`- \| row qual_all_Op sub_type select_with_parens`
	`5695`	`+ \| row subquery_Op sub_type select_with_parens`
`5696`	`5696`	`%prec Op`
`5697`	`5697`	`{`
`5698`	`5698`	`SubLink *n = makeNode(SubLink);`
`@@ -5702,7 +5702,7 @@ r_expr: row IN_P select_with_parens`
`5702`	`5702`	`n->subselect = $4;`
`5703`	`5703`	`$$ = (Node *)n;`
`5704`	`5704`	`}`
`5705`		`- \| row qual_all_Op select_with_parens`
	`5705`	`+ \| row subquery_Op select_with_parens`
`5706`	`5706`	`%prec Op`
`5707`	`5707`	`{`
`5708`	`5708`	`SubLink *n = makeNode(SubLink);`
`@@ -5712,7 +5712,7 @@ r_expr: row IN_P select_with_parens`
`5712`	`5712`	`n->subselect = $3;`
`5713`	`5713`	`$$ = (Node *)n;`
`5714`	`5714`	`}`
`5715`		`- \| row qual_all_Op row`
	`5715`	`+ \| row subquery_Op row`
`5716`	`5716`	`%prec Op`
`5717`	`5717`	`{`
`5718`	`5718`	`$$ = makeRowExpr($2, $1, $3);`
`@@ -5807,6 +5807,23 @@ qual_all_Op:`
`5807`	`5807`	`\| OPERATOR '(' any_operator ')' { $$ = $3; }`
`5808`	`5808`	`;`
`5809`	`5809`
	`5810`	`+subquery_Op:`
	`5811`	`+ all_Op { $$ = makeList1(makeString($1)); }`
	`5812`	`+ \| OPERATOR '(' any_operator ')' { $$ = $3; }`
	`5813`	`+ \| LIKE { $$ = makeList1(makeString("~~")); }`
	`5814`	`+ \| NOT LIKE { $$ = makeList1(makeString("!~~")); }`
	`5815`	`+ \| ILIKE { $$ = makeList1(makeString("~~*")); }`
	`5816`	`+ \| NOT ILIKE { $$ = makeList1(makeString("!~~*")); }`
	`5817`	`+/* cannot put SIMILAR TO here, because SIMILAR TO is a hack.`
	`5818`	`+ * the regular expression is preprocessed by a function (similar_escape),`
	`5819`	`+ * and the ~ operator for posix regular expressions is used.`
	`5820`	`+ * x SIMILAR TO y -> x ~ similar_escape(y)`
	`5821`	`+ * this transformation is made on the fly by the parser upwards.`
	`5822`	`+ * however the SubLink structure which handles any/some/all stuff`
	`5823`	`+ * is not ready for such a thing.`
	`5824`	`+ */`
	`5825`	`+ ;`
	`5826`	`+`
`5810`	`5827`	`/*`
`5811`	`5828`	`* General expressions`
`5812`	`5829`	`* This is the heart of the expression syntax.`
`@@ -6132,7 +6149,7 @@ a_expr: c_expr { $$ = $1; }`
`6132`	`6149`	`$$ = n;`
`6133`	`6150`	`}`
`6134`	`6151`	`}`
`6135`		`- \| a_expr qual_all_Op sub_type select_with_parens %prec Op`
	`6152`	`+ \| a_expr subquery_Op sub_type select_with_parens %prec Op`
`6136`	`6153`	`{`
`6137`	`6154`	`SubLink *n = makeNode(SubLink);`
`6138`	`6155`	`n->subLinkType = $3;`
`@@ -6141,7 +6158,7 @@ a_expr: c_expr { $$ = $1; }`
`6141`	`6158`	`n->subselect = $4;`
`6142`	`6159`	`$$ = (Node *)n;`
`6143`	`6160`	`}`
`6144`		`- \| a_expr qual_all_Op sub_type '(' a_expr ')' %prec Op`
	`6161`	`+ \| a_expr subquery_Op sub_type '(' a_expr ')' %prec Op`
`6145`	`6162`	`{`
`6146`	`6163`	`if ($3 == ANY_SUBLINK)`
`6147`	`6164`	`$$ = (Node *) makeA_Expr(AEXPR_OP_ANY, $2, $1, $5);`