Commit 6df6d8e3 authored by Neil Conway's avatar Neil Conway

Fixes for RESET SESSION patch, per Alvaro. Fix a typo in the RESET

ref page (sorry, my fault!), and simplify the coding of
ResetTempTableNamespace().
parent c0e42e93
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.33 2007/04/12 06:53:46 neilc Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.34 2007/04/12 22:34:45 neilc Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
...@@ -42,7 +42,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA ...@@ -42,7 +42,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
<para> <para>
The default value is defined as the value that the parameter would The default value is defined as the value that the parameter would
have had, if no <command>SET</> ever been issued for it in the have had, if no <command>SET</> had ever been issued for it in the
current session. The actual source of this value might be a current session. The actual source of this value might be a
compiled-in default, the configuration file, command-line options, compiled-in default, the configuration file, command-line options,
or per-database or per-user default settings. See <xref or per-database or per-user default settings. See <xref
...@@ -112,7 +112,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA ...@@ -112,7 +112,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
Releases all temporary resources associated with the current Releases all temporary resources associated with the current
session. This has the same effect as executing the following session. This has the same effect as executing the following
command sequence: command sequence:
<synopsis> <programlisting>
SET SESSION AUTHORIZATION DEFAULT; SET SESSION AUTHORIZATION DEFAULT;
RESET ALL; RESET ALL;
DEALLOCATE ALL; DEALLOCATE ALL;
...@@ -120,7 +120,7 @@ CLOSE ALL; ...@@ -120,7 +120,7 @@ CLOSE ALL;
UNLISTEN *; UNLISTEN *;
RESET PLANS; RESET PLANS;
RESET TEMP; RESET TEMP;
</synopsis> </programlisting>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.94 2007/04/12 06:53:46 neilc Exp $ * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.95 2007/04/12 22:34:45 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1946,18 +1946,8 @@ InitTempTableNamespace(void) ...@@ -1946,18 +1946,8 @@ InitTempTableNamespace(void)
void void
ResetTempTableNamespace(void) ResetTempTableNamespace(void)
{ {
char namespaceName[NAMEDATALEN]; if (OidIsValid(myTempNamespace))
Oid namespaceId; RemoveTempRelations(myTempNamespace);
/* find oid */
snprintf(namespaceName, sizeof(namespaceName), "pg_temp_%d", MyBackendId);
namespaceId = GetSysCacheOid(NAMESPACENAME,
CStringGetDatum(namespaceName),
0, 0, 0);
/* clean if exists */
if (OidIsValid(namespaceId))
RemoveTempRelations(namespaceId);
} }
/* /*
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.46 2007/04/12 06:53:48 neilc Exp $ * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.47 2007/04/12 22:34:45 neilc Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -81,6 +81,7 @@ extern char *NameListToQuotedString(List *names); ...@@ -81,6 +81,7 @@ extern char *NameListToQuotedString(List *names);
extern bool isTempNamespace(Oid namespaceId); extern bool isTempNamespace(Oid namespaceId);
extern bool isAnyTempNamespace(Oid namespaceId); extern bool isAnyTempNamespace(Oid namespaceId);
extern bool isOtherTempNamespace(Oid namespaceId); extern bool isOtherTempNamespace(Oid namespaceId);
extern void ResetTempTableNamespace(void);
extern OverrideSearchPath *GetOverrideSearchPath(MemoryContext context); extern OverrideSearchPath *GetOverrideSearchPath(MemoryContext context);
extern void PushOverrideSearchPath(OverrideSearchPath *newpath); extern void PushOverrideSearchPath(OverrideSearchPath *newpath);
...@@ -100,6 +101,4 @@ extern char *namespace_search_path; ...@@ -100,6 +101,4 @@ extern char *namespace_search_path;
extern List *fetch_search_path(bool includeImplicit); extern List *fetch_search_path(bool includeImplicit);
extern void ResetTempTableNamespace(void);
#endif /* NAMESPACE_H */ #endif /* NAMESPACE_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment