PDO Abstraction

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@229 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/abstraction.inc.php b/abstraction.inc.php
index 0ecd25eec266fce7f89df4ecf09766616b2c7d0c..4357405e2655c92aaff347c7940dd891ab3c8d59 100644 (file)
--- a/abstraction.inc.php
+++ b/abstraction.inc.php
@@ -38,6 +38,10 @@ if (extension_loaded("mysqli")) {
                        return (bool) $this->_link;
                }
                
+               function select_db($database) {
+                       return mysql_select_db($database, $this->_link);
+               }
+               
                function query($query) {
                        $result = mysql_query($query, $this->_link);
                        if (!$result) {
@@ -61,26 +65,21 @@ if (extension_loaded("mysqli")) {
                function next_result() {
                        return false;
                }
-
+               
                function result($result, $field = 0) {
                        return mysql_result($result->_result, 0, $field);
                }
                
-               function select_db($database) {
-                       return mysql_select_db($database, $this->_link);
-               }
-               
                function escape_string($string) {
                        return mysql_real_escape_string($string, $this->_link);
                }
        }
        
        class Min_MySQLResult {
-               var $_result, $_offset, $num_rows;
+               var $_result, $_offset = 0, $num_rows;
                
                function Min_MySQLResult($result) {
                        $this->_result = $result;
-                       $this->_offset = 0;
                        $this->num_rows = mysql_num_rows($result);
                }
                
@@ -97,7 +96,6 @@ if (extension_loaded("mysqli")) {
                        $row->orgtable = $row->table;
                        $row->orgname = $row->name;
                        $row->charsetnr = ($row->blob ? 63 : 0);
-                       $row->flags = ($row->primary_key ? 2 : 0);
                        return $row;
                }
                
@@ -108,9 +106,95 @@ if (extension_loaded("mysqli")) {
        
        $mysql = new Min_MySQL;
 
+} elseif (extension_loaded("pdo_mysql")) {
+       class Min_PDO_MySQL extends PDO {
+               var $_dsn, $_username, $_password, $_result, $server_info, $affected_rows, $error;
+               
+               function __construct() {
+               }
+               
+               function connect($server, $username, $password) {
+                       $this->_dsn = "mysql:host=$server";
+                       $this->_username = $username;
+                       $this->_password = $password;
+                       set_exception_handler('auth_error'); // try/catch is not compatible with PHP 4
+                       parent::__construct($this->_dsn, $username, $password);
+                       restore_exception_handler();
+                       $this->setAttribute(13, array('Min_PDOStatement')); // PDO::ATTR_STATEMENT_CLASS
+                       $this->server_info = $this->result($this->query("SELECT VERSION()"));
+                       return true;
+               }
+               
+               function select_db($database) {
+                       parent::__construct("$this->_dsn;dbname=$database", $this->_username, $this->_password); // semicolon in $database is not allowed by PDO
+                       return $this;
+               }
+               
+               function query($query) {
+                       $result = parent::query($query);
+                       if (!$result) {
+                               $errorInfo = $this->errorInfo();
+                               $this->error = $errorInfo[2];
+                               return false;
+                       }
+                       $this->_result = $result;
+                       if (!$result->columnCount()) {
+                               $this->affected_rows = $result->rowCount();
+                               return true;
+                       }
+                       $result->num_rows = $result->rowCount();
+                       return $result;
+               }
+               
+               function multi_query($query) {
+                       return $this->query($query);
+               }
+               
+               function store_result() {
+                       return ($this->_result->columnCount() ? $this->_result : true);
+               }
+               
+               function next_result() {
+                       return $this->_result->nextRowset();
+               }
+               
+               function result($result, $field = 0) {
+                       $row = $result->fetch();
+                       return $row[$field];
+               }
+               
+               function escape_string($string) {
+                       return substr($this->quote($string), 1, -1);
+               }
+       }
+       
+       class Min_PDOStatement extends PDOStatement {
+               var $_offset = 0, $num_rows;
+               
+               function fetch_assoc() {
+                       return $this->fetch(2); // PDO::FETCH_ASSOC
+               }
+               
+               function fetch_row() {
+                       return $this->fetch(3); // PDO::FETCH_NUM
+               }
+               
+               function fetch_field() {
+                       $row = (object) $this->getColumnMeta($this->_offset++);
+                       // table and charset is not available
+                       return $row;
+               }
+               
+               function free() {
+                       // $this->__destruct() is not callable
+               }
+       }
+       
+       $mysql = new Min_PDO_MySQL;
+
 } else {
        page_header(lang('No MySQL extension'));
-       echo "<p class='error'>" . lang('None of supported PHP extensions (%s) are available.', 'mysqli, mysql') . "</p>\n";
+       echo "<p class='error'>" . lang('None of supported PHP extensions (%s) are available.', 'mysqli, mysql, pdo') . "</p>\n";
        page_footer("auth");
        exit;
 }

diff --git a/auth.inc.php b/auth.inc.php
index 45b38056f24da6e8c828adccddc2d8ccc9b3c191..26bdb4f8378f02c302bf491764ae76ec03cfdb8f 100644 (file)
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -30,8 +30,8 @@ if (isset($_POST["server"])) {
        redirect(substr($SELF, 0, -1), lang('Logout successful.'));
 }
 
-$username = $_SESSION["usernames"][$_GET["server"]];
-if (!isset($username) || !$mysql->connect($_GET["server"], $username, $_SESSION["passwords"][$_GET["server"]])) {
+function auth_error() {
+       $username = $_SESSION["usernames"][$_GET["server"]];
        if ($_POST["token"] && !isset($username)) {
                $_POST["token"] = token();
        }
@@ -74,6 +74,11 @@ if (!isset($username) || !$mysql->connect($_GET["server"], $username, $_SESSION[
        </form>
        <?php
        page_footer("auth");
+}
+
+$username = $_SESSION["usernames"][$_GET["server"]];
+if (!isset($username) || !$mysql->connect($_GET["server"], $username, $_SESSION["passwords"][$_GET["server"]])) {
+       auth_error();
        exit;
 }
 $mysql->query("SET SQL_QUOTE_SHOW_CREATE=1");