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

last week.

Per note and patch from Jeff Davis.

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 4d5aeee85ce023a128643691b0d72e844956c345..8de4e55cad6f4dfef8d3e4ca70ad6b5fbfeab367 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut .
  *
  * 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_DATABASE */ "database",
     /* PGC_S_USER */ "user",
+    /* PGC_S_DATABASE_USER */ "database user",
     /* PGC_S_CLIENT */ "client",
     /* PGC_S_OVERRIDE */ "override",
     /* PGC_S_INTERACTIVE */ "interactive",
@@ -4556,7 +4557,8 @@ set_config_option(const char *name, const char *value,
         */
        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;
    else
        elevel = ERROR;
@@ -5762,6 +5764,7 @@ define_custom_variable(struct config_generic * variable)
            break;
        case PGC_S_DATABASE:
        case PGC_S_USER:
+       case PGC_S_DATABASE_USER:
        case PGC_S_CLIENT:
        case PGC_S_SESSION:
        default:

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 5c59b02e4f4b99356184e004dbc05e2f32e9e5b7..ad76d06ffc83c9ba764c217fc6b4217af565c570 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  * Written by Peter Eisentraut .
  *
- * $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
@@ -77,6 +77,8 @@ typedef enum
  * 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
  * different validity checks in this case.
+ *
+ * NB: see GucSource_Names in guc.c if you change this.
  */
 typedef enum
 {