Allow schema-qualified operator names to be used in the optional

tglsfdc · tglsfdc · commit a5e6e9935714 · 2002-08-10T19:01:53.000Z
arguments of CREATE OPERATOR.
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.29 2002/05/18 15:44:47 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.30 2002/08/10 19:01:53 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -437,6 +437,15 @@ MYBOXES.description === box '((0,0), (1,1))'
     Refer to <command>DROP OPERATOR</command> to delete
     user-defined operators from a database.
    </para>
+
+   <para>
+    To give a schema-qualified operator name in <replaceable
+    class="parameter">com_op</replaceable> or the other optional
+    arguments, use the <literal>OPERATOR()</> syntax, for example
+<programlisting>
+   COMMUTATOR = OPERATOR(myschema.===) ,
+</programlisting>  
+   </para>
   </refsect2>
  </refsect1>
   
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.64 2002/08/05 19:43:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.65 2002/08/10 19:01:53 tgl Exp $
 -->
 
 <chapter id="sql-syntax">
@@ -755,7 +755,7 @@ SELECT (5 !) - 6;
       </row>
 
       <row>
-       <entry><token>LIKE</token> <token>ILIKE</token></entry>
+       <entry><token>LIKE</token> <token>ILIKE</token> <token>SIMILAR</token></entry>
        <entry></entry>
        <entry>string pattern matching</entry>
       </row>
@@ -801,6 +801,17 @@ SELECT (5 !) - 6;
     the same precedence as the built-in <quote>+</quote> operator, no
     matter what yours does.
    </para>
+
+   <para>
+    When a schema-qualified operator name is used in the
+    <literal>OPERATOR</> syntax, as for example in
+<programlisting>
+SELECT 3 OPERATOR(pg_catalog.+) 4;
+</programlisting>
+    the <literal>OPERATOR</> construct is taken to have the default precedence
+    shown above for <quote>any other</> operator.  This is true no matter
+    which specific operator name appears inside <literal>OPERATOR()</>.
+   </para>
   </sect2>
  </sect1>
 
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.78 2002/06/20 20:29:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.79 2002/08/10 19:01:53 tgl Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -35,6 +35,7 @@
 #include <ctype.h>
 #include <math.h>
 
+#include "catalog/namespace.h"
 #include "commands/defrem.h"
 #include "parser/parse_type.h"
 #include "utils/int8.h"
@@ -86,6 +87,8 @@ defGetString(DefElem *def)
 			return strVal(def->arg);
 		case T_TypeName:
 			return TypeNameToString((TypeName *) def->arg);
+		case T_List:
+			return NameListToString((List *) def->arg);
 		default:
 			elog(ERROR, "Define: cannot interpret argument of \"%s\"",
 				 def->defname);
@@ -156,6 +159,8 @@ defGetQualifiedName(DefElem *def)
 	{
 		case T_TypeName:
 			return ((TypeName *) def->arg)->names;
+		case T_List:
+			return (List *) def->arg;
 		case T_String:
 			/* Allow quoted name for backwards compatibility */
 			return makeList1(def->arg);
@@ -168,6 +173,9 @@ defGetQualifiedName(DefElem *def)
 
 /*
  * Extract a TypeName from a DefElem.
+ *
+ * Note: we do not accept a List arg here, because the parser will only
+ * return a bare List when the name looks like an operator name.
  */
 TypeName *
 defGetTypeName(DefElem *def)
@@ -223,11 +231,14 @@ defGetTypeLength(DefElem *def)
 						   "variable") == 0)
 				return -1;		/* variable length */
 			break;
+		case T_List:
+			/* must be an operator name */
+			break;
 		default:
 			elog(ERROR, "Define: cannot interpret argument of \"%s\"",
 				 def->defname);
 	}
-	elog(ERROR, "Define: invalid argument for \"%s\"",
-		 def->defname);
+	elog(ERROR, "Define: invalid argument for \"%s\": \"%s\"",
+		 def->defname, defGetString(def));
 	return 0;					/* keep compiler quiet */
 }
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.357 2002/08/06 05:40:45 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.358 2002/08/10 19:01:53 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -1307,27 +1307,19 @@ copy_opt_list:
 copy_opt_item:
 			BINARY
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "binary";
-					$$->arg = (Node *)makeInteger(TRUE);
+					$$ = makeDefElem("binary", (Node *)makeInteger(TRUE));
 				}
 			| OIDS
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "oids";
-					$$->arg = (Node *)makeInteger(TRUE);
+					$$ = makeDefElem("oids", (Node *)makeInteger(TRUE));
 				}
 			| DELIMITER opt_as Sconst
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "delimiter";
-					$$->arg = (Node *)makeString($3);
+					$$ = makeDefElem("delimiter", (Node *)makeString($3));
 				}
 			| NULL_P opt_as Sconst
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "null";
-					$$->arg = (Node *)makeString($3);
+					$$ = makeDefElem("null", (Node *)makeString($3));
 				}
 		;
 
@@ -1336,19 +1328,15 @@ copy_opt_item:
 opt_binary:
 			BINARY
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "binary";
-					$$->arg = (Node *)makeInteger(TRUE);
+					$$ = makeDefElem("binary", (Node *)makeInteger(TRUE));
 				}
 			| /*EMPTY*/								{ $$ = NULL; }
 		;
 
 opt_oids:
 			WITH OIDS
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "oids";
-					$$->arg = (Node *)makeInteger(TRUE);
+					$$ = makeDefElem("oids", (Node *)makeInteger(TRUE));
 				}
 			| /*EMPTY*/								{ $$ = NULL; }
 		;
@@ -1357,9 +1345,7 @@ copy_delimiter:
 			/* USING DELIMITERS kept for backward compatibility. 2002-06-15 */
 			opt_using DELIMITERS Sconst
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "delimiter";
-					$$->arg = (Node *)makeString($3);
+					$$ = makeDefElem("delimiter", (Node *)makeString($3));
 				}
 			| /*EMPTY*/								{ $$ = NULL; }
 		;
@@ -2276,7 +2262,7 @@ def_elem:  ColLabel '=' def_arg
 
 /* Note: any simple identifier will be returned as a type name! */
 def_arg:	func_return						{ $$ = (Node *)$1; }
-			| all_Op						{ $$ = (Node *)makeString($1); }
+			| qual_all_Op					{ $$ = (Node *)$1; }
 			| NumericOnly					{ $$ = (Node *)$1; }
 			| Sconst						{ $$ = (Node *)makeString($1); }
 		;
@@ -3568,27 +3554,19 @@ createdb_opt_list:
 createdb_opt_item:
 			LOCATION opt_equal Sconst
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "location";
-					$$->arg = (Node *)makeString($3);
+					$$ = makeDefElem("location", (Node *)makeString($3));
 				}
 			| LOCATION opt_equal DEFAULT
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "location";
-					$$->arg = NULL;
+					$$ = makeDefElem("location", NULL);
 				}
 			| TEMPLATE opt_equal name
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "template";
-					$$->arg = (Node *)makeString($3);
+					$$ = makeDefElem("template", (Node *)makeString($3));
 				}
 			| TEMPLATE opt_equal DEFAULT
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "template";
-					$$->arg = NULL;
+					$$ = makeDefElem("template", NULL);
 				}
 			| ENCODING opt_equal Sconst
 				{
@@ -3598,9 +3576,7 @@ createdb_opt_item:
 						elog(ERROR, "%s is not a valid encoding name", $3);
 					encoding = pg_char_to_encoding($3);
 
-					$$ = makeNode(DefElem);
-					$$->defname = "encoding";
-					$$->arg = (Node *)makeInteger(encoding);
+					$$ = makeDefElem("encoding", (Node *)makeInteger(encoding));
 				}
 			| ENCODING opt_equal Iconst
 				{
@@ -3610,27 +3586,19 @@ createdb_opt_item:
 					if (!strcmp(encoding_name,"") ||
 					    pg_valid_server_encoding(encoding_name) < 0)
 						elog(ERROR, "%d is not a valid encoding code", $3);
-					$$ = makeNode(DefElem);
-					$$->defname = "encoding";
-					$$->arg = (Node *)makeInteger($3);
+					$$ = makeDefElem("encoding", (Node *)makeInteger($3));
 				}
 			| ENCODING opt_equal DEFAULT
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "encoding";
-					$$->arg = (Node *)makeInteger(-1);
+					$$ = makeDefElem("encoding", (Node *)makeInteger(-1));
 				}
 			| OWNER opt_equal name
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "owner";
-					$$->arg = (Node *)makeString($3);
+					$$ = makeDefElem("owner", (Node *)makeString($3));
 				}
 			| OWNER opt_equal DEFAULT
 				{
-					$$ = makeNode(DefElem);
-					$$->defname = "owner";
-					$$->arg = NULL;
+					$$ = makeDefElem("owner", NULL);
 				}
 		;
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.357 2002/08/06 05:40:45 ishii Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.358 2002/08/10 19:01:53 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -1307,27 +1307,19 @@ copy_opt_list:`
`1307`	`1307`	`copy_opt_item:`
`1308`	`1308`	`BINARY`
`1309`	`1309`	`{`
`1310`		`- $$ = makeNode(DefElem);`
`1311`		`- $$->defname = "binary";`
`1312`		`- $$->arg = (Node *)makeInteger(TRUE);`
	`1310`	`+ $$ = makeDefElem("binary", (Node *)makeInteger(TRUE));`
`1313`	`1311`	`}`
`1314`	`1312`	`\| OIDS`
`1315`	`1313`	`{`
`1316`		`- $$ = makeNode(DefElem);`
`1317`		`- $$->defname = "oids";`
`1318`		`- $$->arg = (Node *)makeInteger(TRUE);`
	`1314`	`+ $$ = makeDefElem("oids", (Node *)makeInteger(TRUE));`
`1319`	`1315`	`}`
`1320`	`1316`	`\| DELIMITER opt_as Sconst`
`1321`	`1317`	`{`
`1322`		`- $$ = makeNode(DefElem);`
`1323`		`- $$->defname = "delimiter";`
`1324`		`- $$->arg = (Node *)makeString($3);`
	`1318`	`+ $$ = makeDefElem("delimiter", (Node *)makeString($3));`
`1325`	`1319`	`}`
`1326`	`1320`	`\| NULL_P opt_as Sconst`
`1327`	`1321`	`{`
`1328`		`- $$ = makeNode(DefElem);`
`1329`		`- $$->defname = "null";`
`1330`		`- $$->arg = (Node *)makeString($3);`
	`1322`	`+ $$ = makeDefElem("null", (Node *)makeString($3));`
`1331`	`1323`	`}`
`1332`	`1324`	`;`
`1333`	`1325`
`@@ -1336,19 +1328,15 @@ copy_opt_item:`
`1336`	`1328`	`opt_binary:`
`1337`	`1329`	`BINARY`
`1338`	`1330`	`{`
`1339`		`- $$ = makeNode(DefElem);`
`1340`		`- $$->defname = "binary";`
`1341`		`- $$->arg = (Node *)makeInteger(TRUE);`
	`1331`	`+ $$ = makeDefElem("binary", (Node *)makeInteger(TRUE));`
`1342`	`1332`	`}`
`1343`	`1333`	`\| /EMPTY/ { $$ = NULL; }`
`1344`	`1334`	`;`
`1345`	`1335`
`1346`	`1336`	`opt_oids:`
`1347`	`1337`	`WITH OIDS`
`1348`	`1338`	`{`
`1349`		`- $$ = makeNode(DefElem);`
`1350`		`- $$->defname = "oids";`
`1351`		`- $$->arg = (Node *)makeInteger(TRUE);`
	`1339`	`+ $$ = makeDefElem("oids", (Node *)makeInteger(TRUE));`
`1352`	`1340`	`}`
`1353`	`1341`	`\| /EMPTY/ { $$ = NULL; }`
`1354`	`1342`	`;`
`@@ -1357,9 +1345,7 @@ copy_delimiter:`
`1357`	`1345`	`/* USING DELIMITERS kept for backward compatibility. 2002-06-15 */`
`1358`	`1346`	`opt_using DELIMITERS Sconst`
`1359`	`1347`	`{`
`1360`		`- $$ = makeNode(DefElem);`
`1361`		`- $$->defname = "delimiter";`
`1362`		`- $$->arg = (Node *)makeString($3);`
	`1348`	`+ $$ = makeDefElem("delimiter", (Node *)makeString($3));`
`1363`	`1349`	`}`
`1364`	`1350`	`\| /EMPTY/ { $$ = NULL; }`
`1365`	`1351`	`;`
`@@ -2276,7 +2262,7 @@ def_elem: ColLabel '=' def_arg`
`2276`	`2262`
`2277`	`2263`	`/* Note: any simple identifier will be returned as a type name! */`
`2278`	`2264`	`def_arg: func_return { $$ = (Node *)$1; }`
`2279`		`- \| all_Op { $$ = (Node *)makeString($1); }`
	`2265`	`+ \| qual_all_Op { $$ = (Node *)$1; }`
`2280`	`2266`	`\| NumericOnly { $$ = (Node *)$1; }`
`2281`	`2267`	`\| Sconst { $$ = (Node *)makeString($1); }`
`2282`	`2268`	`;`
`@@ -3568,27 +3554,19 @@ createdb_opt_list:`
`3568`	`3554`	`createdb_opt_item:`
`3569`	`3555`	`LOCATION opt_equal Sconst`
`3570`	`3556`	`{`
`3571`		`- $$ = makeNode(DefElem);`
`3572`		`- $$->defname = "location";`
`3573`		`- $$->arg = (Node *)makeString($3);`
	`3557`	`+ $$ = makeDefElem("location", (Node *)makeString($3));`
`3574`	`3558`	`}`
`3575`	`3559`	`\| LOCATION opt_equal DEFAULT`
`3576`	`3560`	`{`
`3577`		`- $$ = makeNode(DefElem);`
`3578`		`- $$->defname = "location";`
`3579`		`- $$->arg = NULL;`
	`3561`	`+ $$ = makeDefElem("location", NULL);`
`3580`	`3562`	`}`
`3581`	`3563`	`\| TEMPLATE opt_equal name`
`3582`	`3564`	`{`
`3583`		`- $$ = makeNode(DefElem);`
`3584`		`- $$->defname = "template";`
`3585`		`- $$->arg = (Node *)makeString($3);`
	`3565`	`+ $$ = makeDefElem("template", (Node *)makeString($3));`
`3586`	`3566`	`}`
`3587`	`3567`	`\| TEMPLATE opt_equal DEFAULT`
`3588`	`3568`	`{`
`3589`		`- $$ = makeNode(DefElem);`
`3590`		`- $$->defname = "template";`
`3591`		`- $$->arg = NULL;`
	`3569`	`+ $$ = makeDefElem("template", NULL);`
`3592`	`3570`	`}`
`3593`	`3571`	`\| ENCODING opt_equal Sconst`
`3594`	`3572`	`{`
`@@ -3598,9 +3576,7 @@ createdb_opt_item:`
`3598`	`3576`	`elog(ERROR, "%s is not a valid encoding name", $3);`
`3599`	`3577`	`encoding = pg_char_to_encoding($3);`
`3600`	`3578`
`3601`		`- $$ = makeNode(DefElem);`
`3602`		`- $$->defname = "encoding";`
`3603`		`- $$->arg = (Node *)makeInteger(encoding);`
	`3579`	`+ $$ = makeDefElem("encoding", (Node *)makeInteger(encoding));`
`3604`	`3580`	`}`
`3605`	`3581`	`\| ENCODING opt_equal Iconst`
`3606`	`3582`	`{`
`@@ -3610,27 +3586,19 @@ createdb_opt_item:`
`3610`	`3586`	`if (!strcmp(encoding_name,"") \|\|`
`3611`	`3587`	`pg_valid_server_encoding(encoding_name) < 0)`
`3612`	`3588`	`elog(ERROR, "%d is not a valid encoding code", $3);`
`3613`		`- $$ = makeNode(DefElem);`
`3614`		`- $$->defname = "encoding";`
`3615`		`- $$->arg = (Node *)makeInteger($3);`
	`3589`	`+ $$ = makeDefElem("encoding", (Node *)makeInteger($3));`
`3616`	`3590`	`}`
`3617`	`3591`	`\| ENCODING opt_equal DEFAULT`
`3618`	`3592`	`{`
`3619`		`- $$ = makeNode(DefElem);`
`3620`		`- $$->defname = "encoding";`
`3621`		`- $$->arg = (Node *)makeInteger(-1);`
	`3593`	`+ $$ = makeDefElem("encoding", (Node *)makeInteger(-1));`
`3622`	`3594`	`}`
`3623`	`3595`	`\| OWNER opt_equal name`
`3624`	`3596`	`{`
`3625`		`- $$ = makeNode(DefElem);`
`3626`		`- $$->defname = "owner";`
`3627`		`- $$->arg = (Node *)makeString($3);`
	`3597`	`+ $$ = makeDefElem("owner", (Node *)makeString($3));`
`3628`	`3598`	`}`
`3629`	`3599`	`\| OWNER opt_equal DEFAULT`
`3630`	`3600`	`{`
`3631`		`- $$ = makeNode(DefElem);`
`3632`		`- $$->defname = "owner";`
`3633`		`- $$->arg = NULL;`
	`3601`	`+ $$ = makeDefElem("owner", NULL);`
`3634`	`3602`	`}`
`3635`	`3603`	`;`
`3636`	`3604`