diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index 472e7912..d8410d6b 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -710,7 +710,6 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row return array( 'possible_drivers' => array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB"), 'jush' => "mssql", - 'unsigned' => array(), ); } } diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index d5492825..2ab2e517 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -281,6 +281,7 @@ if (!defined("DRIVER")) { class Driver extends SqlDriver { + var $unsigned = array("unsigned", "zerofill", "unsigned zerofill"); var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"); var $functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"); var $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"); @@ -1197,13 +1198,12 @@ if (!defined("DRIVER")) { } /** Get driver config - * @return array ['possible_drivers' => , 'jush' => , 'unsigned' => ] + * @return array ['possible_drivers' => , 'jush' => ] */ function driver_config() { return array( 'possible_drivers' => array("MySQLi", "MySQL", "PDO_MySQL"), 'jush' => "sql", ///< @var string JUSH identifier - 'unsigned' => array("unsigned", "zerofill", "unsigned zerofill"), ///< @var array number variants ); } } diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php index 0e11e878..6a0d75f4 100644 --- a/adminer/drivers/oracle.inc.php +++ b/adminer/drivers/oracle.inc.php @@ -549,7 +549,6 @@ ORDER BY PROCESS return array( 'possible_drivers' => array("OCI8", "PDO_OCI"), 'jush' => "oracle", - 'unsigned' => array(), ); } } diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index c08bce14..103a7015 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -940,7 +940,6 @@ AND typelem = 0" return array( 'possible_drivers' => array("PgSQL", "PDO_PgSQL"), 'jush' => "pgsql", - 'unsigned' => array(), ); } } diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php index d428fbd3..4b683740 100644 --- a/adminer/drivers/sqlite.inc.php +++ b/adminer/drivers/sqlite.inc.php @@ -742,7 +742,6 @@ if (isset($_GET["sqlite"])) { return array( 'possible_drivers' => array("SQLite3", "PDO_SQLite"), 'jush' => "sqlite", - 'unsigned' => array(), ); } } diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php index a0ac55df..7c34a0a5 100644 --- a/adminer/include/bootstrap.inc.php +++ b/adminer/include/bootstrap.inc.php @@ -35,7 +35,7 @@ if ($_GET["script"] == "version") { exit; } -global $adminer, $connection, $driver, $drivers, $enum_length, $error, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $has_token, $token, $translations, $unsigned, $VERSION; // allows including Adminer inside a function +global $adminer, $connection, $driver, $drivers, $enum_length, $error, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $has_token, $token, $translations, $VERSION; // allows including Adminer inside a function if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"]; @@ -82,7 +82,6 @@ $on_actions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var strin $config = driver_config(); $possible_drivers = $config['possible_drivers']; $jush = $config['jush']; -$unsigned = $config['unsigned']; define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost define("DB", $_GET["db"]); // for the sake of speed and size diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php index 3aaf801b..60a3908c 100644 --- a/adminer/include/driver.inc.php +++ b/adminer/include/driver.inc.php @@ -26,6 +26,7 @@ abstract class SqlDriver { var $_conn; protected $types = array(); ///< @var array [$description => [$type => $maximum_unsigned_length, ...], ...] var $editFunctions = array(); ///< @var array of ["$type|$type2" => "$function/$function2"] functions used in editing, [0] - edit and insert, [1] - edit only + var $unsigned = array(); ///< @var array number variants var $operators = array(); ///< @var array operators used in select var $functions = array(); ///< @var array functions used in select var $grouping = array(); ///< @var array grouping functions used in select diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index f250963c..220c2a59 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -209,7 +209,7 @@ function json_row($key, $val = null) { * @return null */ function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) { - global $driver, $unsigned, $on_actions; + global $driver, $on_actions; $type = $field["type"]; ?>