mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-06 14:46:36 +02:00
Code Issues Releases Wiki Activity

PDO: Support namespaces

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-05 14:15:17 +01:00
parent 3da09dd31a
commit 54568ddef6
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adminer/drivers/mysql.inc.php
View File

@@ -236,20 +236,20 @@ if (!defined("DRIVER")) {
function connect($server, $username, $password) {
global $adminer;
$options = array(PDO::MYSQL_ATTR_LOCAL_INFILE => false);
$options = array(\PDO::MYSQL_ATTR_LOCAL_INFILE => false);
$ssl = $adminer->connectSsl();
if ($ssl) {
if ($ssl['key']) {
$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
$options[\PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
}
if ($ssl['cert']) {
$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
$options[\PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
}
if ($ssl['ca']) {
$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
$options[\PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
}
if (isset($ssl['verify'])) {
$options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $ssl['verify'];
$options[\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $ssl['verify'];
}
}
$this->dsn(
@@ -271,7 +271,7 @@ if (!defined("DRIVER")) {
}
function query($query, $unbuffered = false) {
$this->pdo->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
$this->pdo->setAttribute(\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
return parent::query($query, $unbuffered);
}
}

12
adminer/include/pdo.inc.php
View File

@@ -15,14 +15,14 @@ if (extension_loaded('pdo')) {
}
function dsn($dsn, $username, $password, $options = array()) {
$options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_SILENT;
$options[PDO::ATTR_STATEMENT_CLASS] = array('PdoDbStatement');
$options[\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
$options[\PDO::ATTR_STATEMENT_CLASS] = array('Adminer\PdoDbStatement');
try {
$this->pdo = new PDO($dsn, $username, $password, $options);
$this->pdo = new \PDO($dsn, $username, $password, $options);
} catch (Exception $ex) {
auth_error(h($ex->getMessage()));
}
$this->server_info = @$this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
$this->server_info = @$this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION);
}
/*abstract function select_db($database);*/
@@ -86,11 +86,11 @@ if (extension_loaded('pdo')) {
var $_offset = 0, $num_rows;
function fetch_assoc() {
return $this->fetch(PDO::FETCH_ASSOC);
return $this->fetch(\PDO::FETCH_ASSOC);
}
function fetch_row() {
return $this->fetch(PDO::FETCH_NUM);
return $this->fetch(\PDO::FETCH_NUM);
}
function fetch_field() {