Added pgpro_build() function and storing COMMIT_ID in the sources and binary. Fixes PGPRO-590

vbwagner · vbwagner · commit 37cbebf206ed · 2017-04-13T17:39:14.000+03:00
diff --git a/GNUmakefile.in b/GNUmakefile.in
@@ -95,7 +95,7 @@ $(distdir).tar: distdir
 distdir-location:
 	@echo $(distdir)
 
-distdir:
+distdir: src/include/commit_id.h
 	rm -rf $(distdir)* $(dummy)
 	for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
 	  file=`expr X$$x : 'X\./\(.*\)'`; \
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
@@ -833,6 +833,10 @@ include $(top_srcdir)/src/nls-global.mk
 endif # nls.mk
 endif # enable_nls
 
+.PHONY: $(top_builddir)/src/include/commit_id.h
+$(top_builddir)/src/include/commit_id.h:
+	[ -d .git ] && git log -1 --format='#define COMMIT_ID "%h"' > $@.tmp && mv $@.tmp $@
+	[ -e $@ ] ||  echo '#define COMMIT_ID "00000000"' >$@ 
 
 ##########################################################################
 #
diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c
@@ -16,6 +16,7 @@
 
 #include "utils/builtins.h"
 
+#include "commit_id.h"
 
 Datum
 pgsql_version(PG_FUNCTION_ARGS)
@@ -34,3 +35,9 @@ pgpro_edition(PG_FUNCTION_ARGS)
 {
 	PG_RETURN_TEXT_P(cstring_to_text(PGPRO_EDITION));
 }	
+
+Datum
+pgpro_build(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_TEXT_P(cstring_to_text(COMMIT_ID));
+}
diff --git a/src/include/.gitignore b/src/include/.gitignore
@@ -4,3 +4,4 @@
 /pg_config_ext.h
 /pg_config_os.h
 /dynloader.h
+/commit_id.h
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -5310,6 +5310,8 @@ 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");
 
+DATA(insert OID =  6020 (  pgpro_build		   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 0 0 25 "" _null_ _null_ _null_ _null_ _null_ pgpro_build _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_ ));
 DESCR("row security for current context active on table by table oid");
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
@@ -893,6 +893,7 @@ extern Datum text_format_nv(PG_FUNCTION_ARGS);
 extern Datum pgsql_version(PG_FUNCTION_ARGS);
 extern Datum pgpro_version(PG_FUNCTION_ARGS);
 extern Datum pgpro_edition(PG_FUNCTION_ARGS);
+extern Datum pgpro_build(PG_FUNCTION_ARGS);
 
 /* xid.c */
 extern Datum xidin(PG_FUNCTION_ARGS);

Original file line number	Diff line number	Diff line change
`@@ -833,6 +833,10 @@ include $(top_srcdir)/src/nls-global.mk`
`833`	`833`	`endif # nls.mk`
`834`	`834`	`endif # enable_nls`
`835`	`835`
	`836`	`+.PHONY: $(top_builddir)/src/include/commit_id.h`
	`837`	`+$(top_builddir)/src/include/commit_id.h:`
	`838`	`+ [ -d .git ] && git log -1 --format='#define COMMIT_ID "%h"' > $@.tmp && mv $@.tmp $@`
	`839`	`+ [ -e $@ ] \|\| echo '#define COMMIT_ID "00000000"' >$@`
`836`	`840`
`837`	`841`	`##########################################################################`
`838`	`842`	`#`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`#include "utils/builtins.h"`
`18`	`18`
	`19`	`+#include "commit_id.h"`
`19`	`20`
`20`	`21`	`Datum`
`21`	`22`	`pgsql_version(PG_FUNCTION_ARGS)`
`@@ -34,3 +35,9 @@ pgpro_edition(PG_FUNCTION_ARGS)`
`34`	`35`	`{`
`35`	`36`	`PG_RETURN_TEXT_P(cstring_to_text(PGPRO_EDITION));`
`36`	`37`	`}`
	`38`	`+`
	`39`	`+Datum`
	`40`	`+pgpro_build(PG_FUNCTION_ARGS)`
	`41`	`+{`
	`42`	`+ PG_RETURN_TEXT_P(cstring_to_text(COMMIT_ID));`
	`43`	`+}`