[postgis-tickets] [SCM] PostGIS branch master updated. 21451108484d163e0b535bdfc5dcc7c07a0c853e

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  21451108484d163e0b535bdfc5dcc7c07a0c853e (commit)
      from  d03a5dfb92e5aa4ba757c7357a873289d46deae9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21451108484d163e0b535bdfc5dcc7c07a0c853e
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Dec 11 20:57:40 2019 -0500

    Goofy fix that bessie seems to be happy with.  Closes #4572

diff --git a/postgis/sqldefines.h.in b/postgis/sqldefines.h.in
index e23a88e..7f46244 100644
--- a/postgis/sqldefines.h.in
+++ b/postgis/sqldefines.h.in
@@ -44,7 +44,13 @@
 #define _POSTGIS_SQL_SELECT_POSTGIS_PGSQL_VERSION 'SELECT ''@POSTGIS_PGSQL_VERSION@''::text AS version'
 
 #ifdef POSTGIS_REVISION
-#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '@POSTGIS_SCRIPTS_VERSION@ '::text || $rev$POSTGIS_REVISION$rev$::text AS version $$
+/*
+* Insert the PostGIS revision.  This is immensely goofy because FreeBSD doesn't recognized
+* PostGIS_REVISION as a variable if anything like ` or $rev$ (sql dollar quoting) abutts it so we need to leave a space on both sides
+* which means we need to then trim it to get rid of the extra spaces we added.
+* Maybe someone smarter can come up with a less goofy solution that makes all OS happy
+*/
+#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT trim('@POSTGIS_SCRIPTS_VERSION@'::text || $rev$ POSTGIS_REVISION $rev$) AS version $$
 #else
 #define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '@POSTGIS_SCRIPTS_VERSION@'::text AS version $$
 #endif

-----------------------------------------------------------------------

Summary of changes:
 postgis/sqldefines.h.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS