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 52c2b014887bc768f1b671948b511d28a5f4ead2..68a8bff5ff180a789e0a5f139cdb77c3719869b3 100644 (file)
--- 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,