From 638288cc04d7c1b00e2cddaf0a5a148384b1ecc3 Mon Sep 17 00:00:00 2001 From: Peter Knut Date: Sun, 10 Nov 2024 23:32:31 +0100 Subject: [PATCH] Cleanup: Definition of custom PDO statement class --- adminer/include/pdo.inc.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php index a4281215..f49bb89f 100644 --- a/adminer/include/pdo.inc.php +++ b/adminer/include/pdo.inc.php @@ -3,7 +3,7 @@ if (extension_loaded('pdo')) { /*abstract*/ class Min_PDO { var $_result, $server_info, $affected_rows, $errno, $error, $pdo; - + function __construct() { global $adminer; $pos = array_search("SQL", $adminer->operators); @@ -11,10 +11,10 @@ if (extension_loaded('pdo')) { unset($adminer->operators[$pos]); } } - - function dsn($dsn, $username, $password, $options = array()) { + + function dsn($dsn, $username, $password, $options = []) { $options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_SILENT; - $options[PDO::ATTR_STATEMENT_CLASS] = array('Min_PDOStatement'); + $options[PDO::ATTR_STATEMENT_CLASS] = [Min_PDOStatement::class]; try { $this->pdo = new PDO($dsn, $username, $password, $options); } catch (Exception $ex) { @@ -22,13 +22,13 @@ if (extension_loaded('pdo')) { } $this->server_info = @$this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION); } - + /*abstract function select_db($database);*/ - + function quote($string) { return $this->pdo->quote($string); } - + function query($query, $unbuffered = false) { $result = $this->pdo->query($query); $this->error = ""; @@ -42,11 +42,11 @@ if (extension_loaded('pdo')) { $this->store_result($result); return $result; } - + function multi_query($query) { return $this->_result = $this->query($query); } - + function store_result($result = null) { if (!$result) { $result = $this->_result; @@ -61,7 +61,7 @@ if (extension_loaded('pdo')) { $this->affected_rows = $result->rowCount(); return true; } - + function next_result() { if (!$this->_result) { return false; @@ -69,7 +69,7 @@ if (extension_loaded('pdo')) { $this->_result->_offset = 0; return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it } - + function result($query, $field = 0) { $result = $this->query($query); if (!$result) { @@ -79,18 +79,18 @@ if (extension_loaded('pdo')) { return $row[$field]; } } - + class Min_PDOStatement extends PDOStatement { var $_offset = 0, $num_rows; - + function fetch_assoc() { return $this->fetch(PDO::FETCH_ASSOC); } - + function fetch_row() { return $this->fetch(PDO::FETCH_NUM); } - + function fetch_field() { $row = (object) $this->getColumnMeta($this->_offset++); $row->orgtable = $row->table;