From 73210d4b2e9be00d05a086e3b322ab4a897283fc Mon Sep 17 00:00:00 2001 From: htmltiger <1429451+htmltiger@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:15:13 +0000 Subject: [PATCH 01/17] Update adodb-postgres64.inc.php --- libraries/adodb/drivers/adodb-postgres64.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/adodb/drivers/adodb-postgres64.inc.php b/libraries/adodb/drivers/adodb-postgres64.inc.php index 290967e7b..ee475996a 100644 --- a/libraries/adodb/drivers/adodb-postgres64.inc.php +++ b/libraries/adodb/drivers/adodb-postgres64.inc.php @@ -83,7 +83,8 @@ class ADODB_postgres64 extends ADOConnection{ /** @var int $_pnum Number of the last assigned query parameter {@see param()} */ var $_pnum = 0; - + var $version; + var $_nestedSQL; // The last (fmtTimeStamp is not entirely correct: // PostgreSQL also has support for time zones, // and writes these time in this format: "2001-03-01 18:59:26+02". @@ -933,7 +934,7 @@ class ADORecordSet_postgres64 extends ADORecordSet{ var $_blobArr; var $databaseType = "postgres64"; var $canSeek = true; - + var $adodbFetchMode; function __construct($queryID, $mode=false) { if ($mode === false) { From dcc7238896f7e8fc0983733815730dc3b50af320 Mon Sep 17 00:00:00 2001 From: htmltiger <1429451+htmltiger@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:16:22 +0000 Subject: [PATCH 02/17] Update colproperties.php --- colproperties.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/colproperties.php b/colproperties.php index 2bf137b88..086342571 100644 --- a/colproperties.php +++ b/colproperties.php @@ -75,7 +75,9 @@ function doAlter($msg = '') { $_REQUEST['default'] = $_REQUEST['olddefault'] = $column->fields['adsrc']; if ($column->fields['attnotnull']) $_REQUEST['notnull'] = 'YES'; $_REQUEST['comment'] = $column->fields['comment']; - } + }else{ + $_REQUEST['default'] =''; + } // Column name echo "
\n"; echo "\n"; From f11114a3463199cfbd1f8368d85eb53c06db2976 Mon Sep 17 00:00:00 2001 From: htmltiger <1429451+htmltiger@users.noreply.github.com> Date: Thu, 8 Dec 2022 16:18:24 +0000 Subject: [PATCH 03/17] Update Postgres.php --- classes/database/Postgres.php | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php index 9364787ea..440a4e763 100644 --- a/classes/database/Postgres.php +++ b/classes/database/Postgres.php @@ -252,7 +252,7 @@ function printField($name, $value, $type, $extras = array()) { // Determine actions string $extra_str = ''; foreach ($extras as $k => $v) { - $extra_str .= " {$k}=\"" . htmlspecialchars($v) . "\""; + $extra_str .= " {$k}=\"" . htmlspecialchars($v.'') . "\""; } switch (substr($type,0,9)) { @@ -264,14 +264,14 @@ function printField($name, $value, $type, $extras = array()) { // If value is null, 't' or 'f'... if ($value === null || $value === 't' || $value === 'f') { - echo "