From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 7 Mar 2020 15:38:57 +0000 (+0100)
Subject: baculum: Add patch to PRADO framework 4.0.1 for supporting PostgreSQL 12 catalog... 
X-Git-Tag: Release-9.6.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3226816a256e1df10fea51353e0649c6976852e9;p=thirdparty%2Fbacula.git

baculum: Add patch to PRADO framework 4.0.1 for supporting PostgreSQL 12 catalog database

Feature request reported to the PRADO framework project: https://github.com/pradosoft/prado/issues/708
---

diff --git a/gui/baculum/debian/patches/add-support-for-postgresql-12-catalog-database.patch b/gui/baculum/debian/patches/add-support-for-postgresql-12-catalog-database.patch
new file mode 100644
index 000000000..bac914ec0
--- /dev/null
+++ b/gui/baculum/debian/patches/add-support-for-postgresql-12-catalog-database.patch
@@ -0,0 +1,38 @@
+From 701be9e03dc41b427f3e688b792daf6cbad349f8 Mon Sep 17 00:00:00 2001
+From: Marcin Haba <marcin.haba@bacula.pl>
+Date: Sat, 7 Mar 2020 16:32:24 +0100
+Subject: [PATCH] baculum: Add support for PostgreSQL 12 catalog database
+
+---
+ .../prado/framework/Data/Common/Pgsql/TPgsqlMetaData.php  | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+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 52c2b01488..68a8bff5ff 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,
+-- 
+2.21.1
+