gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move mysqli flag description sot Dbi class

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-09-06 14:17:45 +02:00
parent 6bd94464c8
commit bc6486e2e0
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/classes/Dbi/DbiMysqli.php
View File

@ -57,6 +57,22 @@ if (! defined('MYSQLI_TYPE_JSON')) {
*/
class DbiMysqli implements DbiExtension
{
static private $pma_mysqli_flag_names = array(
MYSQLI_NUM_FLAG => 'num',
MYSQLI_PART_KEY_FLAG => 'part_key',
MYSQLI_SET_FLAG => 'set',
MYSQLI_TIMESTAMP_FLAG => 'timestamp',
MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
MYSQLI_ENUM_FLAG => 'enum',
MYSQLI_ZEROFILL_FLAG => 'zerofill',
MYSQLI_UNSIGNED_FLAG => 'unsigned',
MYSQLI_BLOB_FLAG => 'blob',
MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
MYSQLI_PRI_KEY_FLAG => 'primary_key',
MYSQLI_NOT_NULL_FLAG => 'not_null',
);
/**
* connects to the database server
*
@ -540,7 +556,7 @@ class DbiMysqli implements DbiExtension
$charsetnr = $f->charsetnr;
$f = $f->flags;
$flags = array();
foreach ($GLOBALS['pma_mysqli_flag_names'] as $flag => $name) {
foreach (self::$pma_mysqli_flag_names as $flag => $name) {
if ($f & $flag) {
$flags[] = $name;
}

1
libraries/database_interface.inc.php
View File

@ -79,7 +79,6 @@ if (defined('TESTSUITE')) {
$extension = new DbiMysql();
break;
case 'mysqli' :
include_once 'libraries/dbi/dbi_mysqli.inc.php';
$extension = new DbiMysqli();
break;
}

27
libraries/dbi/dbi_mysqli.inc.php
View File

@ -1,27 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Interface to the improved MySQL extension (MySQLi)
*
* @package PhpMyAdmin-DBI
* @subpackage MySQLi
*/
/**
* Names of field flags.
*/
$GLOBALS['pma_mysqli_flag_names'] = array(
MYSQLI_NUM_FLAG => 'num',
MYSQLI_PART_KEY_FLAG => 'part_key',
MYSQLI_SET_FLAG => 'set',
MYSQLI_TIMESTAMP_FLAG => 'timestamp',
MYSQLI_AUTO_INCREMENT_FLAG => 'auto_increment',
MYSQLI_ENUM_FLAG => 'enum',
MYSQLI_ZEROFILL_FLAG => 'zerofill',
MYSQLI_UNSIGNED_FLAG => 'unsigned',
MYSQLI_BLOB_FLAG => 'blob',
MYSQLI_MULTIPLE_KEY_FLAG => 'multiple_key',
MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
MYSQLI_PRI_KEY_FLAG => 'primary_key',
MYSQLI_NOT_NULL_FLAG => 'not_null',
);