Remove encoding lookups from grammar stage, push them back to places

where it's safe to do database access.  Along the way, fix core dump
for 'DEFAULT' parameters to CREATE DATABASE.  initdb forced due to
change in pg_proc entry.

Author: tglsfdc

doc/src/sgml/keywords.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/keywords.sgml,v 2.6 2002/06/20 16:00:43 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/keywords.sgml,v 2.7 2002/11/02 18:41:21 tgl Exp $ -->
 
 <appendix id="sql-keywords-appendix">
  <title><acronym>SQL</acronym> Key Words</title>
@@ -682,7 +682,7 @@
    </row>
    <row>
     <entry><token>CONVERT</token></entry>
-    <entry></entry>
+    <entry>non-reserved (cannot be function or type)</entry>
     <entry>non-reserved</entry>
     <entry>reserved</entry>
    </row>

src/backend/catalog/namespace.c

@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/namespace.c,v 1.37 2002/11/02 02:33:03 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/namespace.c,v 1.38 2002/11/02 18:41:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1186,7 +1186,9 @@ makeRangeVarFromNameList(List *names)
 /*
  * NameListToString
  *		Utility routine to convert a qualified-name list into a string.
- *		Used primarily to form error messages.
+ *
+ * This is used primarily to form error messages, and so we do not quote
+ * the list elements, for the sake of legibility.
  */
 char *
 NameListToString(List *names)
@@ -1206,6 +1208,31 @@ NameListToString(List *names)
 	return string.data;
 }
 
+/*
+ * NameListToQuotedString
+ *		Utility routine to convert a qualified-name list into a string.
+ *
+ * Same as above except that names will be double-quoted where necessary,
+ * so the string could be re-parsed (eg, by textToQualifiedNameList).
+ */
+char *
+NameListToQuotedString(List *names)
+{
+	StringInfoData string;
+	List	   *l;
+
+	initStringInfo(&string);
+
+	foreach(l, names)
+	{
+		if (l != names)
+			appendStringInfoChar(&string, '.');
+		appendStringInfo(&string, "%s", quote_identifier(strVal(lfirst(l))));
+	}
+
+	return string.data;
+}
+
 /*
  * isTempNamespace - is the given namespace my temporary-table namespace?
  */

src/backend/catalog/pg_conversion.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_conversion.c,v 1.7 2002/11/02 02:33:03 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_conversion.c,v 1.8 2002/11/02 18:41:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -273,38 +273,44 @@ FindConversion(const char *conname, Oid connamespace)
  * CONVERT <left paren> <character value expression>
  * USING <form-of-use conversion name> <right paren>
  *
- * TEXT convert3(TEXT string, OID conversion_oid);
+ * TEXT convert_using(TEXT string, TEXT conversion_name)
  */
 Datum
-pg_convert3(PG_FUNCTION_ARGS)
+pg_convert_using(PG_FUNCTION_ARGS)
 {
 	text	   *string = PG_GETARG_TEXT_P(0);
-	Oid			convoid = PG_GETARG_OID(1);
+	text	   *conv_name = PG_GETARG_TEXT_P(1);
+	text	   *retval;
+	List	   *parsed_name;
+	Oid			convoid;
 	HeapTuple	tuple;
 	Form_pg_conversion body;
-	text	   *retval;
 	unsigned char *str;
 	unsigned char *result;
 	int			len;
 
-	if (!OidIsValid(convoid))
-		elog(ERROR, "Conversion does not exist");
-
-	/* make sure that source string is null terminated */
+	/* Convert input string to null-terminated form */
 	len = VARSIZE(string) - VARHDRSZ;
 	str = palloc(len + 1);
 	memcpy(str, VARDATA(string), len);
 	*(str + len) = '\0';
 
+	/* Look up the conversion name */
+	parsed_name = textToQualifiedNameList(conv_name, "convert_using");
+	convoid = FindConversionByName(parsed_name);
+	if (!OidIsValid(convoid))
+		elog(ERROR, "conversion %s not found", NameListToString(parsed_name));
+
 	tuple = SearchSysCache(CONOID,
 						   ObjectIdGetDatum(convoid),
 						   0, 0, 0);
 	if (!HeapTupleIsValid(tuple))
 		elog(ERROR, "Conversion %u search from syscache failed", convoid);
+	body = (Form_pg_conversion) GETSTRUCT(tuple);
 
+	/* Temporary result area should be more than big enough */
 	result = palloc(len * 4 + 1);
 
-	body = (Form_pg_conversion) GETSTRUCT(tuple);
 	OidFunctionCall5(body->conproc,
 					 Int32GetDatum(body->conforencoding),
 					 Int32GetDatum(body->contoencoding),
@@ -315,7 +321,7 @@ pg_convert3(PG_FUNCTION_ARGS)
 	ReleaseSysCache(tuple);
 
 	/*
-	 * build text data type structre. we cannot use textin() here, since
+	 * build text result structure. we cannot use textin() here, since
 	 * textin assumes that input string encoding is same as database
 	 * encoding.
 	 */
@@ -327,8 +333,5 @@ pg_convert3(PG_FUNCTION_ARGS)
 	pfree(result);
 	pfree(str);
 
-	/* free memory if allocated by the toaster */
-	PG_FREE_IF_COPY(string, 0);
-
 	PG_RETURN_TEXT_P(retval);
 }

src/backend/commands/dbcommands.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.106 2002/10/21 22:06:19 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.107 2002/11/02 18:41:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -122,14 +122,34 @@ createdb(const CreatedbStmt *stmt)
 				 defel->defname);
 	}
 
-	if (downer)
+	if (downer && downer->arg)
 		dbowner = strVal(downer->arg);
-	if (dpath)
+	if (dpath && dpath->arg)
 		dbpath = strVal(dpath->arg);
-	if (dtemplate)
+	if (dtemplate && dtemplate->arg)
 		dbtemplate = strVal(dtemplate->arg);
-	if (dencoding)
-		encoding = intVal(dencoding->arg);
+	if (dencoding && dencoding->arg)
+	{
+		const char *encoding_name;
+
+		if (IsA(dencoding->arg, Integer))
+		{
+			encoding = intVal(dencoding->arg);
+			encoding_name = pg_encoding_to_char(encoding);
+			if (strcmp(encoding_name, "") == 0 ||
+				pg_valid_server_encoding(encoding_name) < 0)
+				elog(ERROR, "%d is not a valid encoding code", encoding);
+		}
+		else if (IsA(dencoding->arg, String))
+		{
+			encoding_name = strVal(dencoding->arg);
+			if (pg_valid_server_encoding(encoding_name) < 0)
+				elog(ERROR, "%s is not a valid encoding name", encoding_name);
+			encoding = pg_char_to_encoding(encoding_name);
+		}
+		else
+			elog(ERROR, "CREATE DATABASE: bogus encoding parameter");
+	}
 
 	/* obtain sysid of proposed owner */
 	if (dbowner)