From 0c648c5facf648c5e708bc8b19af5faf4eee47da Mon Sep 17 00:00:00 2001 From: Marcin Haba 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 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, -- 2.47.3