Improve PDO_PgSQL support

diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index 3d69d3e9fd6be9d7abcb36075b9c9289e3aa30f8..a77265a648ff710b5c28acd93ff13082870709d7 100644 (file)
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -51,7 +51,7 @@ if (extension_loaded('pdo')) {
                
                function next_result() {
                        $this->_result->_offset = 0;
-                       return $this->_result->nextRowset();
+                       return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it
                }
                
                function result($query, $field = 0) {
@@ -79,7 +79,7 @@ if (extension_loaded('pdo')) {
                        $row = (object) $this->getColumnMeta($this->_offset++);
                        $row->orgtable = $row->table;
                        $row->orgname = $row->name;
-                       $row->charsetnr = (in_array("blob", $row->flags) ? 63 : 0);
+                       $row->charsetnr = (in_array("blob", (array) $row->flags) ? 63 : 0);
                        return $row;
                }
        }

diff --git a/changes.txt b/changes.txt
index 0841cc818c73b20e8572ffa0f8fe9583f0041477..cecc5176850126c179972b9648c08a674e6c1efb 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -6,6 +6,7 @@ Link to original table in EXPLAIN of SELECT * FROM table t
 MySQL: inform about disabled event_scheduler
 SQLite: support binary data
 PostgreSQL: approximate row count in table overview
+PostgreSQL: improve PDO support in SQL command
 Oracle: schema, processlist, table overview numbers
 Simplify work with NULL values (customization)
 Replace JSMin by better JavaScript minifier