Add an implicit cast from varchar to regclass, so that existing code

of the form nextval('foo'::varchar) doesn't break.  Per gripe from
Jean-Pierre Pelletier.  Initdb forced :-(

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index eb84e44..3986f7a 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.304 2005/10/06 02:29:18 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.305 2005/10/21 15:45:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     200510051
+#define CATALOG_VERSION_NO     200510211
 
 #endif

diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h
index b355b11..d0dfbec 100644 (file)
--- a/src/include/catalog/pg_cast.h
+++ b/src/include/catalog/pg_cast.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 2002-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.23 2005/10/15 02:49:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.24 2005/10/21 15:45:06 tgl Exp $
  *
  * NOTES
  *       the genbki.sh script reads this file and generates .bki
@@ -114,9 +114,9 @@ DATA(insert (       16      23      2558 e ));
  * from OID to int4 or int8.  Similarly for each OID-alias type.  Also allow
  * implicit coercions between OID and each OID-alias type, as well as
  * regproc<->regprocedure and regoper<->regoperator.  (Other coercions
- * between alias types must pass through OID.) Lastly, there is an implicit
- * cast from text to regclass, which exists mainly to support legacy forms
- * of nextval() and related functions.
+ * between alias types must pass through OID.) Lastly, there are implicit
+ * casts from text and varchar to regclass, which exist mainly to support
+ * legacy forms of nextval() and related functions.
  */
 DATA(insert (  20       26 1287 i ));
 DATA(insert (  21       26  313 i ));
@@ -170,6 +170,7 @@ DATA(insert (       23 2206    0 i ));
 DATA(insert ( 2206      20 1288 a ));
 DATA(insert ( 2206      23    0 a ));
 DATA(insert (  25 2205 1079 i ));
+DATA(insert ( 1043 2205 1079 i ));
 
 /*
  * String category: this needs to be tightened up