mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new PGC_S_DATABASE_USER enum value to several places missed by my patch

Browse Source 
last week.

Per note and patch from Jeff Davis.
This commit is contained in:
Alvaro Herrera 2009-10-13 14:18:40 +00:00
parent 8d54c2482b
commit 201e5b282b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/utils/misc/guc.c
View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.520 2009/10/03 18:04:57 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.521 2009/10/13 14:18:40 alvherre Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
@ -460,6 +460,7 @@ const char *const GucSource_Names[] =
/* PGC_S_ARGV */ "command line", /* PGC_S_ARGV */ "command line",
/* PGC_S_DATABASE */ "database", /* PGC_S_DATABASE */ "database",
/* PGC_S_USER */ "user", /* PGC_S_USER */ "user",
/* PGC_S_DATABASE_USER */ "database user",
/* PGC_S_CLIENT */ "client", /* PGC_S_CLIENT */ "client",
/* PGC_S_OVERRIDE */ "override", /* PGC_S_OVERRIDE */ "override",
/* PGC_S_INTERACTIVE */ "interactive", /* PGC_S_INTERACTIVE */ "interactive",
@ -4556,7 +4557,8 @@ set_config_option(const char *name, const char *value,
*/ */
elevel = IsUnderPostmaster ? DEBUG3 : LOG; elevel = IsUnderPostmaster ? DEBUG3 : LOG;
} }
else if (source == PGC_S_DATABASE || source == PGC_S_USER) else if (source == PGC_S_DATABASE || source == PGC_S_USER ||
source == PGC_S_DATABASE_USER)
elevel = WARNING; elevel = WARNING;
else else
elevel = ERROR; elevel = ERROR;
@ -5762,6 +5764,7 @@ define_custom_variable(struct config_generic * variable)
break; break;
case PGC_S_DATABASE: case PGC_S_DATABASE:
case PGC_S_USER: case PGC_S_USER:
case PGC_S_DATABASE_USER:
case PGC_S_CLIENT: case PGC_S_CLIENT:
case PGC_S_SESSION: case PGC_S_SESSION:
default: default:

4
src/include/utils/guc.h
View File

@ -7,7 +7,7 @@
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * Copyright (c) 2000-2009, PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.107 2009/10/07 22:14:26 alvherre Exp $ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.108 2009/10/13 14:18:40 alvherre Exp $
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
#ifndef GUC_H #ifndef GUC_H
@ -77,6 +77,8 @@ typedef enum
* as the actual source of any value). This is an interactive case, but * as the actual source of any value). This is an interactive case, but
* it needs its own source value because some assign hooks need to make * it needs its own source value because some assign hooks need to make
* different validity checks in this case. * different validity checks in this case.
*
* NB: see GucSource_Names in guc.c if you change this.
*/ */
typedef enum typedef enum
{ {