little-arhat
diff --git a/‎doc/src/sgml/catalogs.sgml
Lines changed: 52 additions & 0 deletions b/‎doc/src/sgml/catalogs.sgml
Lines changed: 52 additions & 0 deletions
diff --git a/‎src/backend/catalog/system_views.sql
Lines changed: 6 additions & 0 deletions b/‎src/backend/catalog/system_views.sql
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/backend/utils/misc/Makefile
Lines changed: 2 additions & 2 deletions b/‎src/backend/utils/misc/Makefile
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/backend/utils/misc/pg_config.c
Lines changed: 103 additions & 0 deletions b/‎src/backend/utils/misc/pg_config.c
Lines changed: 103 additions & 0 deletions
diff --git a/‎src/bin/pg_config/Makefile
Lines changed: 0 additions & 14 deletions b/‎src/bin/pg_config/Makefile
Lines changed: 0 additions & 14 deletions
@@ -7349,6 +7349,11 @@
       <entry>available versions of extensions</entry>
      </row>
 
+     <row>
+      <entry><link linkend="view-pg-config"><structname>pg_config</structname></link></entry>
+      <entry>compile-time configuration parameters</entry>
+     </row>
+
      <row>
       <entry><link linkend="view-pg-cursors"><structname>pg_cursors</structname></link></entry>
       <entry>open cursors</entry>
@@ -7609,6 +7614,53 @@
   </para>
  </sect1>
 
+ <sect1 id="view-pg-config">
+  <title><structname>pg_config</structname></title>
+
+  <indexterm zone="view-pg-config">
+   <primary>pg_config</primary>
+  </indexterm>
+
+  <para>
+   The view <structname>pg_config</structname> describes the
+   compile-time configuration parameters of the currently installed
+   version of <productname>PostgreSQL</>. It is intended, for example, to
+   be used by software packages that want to interface to
+   <productname>PostgreSQL</> to facilitate finding the required header
+   files and libraries. It provides the same basic information as the
+   <xref linkend="app-pgconfig"> <productname>PostgreSQL</> Client
+   Application.
+  </para>
+
+  <table>
+   <title><structname>pg_config</> Columns</title>
+   <tgroup cols="3">
+    <thead>
+     <row>
+      <entry>Name</entry>
+      <entry>Type</entry>
+      <entry>Description</entry>
+     </row>
+    </thead>
+
+    <tbody>
+     <row>
+      <entry><structfield>name</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry>The parameter name</entry>
+     </row>
+
+     <row>
+      <entry><structfield>setting</structfield></entry>
+      <entry><type>text</type></entry>
+      <entry>The parameter value</entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+
+ </sect1>
+
  <sect1 id="view-pg-cursors">
   <title><structname>pg_cursors</structname></title>
 
 
@@ -433,6 +433,12 @@ CREATE VIEW pg_timezone_abbrevs AS
 CREATE VIEW pg_timezone_names AS
     SELECT * FROM pg_timezone_names();
 
+CREATE VIEW pg_config AS
+    SELECT * FROM pg_config();
+
+REVOKE ALL on pg_config FROM PUBLIC;
+REVOKE EXECUTE ON FUNCTION pg_config() FROM PUBLIC;
+
 -- Statistics views
 
 CREATE VIEW pg_stat_all_tables AS
 
@@ -14,8 +14,8 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = guc.o help_config.o pg_rusage.o ps_status.o rls.o \
-       sampling.o superuser.o timeout.o tzparser.o
+OBJS = guc.o help_config.o pg_config.o pg_rusage.o \
+       ps_status.o rls.o sampling.o superuser.o timeout.o tzparser.o
 
 # This location might depend on the installation directories. Therefore
 # we can't subsitute it into pg_config.h.
 
@@ -0,0 +1,103 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_config.c
+ *		Expose same output as pg_config except as an SRF
+ *
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/misc/pg_config.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "funcapi.h"
+#include "miscadmin.h"
+#include "catalog/pg_type.h"
+#include "common/config_info.h"
+#include "utils/builtins.h"
+#include "utils/elog.h"
+#include "port.h"
+
+Datum
+pg_config(PG_FUNCTION_ARGS)
+{
+	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
+	Tuplestorestate	   *tupstore;
+	HeapTuple			tuple;
+	TupleDesc			tupdesc;
+	AttInMetadata	   *attinmeta;
+	MemoryContext		per_query_ctx;
+	MemoryContext		oldcontext;
+	ConfigData		   *configdata;
+	size_t				configdata_len;
+	char			   *values[2];
+	int					i = 0;
+
+	/* check to see if call
10000
er supports us returning a tuplestore */
+	if (!rsinfo || !(rsinfo->allowedModes & SFRM_Materialize))
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("materialize mode required, but it is not "
+						"allowed in this context")));
+
+	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
+	oldcontext = MemoryContextSwitchTo(per_query_ctx);
+
+	/* get the requested return tuple description */
+	tupdesc = CreateTupleDescCopy(rsinfo->expectedDesc);
+
+	/*
+	 * Check to make sure we have a reasonable tuple descriptor
+	 */
+	if (tupdesc->natts != 2 ||
+		tupdesc->attrs[0]->atttypid != TEXTOID ||
+		tupdesc->attrs[1]->atttypid != TEXTOID)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+				 errmsg("query-specified return tuple and "
+						"function return type are not compatible")));
+
+	/* OK to use it */
+	attinmeta = TupleDescGetAttInMetadata(tupdesc);
+
+	/* let the caller know we're sending back a tuplestore */
+	rsinfo->returnMode = SFRM_Materialize;
+
+	/* initialize our tuplestore */
+	tupstore = tuplestore_begin_heap(true, false, work_mem);
+
+	configdata = get_configdata(my_exec_path, &configdata_len);
+	for (i = 0; i < configdata_len; i++)
+	{
+		values[0] = configdata[i].name;
+		values[1] = configdata[i].setting;
+
+		tuple = BuildTupleFromCStrings(attinmeta, values);
+		tuplestore_puttuple(tupstore, tuple);
+	}
+
+	/*
+	 * no longer need th
F42D
e tuple descriptor reference created by
+	 * TupleDescGetAttInMetadata()
+	 */
+	ReleaseTupleDesc(tupdesc);
+
+	tuplestore_donestoring(tupstore);
+	rsinfo->setResult = tupstore;
+
+	/*
+	 * SFRM_Materialize mode expects us to return a NULL Datum. The actual
+	 * tuples are in our tuplestore and passed back through
+	 * rsinfo->setResult. rsinfo->setDesc is set to the tuple description
+	 * that we actually used to build our tuples with, so the caller can
+	 * verify we did what it was expecting.
+	 */
+	rsinfo->setDesc = tupdesc;
+	MemoryContextSwitchTo(oldcontext);
+
+	return (Datum) 0;
+}
@@ -17,20 +17,6 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS=   pg_config.o $(WIN32RES)
 
-# don't include subdirectory-path-dependent -I and -L switches
-STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
-STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
-
-override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
-override CPPFLAGS += -DVAL_CC="\"$(CC)\""
-override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
-override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
-override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
-override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
-override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
-
 all: pg_config
 
 pg_config: $(OBJS) | submake-libpgport