' . h($name) . '
'
- : ''
+ ? '
'
+ : ''
) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate) : "");
?>
+
"MySQL") + $drivers;
-}
+$drivers = array("server" => "MySQL") + $drivers;
if (!defined("DRIVER")) {
+ $possible_drivers = array("MySQLi", "MySQL", "PDO_MySQL");
define("DRIVER", "server"); // server - backwards compatibility
// MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
if (extension_loaded("mysqli")) {
@@ -164,7 +160,7 @@ if (!defined("DRIVER")) {
class Min_Result {
var
$num_rows, ///< @var int number of rows in the result
- $_result ///< @access private
+ $_result, $_offset = 0 ///< @access private
;
/** Constructor
@@ -193,7 +189,7 @@ if (!defined("DRIVER")) {
* @return object properties: name, type, orgtable, orgname, charsetnr
*/
function fetch_field() {
- $return = mysql_fetch_field($this->_result);
+ $return = mysql_fetch_field($this->_result, $this->_offset++); // offset required under certain conditions
$return->orgtable = $return->table;
$return->orgname = $return->name;
$return->charsetnr = ($return->blob ? 63 : 0);
@@ -212,7 +208,7 @@ if (!defined("DRIVER")) {
var $extension = "PDO_MySQL";
function connect($server, $username, $password) {
- $this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:([0-9])~', ';port=\\1', $server)), $username, $password);
+ $this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
$this->query("SET NAMES utf8"); // charset in DSN is ignored
return true;
}
@@ -397,10 +393,9 @@ if (!defined("DRIVER")) {
/** Get information about fields
* @param string
- * @param bool display hidden table columns
* @return array array($name => array("field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => ))
*/
- function fields($table, $hidden = false) {
+ function fields($table) {
$return = array();
foreach (get_rows("SHOW FULL COLUMNS FROM " . table($table)) as $row) {
preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
@@ -820,7 +815,7 @@ if (!defined("DRIVER")) {
global $connection;
$return = $connection->result("SHOW CREATE TABLE " . table($table), 1);
if (!$auto_increment) {
- $return = preg_replace('~ AUTO_INCREMENT=[0-9]+~', '', $return); //! skip comments
+ $return = preg_replace('~ AUTO_INCREMENT=\\d+~', '', $return); //! skip comments
}
return $return;
}
diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index cbdb61d5..1b001f0a 100644
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -1,11 +1,8 @@
0") . "
-ORDER BY a.attnum < 0, a.attnum"
+AND a.attnum > 0
+ORDER BY a.attnum"
) as $row) {
//! collation, primary
ereg('(.*)(\\((.*)\\))?', $row["full_type"], $match);
diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 5418ac6c..87498ae1 100644
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -1,18 +1,83 @@
_link = new SQLite3($filename);
+ $version = $this->_link->version();
+ $this->server_info = $version["versionString"];
+ }
+
+ function query($query) {
+ $result = @$this->_link->query($query);
+ if (!$result) {
+ $this->error = $this->_link->lastErrorMsg();
+ return false;
+ } elseif ($result->numColumns()) {
+ return new Min_Result($result);
+ }
+ $this->affected_rows = $this->_link->changes();
+ return true;
+ }
+
+ function quote($string) {
+ return "'" . $this->_link->escapeString($string) . "'";
+ }
+
+ function store_result() {
+ return $this->_result;
+ }
+
+ function result($query, $field = 0) {
+ $result = $this->query($query);
+ if (!is_object($result)) {
+ return false;
+ }
+ $row = $result->_result->fetchArray();
+ return $row[$field];
+ }
+ }
+
+ class Min_Result {
+ var $_result, $_offset = 0, $num_rows;
+
+ function Min_Result($result) {
+ $this->_result = $result;
+ }
+
+ function fetch_assoc() {
+ return $this->_result->fetchArray(SQLITE3_ASSOC);
+ }
+
+ function fetch_row() {
+ return $this->_result->fetchArray(SQLITE3_NUM);
+ }
+
+ function fetch_field() {
+ $column = $this->_offset++;
+ $type = $this->_result->columnType($column);
+ return (object) array(
+ "name" => $this->_result->columnName($column),
+ "type" => $type,
+ "charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
+ );
+ }
+
+ function __desctruct() {
+ return $this->_result->finalize();
+ }
+ }
+
+ } else {
class Min_SQLite {
var $extension = "SQLite", $server_info, $affected_rows, $error, $_link;
@@ -95,77 +160,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
}
- } else {
-
- class Min_SQLite {
- var $extension = "SQLite3", $server_info, $affected_rows, $error, $_link;
-
- function Min_SQLite($filename) {
- $this->_link = new SQLite3($filename);
- $version = $this->_link->version();
- $this->server_info = $version["versionString"];
- }
-
- function query($query) {
- $result = @$this->_link->query($query);
- if (!$result) {
- $this->error = $this->_link->lastErrorMsg();
- return false;
- } elseif ($result->numColumns()) {
- return new Min_Result($result);
- }
- $this->affected_rows = $this->_link->changes();
- return true;
- }
-
- function quote($string) {
- return "'" . $this->_link->escapeString($string) . "'";
- }
-
- function store_result() {
- return $this->_result;
- }
-
- function result($query, $field = 0) {
- $result = $this->query($query);
- if (!is_object($result)) {
- return false;
- }
- $row = $result->_result->fetchArray();
- return $row[$field];
- }
- }
-
- class Min_Result {
- var $_result, $_offset = 0, $num_rows;
-
- function Min_Result($result) {
- $this->_result = $result;
- }
-
- function fetch_assoc() {
- return $this->_result->fetchArray(SQLITE3_ASSOC);
- }
-
- function fetch_row() {
- return $this->_result->fetchArray(SQLITE3_NUM);
- }
-
- function fetch_field() {
- $column = $this->_offset++;
- $type = $this->_result->columnType($column);
- return (object) array(
- "name" => $this->_result->columnName($column),
- "type" => $type,
- "charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
- );
- }
-
- function __desctruct() {
- return $this->_result->finalize();
- }
- }
-
}
} elseif (extension_loaded("pdo_sqlite")) {
@@ -269,7 +263,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
return !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
}
- function fields($table, $hidden = false) {
+ function fields($table) {
$return = array();
foreach (get_rows("PRAGMA table_info(" . table($table) . ")") as $row) {
$type = strtolower($row["type"]);
diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index b813f87a..fb9f5188 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -7,8 +7,9 @@ if ($_POST) {
$cookie .= "&$key=" . urlencode($_POST[$key]);
}
cookie("adminer_export", substr($cookie, 1));
- $ext = dump_headers(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
- if ($_POST["format"] == "sql") {
+ $ext = $adminer->dumpHeaders(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
+ $is_sql = ($_POST["format"] == "sql");
+ if ($is_sql) {
echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
" . ($jush != "sql" ? "" : "SET NAMES utf8;
@@ -29,13 +30,13 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
}
foreach ((array) $databases as $db) {
if ($connection->select_db($db)) {
- if ($_POST["format"] == "sql" && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
+ if ($is_sql && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
if ($style == "DROP+CREATE") {
echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n";
}
echo ($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n";
}
- if ($_POST["format"] == "sql") {
+ if ($is_sql) {
if ($style) {
echo use_sql($db) . ";\n\n";
}
@@ -72,11 +73,11 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
if ($ext == "tar") {
ob_start();
}
- dump_table($row["Name"], ($table ? $_POST["table_style"] : ""));
+ $adminer->dumpTable($row["Name"], ($table ? $_POST["table_style"] : ""));
if ($data) {
- dump_data($row["Name"], $_POST["data_style"]);
+ $adminer->dumpData($row["Name"], $_POST["data_style"], "SELECT * FROM " . table($row["Name"]));
}
- if ($_POST["format"] == "sql" && $_POST["triggers"]) {
+ if ($is_sql && $_POST["triggers"]) {
$triggers = trigger_sql($row["Name"], $_POST["table_style"]);
if ($triggers) {
echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
@@ -84,23 +85,23 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
}
if ($ext == "tar") {
echo tar_file((DB != "" ? "" : "$db/") . "$row[Name].csv", ob_get_clean());
- } elseif ($_POST["format"] == "sql") {
+ } elseif ($is_sql) {
echo "\n";
}
- } elseif ($_POST["format"] == "sql") {
+ } elseif ($is_sql) {
$views[] = $row["Name"];
}
}
}
foreach ($views as $view) {
- dump_table($view, $_POST["table_style"], true);
+ $adminer->dumpTable($view, $_POST["table_style"], true);
}
if ($ext == "tar") {
echo pack("x512");
}
}
- if ($style == "CREATE+ALTER" && $_POST["format"] == "sql") {
+ if ($style == "CREATE+ALTER" && $is_sql) {
// drop old tables
$query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()";
echo "DELIMITER ;;
@@ -136,11 +137,14 @@ CALL adminer_alter(@adminer_alter);
DROP PROCEDURE adminer_alter;
";
}
- if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $_POST["format"] == "sql") {
+ if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $is_sql) {
echo "SELECT @adminer_alter;\n";
}
}
}
+ if ($is_sql) {
+ echo "-- " . $connection->result("SELECT NOW()") . "\n";
+ }
exit;
}
@@ -163,8 +167,8 @@ if (!$row) {
$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
}
$checked = ($_GET["dump"] == "");
-echo "
>> " . h(str_replace("\n", " ", $query)) . " " . lang('Edit') . "\n";
+ return "
>> " . h(str_replace("\n", " ", $query)) . " " . lang('Edit') . "\n";
}
/** Description of a row in a table
@@ -157,7 +166,7 @@ document.getElementById('username').focus();
* @return string
*/
function selectVal($val, $link, $field) {
- $return = ($val != "NULL" && ereg("^char|binary", $field["type"]) ? "$val" : $val);
+ $return = ($val != "NULL" && ereg("char|binary", $field["type"]) && !ereg("var", $field["type"]) ? "$val" : $val);
if (ereg('blob|bytea|raw|file', $field["type"]) && !is_utf8($val)) {
$return = lang('%d byte(s)', strlen(html_entity_decode($val, ENT_QUOTES)));
}
@@ -429,8 +438,10 @@ document.getElementById('username').focus();
*/
function editInput($table, $field, $attrs, $value) {
if ($field["type"] == "enum") {
- return ($field["null"] ? " " : "")
+ return (isset($_GET["select"]) ? " " : "")
+ . ($field["null"] ? " " : "")
. ""
+ . enum_input("radio", $attrs, $field, $value)
;
}
return "";
@@ -452,7 +463,7 @@ document.getElementById('username').focus();
} elseif (ereg('^([+-]|\\|\\|)$', $function)) {
$return = idf_escape($name) . " $function $return";
} elseif (ereg('^[+-] interval$', $function)) {
- $return = idf_escape($name) . " $function " . (preg_match("~^([0-9]+|'[0-9.: -]') [A-Z_]+$~i", $value) ? $value : $return);
+ $return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+$~i", $value) ? $value : $return);
} elseif (ereg('^(addtime|subtime|concat)$', $function)) {
$return = "$function(" . idf_escape($name) . ", $return)";
} elseif (ereg('^(md5|sha1|password|encrypt|hex)$', $function)) {
@@ -465,11 +476,9 @@ document.getElementById('username').focus();
}
/** Returns export output options
- * @param bool generate select (otherwise radio)
- * @param string
- * @return string
+ * @return array
*/
- function dumpOutput($select, $value = "") {
+ function dumpOutput() {
$return = array('text' => lang('open'), 'file' => lang('save'));
if (function_exists('gzencode')) {
$return['gz'] = 'gzip';
@@ -478,16 +487,199 @@ document.getElementById('username').focus();
$return['bz2'] = 'bzip2';
}
// ZipArchive requires temporary file, ZIP can be created by gzcompress - see PEAR File_Archive
- return html_select("output", $return, $value, $select);
+ return $return;
}
/** Returns export format options
- * @param bool generate select (otherwise radio)
- * @param string
- * @return string
+ * @return array
*/
- function dumpFormat($select, $value = "") {
- return html_select("format", array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
+ function dumpFormat() {
+ return array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
+ }
+
+ /** Export table structure
+ * @param string
+ * @param string
+ * @param bool
+ * @return null prints data
+ */
+ function dumpTable($table, $style, $is_view = false) {
+ if ($_POST["format"] != "sql") {
+ echo "\xef\xbb\xbf"; // UTF-8 byte order mark
+ if ($style) {
+ dump_csv(array_keys(fields($table)));
+ }
+ } elseif ($style) {
+ $create = create_sql($table, $_POST["auto_increment"]);
+ if ($create) {
+ if ($style == "DROP+CREATE") {
+ echo "DROP " . ($is_view ? "VIEW" : "TABLE") . " IF EXISTS " . table($table) . ";\n";
+ }
+ if ($is_view) {
+ // remove DEFINER with current user
+ $create = preg_replace('~^([A-Z =]+) DEFINER=`' . str_replace("@", "`@`", logged_user()) . '`~', '\\1', $create); //! proper escaping of user
+ }
+ echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n";
+ }
+ if ($style == "CREATE+ALTER" && !$is_view) {
+ // create procedure which iterates over original columns and adds new and removes old
+ $query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION";
+ echo "DELIMITER ;;
+CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
+ DECLARE _column_name, _collation_name, after varchar(64) DEFAULT '';
+ DECLARE _column_type, _column_default text;
+ DECLARE _is_nullable char(3);
+ DECLARE _extra varchar(30);
+ DECLARE _column_comment varchar(255);
+ DECLARE done, set_after bool DEFAULT 0;
+ DECLARE add_columns text DEFAULT '";
+ $fields = array();
+ $after = "";
+ foreach (get_rows($query) as $row) {
+ $default = $row["COLUMN_DEFAULT"];
+ $row["default"] = (isset($default) ? q($default) : "NULL");
+ $row["after"] = q($after); //! rgt AFTER lft, lft AFTER id doesn't work
+ $row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"])
+ . " $row[COLUMN_TYPE]"
+ . ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "")
+ . (isset($default) ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
+ . ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
+ . ($row["EXTRA"] ? " $row[EXTRA]" : "")
+ . ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "")
+ . ($after ? " AFTER " . idf_escape($after) : " FIRST")
+ );
+ echo ", ADD $row[alter]";
+ $fields[] = $row;
+ $after = $row["COLUMN_NAME"];
+ }
+ echo "';
+ DECLARE columns CURSOR FOR $query;
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
+ SET @alter_table = '';
+ OPEN columns;
+ REPEAT
+ FETCH columns INTO _column_name, _column_default, _is_nullable, _collation_name, _column_type, _extra, _column_comment;
+ IF NOT done THEN
+ SET set_after = 1;
+ CASE _column_name";
+ foreach ($fields as $row) {
+ echo "
+ WHEN " . q($row["COLUMN_NAME"]) . " THEN
+ SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', '');
+ IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . q($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . q($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN
+ SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]');
+ END IF;"; //! don't replace in comment
+ }
+ echo "
+ ELSE
+ SET @alter_table = CONCAT(@alter_table, ', DROP ', _column_name);
+ SET set_after = 0;
+ END CASE;
+ IF set_after THEN
+ SET after = _column_name;
+ END IF;
+ END IF;
+ UNTIL done END REPEAT;
+ CLOSE columns;
+ IF @alter_table != '' OR add_columns != '' THEN
+ SET alter_command = CONCAT(alter_command, 'ALTER TABLE " . table($table) . "', SUBSTR(CONCAT(add_columns, @alter_table), 2), ';\\n');
+ END IF;
+END;;
+DELIMITER ;
+CALL adminer_alter(@adminer_alter);
+DROP PROCEDURE adminer_alter;
+
+";
+ //! indexes
+ }
+ }
+ }
+
+ /** Export table data
+ * @param string
+ * @param string
+ * @param string
+ * @return null prints data
+ */
+ function dumpData($table, $style, $query) {
+ global $connection, $jush;
+ $max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
+ if ($style) {
+ if ($_POST["format"] == "sql" && $style == "TRUNCATE+INSERT") {
+ echo truncate_sql($table) . ";\n";
+ }
+ $fields = fields($table);
+ $result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
+ if ($result) {
+ $insert = "";
+ $buffer = "";
+ while ($row = $result->fetch_assoc()) {
+ if ($_POST["format"] != "sql") {
+ dump_csv($row);
+ } else {
+ if (!$insert) {
+ $insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
+ }
+ foreach ($row as $key => $val) {
+ $row[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
+ }
+ $s = implode(",\t", $row);
+ if ($style == "INSERT+UPDATE") {
+ $set = array();
+ foreach ($row as $key => $val) {
+ $set[] = idf_escape($key) . " = $val";
+ }
+ echo "$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n";
+ } else {
+ $s = ($max_packet ? "\n" : " ") . "($s)";
+ if (!$buffer) {
+ $buffer = $insert . $s;
+ } elseif (strlen($buffer) + 2 + strlen($s) < $max_packet) { // 2 - separator and terminator length
+ $buffer .= ",$s";
+ } else {
+ $buffer .= ";\n";
+ echo $buffer;
+ $buffer = $insert . $s;
+ }
+ }
+ }
+ }
+ if ($_POST["format"] == "sql" && $style != "INSERT+UPDATE" && $buffer) {
+ $buffer .= ";\n";
+ echo $buffer;
+ }
+ } elseif ($_POST["format"] == "sql") {
+ echo "-- " . str_replace("\n", " ", $connection->error) . "\n";
+ }
+ }
+ }
+
+ /** Send headers for export
+ * @param string
+ * @param bool
+ * @return string extension
+ */
+ function dumpHeaders($identifier, $multi_table = false) {
+ $filename = ($identifier != "" ? friendly_url($identifier) : "adminer");
+ $output = $_POST["output"];
+ $ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
+ header("Content-Type: " .
+ ($output == "bz2" ? "application/x-bzip" :
+ ($output == "gz" ? "application/x-gzip" :
+ ($ext == "tar" ? "application/x-tar" :
+ ($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
+ ))));
+ if ($output != "text") {
+ header("Content-Disposition: attachment; filename=$filename.$ext" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
+ }
+ session_write_close();
+ if ($_POST["output"] == "bz2") {
+ ob_start('bzcompress', 1e6);
+ }
+ if ($_POST["output"] == "gz") {
+ ob_start('gzencode', 1e6);
+ }
+ return $ext;
}
/** Prints navigation after Adminer title
@@ -524,13 +716,13 @@ document.getElementById('username').focus();