From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 7 Mar 2020 15:32:24 +0000 (+0100)
Subject: baculum: Add support for PostgreSQL 12 catalog database
X-Git-Tag: Release-9.6.3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c648c5facf648c5e708bc8b19af5faf4eee47da;p=thirdparty%2Fbacula.git

baculum: Add support for PostgreSQL 12 catalog database
---

diff --git a/gui/baculum/framework/pradosoft/prado/framework/Data/Common/Pgsql/TPgsqlMetaData.php b/gui/baculum/framework/pradosoft/prado/framework/Data/Common/Pgsql/TPgsqlMetaData.php
index 52c2b0148..68a8bff5f 100644
--- a/gui/baculum/framework/pradosoft/prado/framework/Data/Common/Pgsql/TPgsqlMetaData.php
+++ b/gui/baculum/framework/pradosoft/prado/framework/Data/Common/Pgsql/TPgsqlMetaData.php
@@ -114,7 +114,7 @@ class TPgsqlMetaData extends TDbMetaData
 			a.attname,
 			pg_catalog.format_type(a.atttypid, a.atttypmod) as type,
 			a.atttypmod,
-			a.attnotnull, a.atthasdef, adef.adsrc,
+			a.attnotnull, a.atthasdef, pg_get_expr(adef.adbin, adef.adrelid) AS adsrc,
 			(
 				SELECT 1 FROM pg_catalog.pg_depend pd, pg_catalog.pg_class pc
 				WHERE pd.objid=pc.oid
@@ -296,11 +296,7 @@ EOD;
 	SELECT conname, consrc, contype, indkey, indisclustered FROM (
 			SELECT
 					conname,
-					CASE WHEN contype='f' THEN
-							pg_catalog.pg_get_constraintdef(oid)
-					ELSE
-							'CHECK (' || consrc || ')'
-					END AS consrc,
+					pg_catalog.pg_get_constraintdef(oid) AS consrc,
 					contype,
 					conrelid AS relid,
 					NULL AS indkey,