From e80f9dfa8095656c0d671d89663439c66b806288 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 23 Dec 2005 00:38:04 +0000
Subject: [PATCH] Add quotes around search_path "$user" so that SHOW output can
be used in SET.
---
doc/src/sgml/config.sgml | 6 +++---
doc/src/sgml/ddl.sgml | 4 ++--
src/backend/utils/misc/guc.c | 4 ++--
src/backend/utils/misc/postgresql.conf.sample | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 8322463cea7..4317841d123 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.39 2005/12/20 02:30:35 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.40 2005/12/23 00:38:03 momjian Exp $
-->
<chapter Id="runtime-config">
<title>Server Configuration</title>
@@ -39,7 +39,7 @@ $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.39 2005/12/20 02:30:35 tgl Exp $
# This is a comment
log_connections = yes
log_destination = 'syslog'
-search_path = '$user, public'
+search_path = '"$user", public'
</programlisting>
One parameter is specified per line. The equal sign between name and
value is optional. Whitespace is insignificant and blank lines are
@@ -3117,7 +3117,7 @@ SELECT * FROM parent WHERE key = 2400;
<para>
The default value for this parameter is
- <literal>'$user, public'</literal> (where the second part will be
+ <literal>'"$user", public'</literal> (where the second part will be
ignored if there is no schema named <literal>public</>).
This supports shared use of a database (where no users
have private schemas, and all share use of <literal>public</>),
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 75aabc3f70f..e6b694ed7bf 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.50 2005/11/04 23:53:18 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.51 2005/12/23 00:38:03 momjian Exp $ -->
<chapter id="ddl">
<title>Data Definition</title>
@@ -1650,7 +1650,7 @@ SHOW search_path;
<screen>
search_path
--------------
- $user,public
+ "$user",public
</screen>
The first element specifies that a schema with the same name as
the current user is to be searched. If no such schema exists,
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index b7c4599a030..8bc2d342008 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.302 2005/12/20 02:30:36 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.303 2005/12/23 00:38:04 momjian Exp $
*
*--------------------------------------------------------------------
*/
@@ -1902,7 +1902,7 @@ static struct config_string ConfigureNamesString[] =
GUC_LIST_INPUT | GUC_LIST_QUOTE
},
&namespace_search_path,
- "$user,public", assign_search_path, NULL
+ "\"$user\",public", assign_search_path, NULL
},
{
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 94503ddfbb2..7fbba7d3310 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -364,7 +364,7 @@
# - Statement Behavior -
-#search_path = '$user,public' # schema names
+#search_path = '"$user",public' # schema names
#default_tablespace = '' # a tablespace name, '' uses
# the default
#check_function_bodies = on
--
GitLab