Added sql function pgpro_edition and correspoinding C-language define

vbwagner · vbwagner · commit 36755d302632 · 2016-10-26T14:48:58.000+03:00
diff --git a/configure b/configure
@@ -756,6 +756,7 @@ build_os
 build_vendor
 build_cpu
 build
+PGPRO_EDITION
 PGPRO_PACKAGE_NAME
 PG_MAJORVERSION
 configure_args
@@ -2752,6 +2753,8 @@ fi
 
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
+PGPRO_EDITION="standard"
+
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2764,6 +2767,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define PGPRO_EDITION "$PGPRO_EDITION"
+_ACEOF
+
+
 cat >>confdefs.h <<_ACEOF
 #define PGPRO_VERSION "$PGPRO_VERSION"
 _ACEOF
diff --git a/configure.in b/configure.in
@@ -40,9 +40,12 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION"])
 PGPRO_VERSION="$PACKAGE_VERSION.1"
 PGPRO_PACKAGE_NAME="PostgresPro"
+PGPRO_EDITION="standard"
 AC_SUBST(PGPRO_PACKAGE_NAME)
+AC_SUBST(PGPRO_EDITION)
 AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
 AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro name as a string])            
+AC_DEFINE_UNQUOTED(PGPRO_EDITION,"$PGPRO_EDITION",[PostgresPro edition])
 AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro version as a string])
 
 AC_CANONICAL_HOST
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
@@ -15427,6 +15427,11 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
        <entry><type>text</type></entry>
        <entry><productname>Postgres Pro</> version information.</entry>
        </row>
+      <row>
+       <entry><literal><function>pgpro_edition()</function></literal></entry>
+       <entry><type>text</type></entry>
+       <entry>Name  of <productname>Postgres Pro</> edition.</entry>
+       </row>
      </tbody>
     </tgroup>
    </table>
@@ -15652,6 +15657,13 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     of parsing the text version.
    </para>
   <indexterm>
+  <primary>pgpro_edition</primary>
+  </indexterm>
+  <para>
+<literal><function>pgpro_edutuib()</function></literal>
+   returns a string, describing <productname>Postgres Pro</> edition
+   i.e. <literal>standard</literal> or <literal>enterprise</literal> </para>
+  <indexterm>
   <primary>pgpro_version</primary>
   </indexterm>
   <para>
diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c
@@ -28,3 +28,9 @@ pgpro_version(PG_FUNCTION_ARGS)
 {
 	PG_RETURN_TEXT_P(cstring_to_text(PGPRO_VERSION_STR));
 }
+
+Datum
+pgpro_edition(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_TEXT_P(cstring_to_text(PGPRO_EDITION));
+}	
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -5313,6 +5313,8 @@ DESCR("get progress for all replication origins");
 DATA(insert OID =  6015 (  pgpro_version		   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 0 0 25 "" _null_ _null_ _null_ _null_ _null_ pgpro_version _null_ _null_ _null_ ));
 DESCR("PostgresPro version string");
 
+DATA(insert OID =  6019 (  pgpro_edition		   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 0 0 25 "" _null_ _null_ _null_ _null_ _null_ pgpro_edition _null_ _null_ _null_ ));
+DESCR("PostgresPro edition");
 
 /* rls */
 DATA(insert OID = 3298 (  row_security_active	   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 1 0 16 "26" _null_ _null_ _null_ _null_ _null_	row_security_active _null_ _null_ _null_ ));
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
@@ -775,6 +775,9 @@
 /* A string containing the version number of Postgres Pro */
 #undef PGPRO_VERSION_STR
 
+/* PostgresPro edition */
+#undef PGPRO_EDITION
+
 /* Define to 1 to allow profiling output to be saved separately for each
    process. */
 #undef PROFILE_PID_DIR
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
@@ -572,6 +572,8 @@
 #define PG_VERSION_NUM 90601
 #define PGPRO_PACKAGE_NAME "PostgresPro"
 
+#define PGPRO_EDITION "standard"
+
 #define PGPRO_PACKAGE_VERSION "9.6.1.1"
 
 #define PGPRO_PACKAGE_STR "PostgresPro 9.6.1.1"
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
@@ -892,6 +892,7 @@ extern Datum text_format_nv(PG_FUNCTION_ARGS);
 /* version.c */
 extern Datum pgsql_version(PG_FUNCTION_ARGS);
 extern Datum pgpro_version(PG_FUNCTION_ARGS);
+extern Datum pgpro_edition(PG_FUNCTION_ARGS);
 
 /* xid.c */
 extern Datum xidin(PG_FUNCTION_ARGS);
diff --git a/src/pgpro-upgrade/003-pgpro_edition.sql b/src/pgpro-upgrade/003-pgpro_edition.sql
@@ -0,0 +1 @@
+CREATE FUNCTION pg_catalog.pgpro_edition() RETURNS TEXT AS 'pgpro_edition' LANGUAGE internal STRICT IMMUTABLE;
diff --git a/src/pgpro-upgrade/003-pgpro_edition.test b/src/pgpro-upgrade/003-pgpro_edition.test
@@ -0,0 +1 @@
+SELECT COUNT(*) > 0 AS pgpro_edition FROM pg_proc WHERE proname = 'pgpro_edition' AND pronamespace = 11;

Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,9 @@ pgpro_version(PG_FUNCTION_ARGS)`
`28`	`28`	`{`
`29`	`29`	`PG_RETURN_TEXT_P(cstring_to_text(PGPRO_VERSION_STR));`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+Datum`
	`33`	`+pgpro_edition(PG_FUNCTION_ARGS)`
	`34`	`+{`
	`35`	`+ PG_RETURN_TEXT_P(cstring_to_text(PGPRO_EDITION));`
	`36`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CREATE FUNCTION pg_catalog.pgpro_edition() RETURNS TEXT AS 'pgpro_edition' LANGUAGE internal STRICT IMMUTABLE;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SELECT COUNT(*) > 0 AS pgpro_edition FROM pg_proc WHERE proname = 'pgpro_edition' AND pronamespace = 11;`