Release 4.7.6

.editorconfig

@@ -1,20 +0,0 @@
-# https://editorconfig.org/
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{php,css,js,xml}]
-indent_style = tab
-
-[*.json]
-indent_style = space
-indent_size = 4
-
-[*.md]
-indent_style = space
-trim_trailing_whitespace = false
-max_line_length = 120

.gitattributes

@@ -1,6 +0,0 @@
-/.gitattributes export-ignore
-/.github export-ignore
-/.gitignore export-ignore
-/.gitmodules export-ignore
-/.travis.yml export-ignore
-/tests export-ignore

.github/FUNDING.yml

@@ -1,3 +1,2 @@
-github: vrana
 patreon: jakubvrana
-custom: ["https://www.paypal.com/donate/?item_name=Donation+to+Adminer&business=jakub%40vrana.cz"]
+custom: ["https://sourceforge.net/p/adminer/donate/"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Adminer version:** please use latest published or Git
-**Driver:** e.g. MySQL
-**Database version:** e.g. 10.1.48-MariaDB
-
-Please provide reproducible steps including a SQL dump (with no personal information) if applicable.

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "jush"]
 	path = externals/jush
-	url = https://github.com/vrana/jush
+	url = git://github.com/vrana/jush
 [submodule "JsShrink"]
 	path = externals/JsShrink
-	url = https://github.com/vrana/JsShrink
+	url = git://github.com/vrana/JsShrink

.travis.yml

@@ -4,10 +4,4 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - 7.4
-  - 8.0
-  - 8.1
-  - 8.2
-  - 8.3
-  - 8.4
 script: git diff --name-only $TRAVIS_COMMIT_RANGE | grep '\.php$' | xargs -n1 -P8 php -l | grep -v 'No syntax errors'; test $? -eq 1

LICENSE

@@ -1 +0,0 @@
-Apache License 2.0 or GPL 2

Makefile

@@ -1,39 +0,0 @@
-ROOT_DIRECTORY = $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
-PHP := $(shell which php)
-PORT := 8000
-
-
-.DEFAULT_GOAL := default
-
-
-.PHONY: default
-default: compile
-
-.PHONY: compile
-compile:
-	$(PHP) $(ROOT_DIRECTORY)/compile.php
-
-.PHONY: server
-server:
-	php \
-	  --server 127.0.0.1:$(PORT) \
-	  --docroot $(ROOT_DIRECTORY)
-
-.PHONY: initialize
-initialize:
-	git \
-	  -C $(ROOT_DIRECTORY) \
-	  submodule \
-	  update \
-	  --init \
-	  --recursive
-
-.PHONY: clean
-clean:
-	rm \
-	  --recursive \
-	  --force \
-	  $(ROOT_DIRECTORY)/adminer.php
-
-.PHONY: clean.all
-clean.all: clean

SECURITY.md

@@ -1,11 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-I support only the last published version and the last development version (last commit).
-
-## Reporting a Vulnerability
-
-To report a vulnerability, add a new draft security advisory at https://github.com/vrana/adminer/security/advisories/new.
-
-I handle security issues with top priority. If you don't hear from me in a week then please ping the bug. Once I accept the bug, the fix should be available and new version released within days. I will mark the bug as public after releasing a new version or declining the bug.

adminer/call.inc.php

@@ -1,7 +1,5 @@
 <?php
-namespace Adminer;
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["call"]);
-
-$PROCEDURE = ($_GET["name"] ?: $_GET["call"]);
 page_header(lang('Call') . ": " . h($PROCEDURE), $error);
 
 $routine = routine($_GET["call"], (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
@@ -34,13 +32,13 @@ if (!$error && $_POST) {
 	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
 	$start = microtime(true);
 	$result = $connection->multi_query($query);
-	$affected = $connection->affected_rows; // getting warnings overwrites this
+	$affected = $connection->affected_rows; // getting warnigns overwrites this
 	echo $adminer->selectQuery($query, $start, !$result);
 	
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
-		$connection2 = connect($adminer->credentials());
+		$connection2 = connect();
 		if (is_object($connection2)) {
 			$connection2->select_db(DB);
 		}
@@ -66,15 +64,18 @@ if (!$error && $_POST) {
 <form action="" method="post">
 <?php
 if ($in) {
-	echo "<table class='layout'>\n";
+	echo "<table cellspacing='0' class='layout'>\n";
 	foreach ($in as $key) {
 		$field = $routine["fields"][$key];
 		$name = $field["field"];
 		echo "<tr><th>" . $adminer->fieldName($field);
 		$value = $_POST["fields"][$name];
 		if ($value != "") {
+			if ($field["type"] == "enum") {
+				$value = +$value;
+			}
 			if ($field["type"] == "set") {
-				$value = implode(",", $value);
+				$value = array_sum($value);
 			}
 		}
 		input($field, $value, (string) $_POST["function"][$name]); // param name can be empty
@@ -87,25 +88,3 @@ if ($in) {
 <input type="submit" value="<?php echo lang('Call'); ?>">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>
-
-<pre>
-<?php
-function pre_tr($s) {
-	return preg_replace('~^~m', '<tr>', preg_replace('~\|~', '<td>', preg_replace('~\|$~m', "", rtrim($s))));
-}
-$table = '(\+--[-+]+\+\n)';
-$row = '(\| .* \|\n)';
-echo preg_replace_callback(
-	"~^$table?$row$table?($row*)$table?~m",
-	function ($match) {
-		$first_row = pre_tr($match[2]);
-		return "<table>\n" . ($match[1] ? "<thead>$first_row</thead>\n" : $first_row) . pre_tr($match[4]) . "\n</table>";
-	},
-	preg_replace(
-		'~(\n(    -|mysql)&gt; )(.+)~',
-		"\\1<code class='jush-sql'>\\3</code>",
-		preg_replace('~(.+)\n---+\n~', "<b>\\1</b>\n", h($routine['comment']))
-	)
-);
-?>
-</pre>

adminer/check.inc.php

@@ -1,51 +0,0 @@
-<?php
-namespace Adminer;
-
-$TABLE = $_GET["check"];
-$name = $_GET["name"];
-$row = $_POST;
-
-if ($row && !$error) {
-	if (JUSH == "sqlite") {
-		$result = recreate_table($TABLE, $TABLE, array(), array(), array(), 0, array(), $name, ($row["drop"] ? "" : $row["clause"]));
-	} else {
-		$result = ($name == "" || queries("ALTER TABLE " . table($TABLE) . " DROP CONSTRAINT " . idf_escape($name)));
-		if (!$row["drop"]) {
-			$result = queries("ALTER TABLE " . table($TABLE) . " ADD" . ($row["name"] != "" ? " CONSTRAINT " . idf_escape($row["name"]) : "") . " CHECK ($row[clause])"); //! SQL injection
-		}
-	}
-	queries_redirect(
-		ME . "table=" . urlencode($TABLE),
-		($row["drop"] ? lang('Check has been dropped.') : ($name != "" ? lang('Check has been altered.') : lang('Check has been created.'))),
-		$result
-	);
-}
-
-page_header(($name != "" ? lang('Alter check') . ": " . h($name) : lang('Create check')), $error, array("table" => $TABLE));
-
-if (!$row) {
-	$checks = $driver->checkConstraints($TABLE);
-	$row = array("name" => $name, "clause" => $checks[$name]);
-}
-?>
-
-<form action="" method="post">
-<p><?php
-if (JUSH != "sqlite") {
-	echo lang('Name') . ': <input name="name" value="' . h($row["name"]) . '" data-maxlength="64" autocapitalize="off"> ';
-}
-echo doc_link(array(
-	'sql' => "create-table-check-constraints.html",
-	'mariadb' => "constraint/",
-	'pgsql' => "ddl-constraints.html#DDL-CONSTRAINTS-CHECK-CONSTRAINTS",
-	'mssql' => "relational-databases/tables/create-check-constraints",
-	'sqlite' => "lang_createtable.html#check_constraints",
-), "?");
-?>
-<p><?php textarea("clause", $row["clause"]); ?>
-<p><input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($name != "") { ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
-<?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-</form>

adminer/create.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["create"];
 $partition_by = array();
 foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
@@ -48,19 +46,22 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 			$foreign_key = $foreign_keys[$field["type"]];
 			$type_field = ($foreign_key !== null ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
 			if ($field["field"] != "") {
-				if (!$field["generated"]) {
+				if (!$field["has_default"]) {
 					$field["default"] = null;
 				}
+				if ($key == $row["auto_increment_col"]) {
+					$field["auto_increment"] = true;
+				}
 				$process_field = process_field($field, $type_field);
 				$all_fields[] = array($field["orig"], $process_field, $after);
-				if (!$orig_field || $process_field !== process_field($orig_field, $orig_field)) {
+				if ($process_field != process_field($orig_field, $orig_field)) {
 					$fields[] = array($field["orig"], $process_field, $after);
 					if ($field["orig"] != "" || $after) {
 						$use_all_fields = true;
 					}
 				}
 				if ($foreign_key !== null) {
-					$foreign[idf_escape($field["field"])] = ($TABLE != "" && JUSH != "sqlite" ? "ADD" : " ") . format_foreign_key(array(
+					$foreign[idf_escape($field["field"])] = ($TABLE != "" && $jush != "sqlite" ? "ADD" : " ") . format_foreign_key(array(
 						'table' => $foreign_keys[$field["type"]],
 						'source' => array($field["field"]),
 						'target' => array($type_field["field"]),
@@ -81,40 +82,21 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 		}
 
 		$partitioning = "";
-		if (support("partitioning")) {
+		if ($partition_by[$row["partition_by"]]) {
-			if (isset($partition_by[$row["partition_by"]])) {
-				$params = array_filter($row, function ($key) {
-					return preg_match('~^partition~', $key);
-				}, ARRAY_FILTER_USE_KEY);
-
-				foreach ($params["partition_names"] as $key => $name) {
-					if ($name == "") {
-						unset($params["partition_names"][$key]);
-						unset($params["partition_values"][$key]);
-					}
-				}
-
-				if ($params != get_partitions_info($TABLE)) {
 			$partitions = array();
-					if ($params["partition_by"] == 'RANGE' || $params["partition_by"] == 'LIST') {
+			if ($row["partition_by"] == 'RANGE' || $row["partition_by"] == 'LIST') {
-						foreach ($params["partition_names"] as $key => $name) {
+				foreach (array_filter($row["partition_names"]) as $key => $val) {
-							$value = $params["partition_values"][$key];
+					$value = $row["partition_values"][$key];
-							$partitions[] = "\n  PARTITION " . idf_escape($name) . " VALUES " . ($params["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
+					$partitions[] = "\n  PARTITION " . idf_escape($val) . " VALUES " . ($row["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
 				}
 			}
-
+			$partitioning .= "\nPARTITION BY $row[partition_by]($row[partition])" . ($partitions // $row["partition"] can be expression, not only column
-					// $params["partition"] can be expression, not only column
+				? " (" . implode(",", $partitions) . "\n)"
-					$partitioning .= "\nPARTITION BY $params[partition_by]($params[partition])";
+				: ($row["partitions"] ? " PARTITIONS " . (+$row["partitions"]) : "")
-					if ($partitions) {
+			);
-						$partitioning .= " (" . implode(",", $partitions) . "\n)";
+		} elseif (support("partitioning") && preg_match("~partitioned~", $table_status["Create_options"])) {
-					} elseif ($params["partitions"]) {
-						$partitioning .= " PARTITIONS " . (+$params["partitions"]);
-					}
-				}
-			} elseif (preg_match("~partitioned~", $table_status["Create_options"])) {
 			$partitioning .= "\nREMOVE PARTITIONING";
 		}
-		}
 
 		$message = lang('Table has been altered.');
 		if ($TABLE == "") {
@@ -126,7 +108,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 		queries_redirect(ME . (support("table") ? "table=" : "select=") . urlencode($name), $message, alter_table(
 			$TABLE,
 			$name,
-			(JUSH == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
+			($jush == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
 			$foreign,
 			($row["Comment"] != $table_status["Comment"] ? $row["Comment"] : null),
 			($row["Engine"] && $row["Engine"] != $table_status["Engine"] ? $row["Engine"] : ""),
@@ -140,7 +122,6 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error, array("table" => $TABLE), h($TABLE));
 
 if (!$_POST) {
-	$types = $driver->types();
 	$row = array(
 		"Engine" => $_COOKIE["adminer_engine"],
 		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")), "on_update" => "")),
@@ -155,14 +136,18 @@ if (!$_POST) {
 			$row["Auto_increment"] = "";
 		}
 		foreach ($orig_fields as $field) {
-			$field["generated"] = $field["generated"] ?: (isset($field["default"]) ? "DEFAULT" : "");
+			$field["has_default"] = isset($field["default"]);
 			$row["fields"][] = $field;
 		}
 
 		if (support("partitioning")) {
-			$row += get_partitions_info($TABLE);
+			$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($TABLE);
-			$row["partition_names"][] = "";
+			$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_ORDINAL_POSITION, PARTITION_EXPRESSION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
-			$row["partition_values"][] = "";
+			list($row["partition_by"], $row["partitions"], $row["partition"]) = $result->fetch_row();
+			$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+			$partitions[""] = "";
+			$row["partition_names"] = array_keys($partitions);
+			$row["partition_values"] = array_values($partitions);
 		}
 	}
 }
@@ -181,66 +166,54 @@ foreach ($engines as $engine) {
 <form action="" method="post" id="form">
 <p>
 <?php if (support("columns") || $TABLE == "") { ?>
-<?php echo lang('Table name'); ?>: <input name="name"<?php echo ($TABLE == "" && !$_POST ? " autofocus" : ""); ?> data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php echo lang('Table name'); ?>: <input name="name" data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
+<?php if ($TABLE == "" && !$_POST) { echo script("focus(qs('#form')['name']);"); } ?>
- <?php
+<?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
-	if ($collations) {
+ <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
-		echo "<datalist id='collations'>" . optionlist($collations) . "</datalist>";
-		echo (preg_match("~sqlite|mssql~", JUSH) ? "" : "<input list='collations' name='Collation' value='" . h($row["Collation"]) . "' placeholder='(" . lang('collation') . ")'>");
-	}
-	?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
 <?php if (support("columns")) { ?>
 <div class="scrollable">
-<table id="edit-fields" class="nowrap">
+<table cellspacing="0" id="edit-fields" class="nowrap">
 <?php
-	edit_fields($row["fields"], $collations, "TABLE", $foreign_keys);
+edit_fields($row["fields"], $collations, "TABLE", $foreign_keys);
-	?>
+?>
 </table>
 <?php echo script("editFields();"); ?>
 </div>
 <p>
-<?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" class="size" value="<?php echo h($row["Auto_increment"]); ?>">
+<?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
 <?php echo checkbox("defaults", 1, ($_POST ? $_POST["defaults"] : adminer_setting("defaults")), lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
-<?php
+<?php echo (support("comment")
-	$comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
+	? checkbox("comments", 1, ($_POST ? $_POST["comments"] : adminer_setting("comments")), lang('Comment'), "editingCommentsClick(this, true);", "jsonly")
-	echo (support("comment")
+		. ' <input name="Comment" value="' . h($row["Comment"]) . '" data-maxlength="' . (min_version(5.5) ? 2048 : 60) . '">'
-		? checkbox("comments", 1, $comments, lang('Comment'), "editingCommentsClick(this, true);", "jsonly")
-			. ' ' . (preg_match('~\n~', $row["Comment"])
-				? "<textarea name='Comment' rows='2' cols='20'" . ($comments ? "" : " class='hidden'") . ">" . h($row["Comment"]) . "</textarea>"
-				: '<input name="Comment" value="' . h($row["Comment"]) . '" data-maxlength="' . (min_version(5.5) ? 2048 : 60) . '"' . ($comments ? "" : " class='hidden'") . '>'
-			)
 	: '')
-	;
+; ?>
-	?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
-<?php if ($TABLE != "") { ?>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?><?php } ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?>
-<?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = preg_match('~RANGE|LIST~', $row["partition_by"]);
 	print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
 	?>
 <p>
-<?php echo html_select("partition_by", array("" => "") + $partition_by, $row["partition_by"]) . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
+<?php echo "<select name='partition_by'>" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
 <?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
-<table id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
+<table cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
 <thead><tr><th><?php echo lang('Partition name'); ?><th><?php echo lang('Values'); ?></thead>
 <?php
-	foreach ($row["partition_names"] as $key => $val) {
+foreach ($row["partition_names"] as $key => $val) {
 	echo '<tr>';
 	echo '<td><input name="partition_names[]" value="' . h($val) . '" autocapitalize="off">';
 	echo ($key == count($row["partition_names"]) - 1 ? script("qsl('input').oninput = partitionNameChange;") : '');
 	echo '<td><input name="partition_values[]" value="' . h($row["partition_values"][$key]) . '">';
-	}
+}
-	?>
+?>
 </table>
 </div></fieldset>
 <?php

adminer/database.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $row = $_POST;
 
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
@@ -46,7 +44,7 @@ if ($_POST) {
 	$name = $row["name"];
 } elseif (DB != "") {
 	$row["collation"] = db_collation(DB, $collations);
-} elseif (JUSH == "sql") {
+} elseif ($jush == "sql") {
 	// propose database name with limited privileges
 	foreach (get_vals("SHOW GRANTS") as $grant) {
 		if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\.\*)?~', $grant, $match) && $match[1]) {
@@ -61,13 +59,14 @@ if ($_POST) {
 <p>
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
-	? '<textarea autofocus name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
+	? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
-	: '<input name="name" autofocus value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
+	: '<input name="name" id="name" value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array(
 	'sql' => "charset-charsets.html",
 	'mariadb' => "supported-character-sets-and-collations/",
-	'mssql' => "relational-databases/system-functions/sys-fn-helpcollations-transact-sql",
+	'mssql' => "ms187963.aspx",
 )) : "");
+echo script("focus(qs('#name'));");
 ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php

adminer/db.inc.php

@@ -1,12 +1,10 @@
 <?php
-namespace Adminer;
-
 $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]);
 
 if ($tables_views && !$error && !$_POST["search"]) {
 	$result = true;
 	$message = "";
-	if (JUSH == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
+	if ($jush == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
 		queries("SET foreign_key_checks = 0"); // allows to truncate or drop several tables at once
 	}
 
@@ -29,21 +27,15 @@ if ($tables_views && !$error && !$_POST["search"]) {
 			$result = drop_tables($_POST["tables"]);
 		}
 		$message = lang('Tables have been dropped.');
-	} elseif (JUSH == "sqlite" && $_POST["check"]) {
+	} elseif ($jush != "sql") {
-		foreach ((array) $_POST["tables"] as $table) {
+		$result = ($jush == "sqlite"
-			foreach (get_rows("PRAGMA integrity_check(" . q($table) . ")") as $row) {
-				$message .= "<b>" . h($table) . "</b>: " . h($row["integrity_check"]) . "<br>";
-			}
-		}
-	} elseif (JUSH != "sql") {
-		$result = (JUSH == "sqlite"
 			? queries("VACUUM")
 			: apply_queries("VACUUM" . ($_POST["optimize"] ? "" : " ANALYZE"), $_POST["tables"])
 		);
 		$message = lang('Tables have been optimized.');
 	} elseif (!$_POST["tables"]) {
 		$message = lang('No tables.');
-	} elseif ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('Adminer\idf_escape', $_POST["tables"])))) {
+	} elseif ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('idf_escape', $_POST["tables"])))) {
 		while ($row = $result->fetch_assoc()) {
 			$message .= "<b>" . h($row["Table"]) . "</b>: " . h($row["Msg_text"]) . "<br>";
 		}
@@ -69,12 +61,12 @@ if ($adminer->homepage()) {
 				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
-					$_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%");
+					$_GET["where"][0]["op"] = "LIKE %%";
 					search_tables();
 				}
 			}
 			echo "<div class='scrollable'>\n";
-			echo "<table class='nowrap checkable odds'>\n";
+			echo "<table cellspacing='0' class='nowrap checkable'>\n";
 			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo '<thead><tr class="wrap">';
 			echo '<td><input id="check-all" type="checkbox" class="jsonly">' . script("qs('#check-all').onclick = partial(formCheck, /^(tables|views)\[/);", "");
@@ -91,16 +83,15 @@ if ($adminer->homepage()) {
 
 			$tables = 0;
 			foreach ($tables_list as $name => $type) {
-				$view = ($type !== null && !preg_match('~table|sequence~i', $type));
+				$view = ($type !== null && !preg_match('~table~i', $type));
 				$id = h("Table-" . $name);
-				echo '<tr><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "", "", $id);
+				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "", "", $id);
 				echo '<th>' . (support("table") || support("indexes") ? "<a href='" . h(ME) . "table=" . urlencode($name) . "' title='" . lang('Show structure') . "' id='$id'>" . h($name) . '</a>' : h($name));
 				if ($view) {
 					echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . (preg_match('~materialized~i', $type) ? lang('Materialized view') : lang('View')) . '</a>';
 					echo '<td align="right"><a href="' . h(ME) . "select=" . urlencode($name) . '" title="' . lang('Select data') . '">?</a>';
 				} else {
-					foreach (
+					foreach (array(
-						array(
 						"Engine" => array(),
 						"Collation" => array(),
 						"Data_length" => array("create", lang('Alter table')),
@@ -108,8 +99,7 @@ if ($adminer->homepage()) {
 						"Data_free" => array("edit", lang('New item')),
 						"Auto_increment" => array("auto_increment=1&create", lang('Alter table')),
 						"Rows" => array("select", lang('Select data')),
-						) as $key => $link
+					) as $key => $link) {
-					) {
 						$id = " id='$key-" . h($name) . "'";
 						echo ($link ? "<td align='right'>" . (support("table") || $key == "Rows" || (support("indexes") && $key != "Data_length")
 							? "<a href='" . h(ME . "$link[0]=") . urlencode($name) . "'$id title='$link[1]'>?</a>"
@@ -119,35 +109,32 @@ if ($adminer->homepage()) {
 					$tables++;
 				}
 				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>" : "");
-				echo "\n";
 			}
 
 			echo "<tr><td><th>" . lang('%d in total', count($tables_list));
-			echo "<td>" . h(JUSH == "sql" ? get_val("SELECT @@default_storage_engine") : "");
+			echo "<td>" . h($jush == "sql" ? $connection->result("SELECT @@storage_engine") : "");
 			echo "<td>" . h(db_collation(DB, collations()));
 			foreach (array("Data_length", "Index_length", "Data_free") as $key) {
 				echo "<td align='right' id='sum-$key'>";
 			}
-			echo "\n";
 
 			echo "</table>\n";
 			echo "</div>\n";
 			if (!information_schema(DB)) {
 				echo "<div class='footer'><div>\n";
 				$vacuum = "<input type='submit' value='" . lang('Vacuum') . "'> " . on_help("'VACUUM'");
-				$optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " . on_help(JUSH == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'");
+				$optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " . on_help($jush == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'");
 				echo "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>"
-				. (JUSH == "sqlite" ? $vacuum . "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'PRAGMA integrity_check'")
+				. ($jush == "sqlite" ? $vacuum
-				: (JUSH == "pgsql" ? $vacuum . $optimize
+				: ($jush == "pgsql" ? $vacuum . $optimize
-				: (JUSH == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'")
+				: ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'") . $optimize
-					. $optimize
 					. "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'CHECK TABLE'")
 					. "<input type='submit' name='repair' value='" . lang('Repair') . "'> " . on_help("'REPAIR TABLE'")
 				: "")))
-				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help(JUSH == "sqlite" ? "'DELETE'" : "'TRUNCATE" . (JUSH == "pgsql" ? "'" : " TABLE'")) . confirm()
+				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . confirm()
 				. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . on_help("'DROP TABLE'") . confirm() . "\n";
 				$databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
-				if (count($databases) != 1 && JUSH != "sqlite") {
+				if (count($databases) != 1 && $jush != "sqlite") {
 					$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
 					echo "<p>" . lang('Move to other database') . ": ";
 					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');
@@ -172,11 +159,12 @@ if ($adminer->homepage()) {
 			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
 			$routines = routines();
 			if ($routines) {
-				echo "<table class='odds'>\n";
+				echo "<table cellspacing='0'>\n";
 				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td></thead>\n";
+				odd('');
 				foreach ($routines as $row) {
 					$name = ($row["SPECIFIC_NAME"] == $row["ROUTINE_NAME"] ? "" : "&name=" . urlencode($row["ROUTINE_NAME"])); // not computed on the pages to be able to print the header first
-					echo '<tr>';
+					echo '<tr' . odd() . '>';
 					echo '<th><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
 					echo '<td>' . h($row["ROUTINE_TYPE"]);
 					echo '<td>' . h($row["DTD_IDENTIFIER"]);
@@ -194,10 +182,11 @@ if ($adminer->homepage()) {
 			echo "<h3 id='sequences'>" . lang('Sequences') . "</h3>\n";
 			$sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema() ORDER BY sequence_name");
 			if ($sequences) {
-				echo "<table class='odds'>\n";
+				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
+				odd('');
 				foreach ($sequences as $val) {
-					echo "<tr><th><a href='" . h(ME) . "sequence=" . urlencode($val) . "'>" . h($val) . "</a>\n";
+					echo "<tr" . odd() . "><th><a href='" . h(ME) . "sequence=" . urlencode($val) . "'>" . h($val) . "</a>\n";
 				}
 				echo "</table>\n";
 			}
@@ -208,10 +197,11 @@ if ($adminer->homepage()) {
 			echo "<h3 id='user-types'>" . lang('User types') . "</h3>\n";
 			$user_types = types();
 			if ($user_types) {
-				echo "<table class='odds'>\n";
+				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
+				odd('');
 				foreach ($user_types as $val) {
-					echo "<tr><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
+					echo "<tr" . odd() . "><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
 				}
 				echo "</table>\n";
 			}
@@ -222,7 +212,7 @@ if ($adminer->homepage()) {
 			echo "<h3 id='events'>" . lang('Events') . "</h3>\n";
 			$rows = get_rows("SHOW EVENTS");
 			if ($rows) {
-				echo "<table>\n";
+				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "<td>" . lang('Schedule') . "<td>" . lang('Start') . "<td>" . lang('End') . "<td></thead>\n";
 				foreach ($rows as $row) {
 					echo "<tr>";
@@ -232,7 +222,7 @@ if ($adminer->homepage()) {
 					echo '<td><a href="' . h(ME) . 'event=' . urlencode($row["Name"]) . '">' . lang('Alter') . '</a>';
 				}
 				echo "</table>\n";
-				$event_scheduler = get_val("SELECT @@event_scheduler");
+				$event_scheduler = $connection->result("SELECT @@event_scheduler");
 				if ($event_scheduler && $event_scheduler != "ON") {
 					echo "<p class='error'><code class='jush-sqlset'>event_scheduler</code>: " . h($event_scheduler) . "\n";
 				}

adminer/download.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["download"];
 $fields = fields($TABLE);
 header("Content-Type: application/octet-stream");

adminer/drivers/clickhouse.inc.php

@@ -1,29 +1,28 @@
 <?php
-namespace Adminer;
+$drivers["clickhouse"] = "ClickHouse (alpha)";
-
-add_driver("clickhouse", "ClickHouse (alpha)");
 
 if (isset($_GET["clickhouse"])) {
-	define('Adminer\DRIVER', "clickhouse");
+	define("DRIVER", "clickhouse");
 
-	if (ini_bool('allow_url_fopen')) {
+	class Min_DB {
-		class Db {
+		var $extension = "JSON", $server_info, $errno, $_result, $error, $_url;
-			public $extension = "JSON", $server_info, $errno, $error;
+		var $_db = 'default';
-			public $_db = 'default';
-			private $result, $url;
 
 		function rootQuery($db, $query) {
-				$file = @file_get_contents("$this->url/?database=$db", false, stream_context_create(array('http' => array(
+			@ini_set('track_errors', 1); // @ - may be disabled
+			$file = @file_get_contents("$this->_url/?database=$db", false, stream_context_create(array('http' => array(
 				'method' => 'POST',
 				'content' => $this->isQuerySelectLike($query) ? "$query FORMAT JSONCompact" : $query,
 				'header' => 'Content-type: application/x-www-form-urlencoded',
-					'ignore_errors' => 1,
+				'ignore_errors' => 1, // available since PHP 5.2.10
-					'follow_location' => 0,
-					'max_redirects' => 0,
 			))));
 
-				if ($file === false || !preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+			if ($file === false) {
-					$this->error = lang('Invalid credentials.');
+				$this->error = $php_errormsg;
+				return $file;
+			}
+			if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+				$this->error = $file;
 				return false;
 			}
 			$return = json_decode($file, true);
@@ -45,7 +44,7 @@ if (isset($_GET["clickhouse"])) {
 					}
 				}
 			}
-				return new Result($return);
+			return new Min_Result($return);
 		}
 
 		function isQuerySelectLike($query) {
@@ -58,7 +57,7 @@ if (isset($_GET["clickhouse"])) {
 
 		function connect($server, $username, $password) {
 			preg_match('~^(https?://)?(.*)~', $server, $match);
-				$this->url = ($match[1] ?: "http://") . urlencode($username) . ":" . urlencode($password) . "@$match[2]";
+			$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
 			$return = $this->query('SELECT 1');
 			return (bool) $return;
 		}
@@ -73,11 +72,11 @@ if (isset($_GET["clickhouse"])) {
 		}
 
 		function multi_query($query) {
-				return $this->result = $this->query($query);
+			return $this->_result = $this->query($query);
 		}
 
 		function store_result() {
-				return $this->result;
+			return $this->_result;
 		}
 
 		function next_result() {
@@ -90,39 +89,32 @@ if (isset($_GET["clickhouse"])) {
 		}
 	}
 
-		class Result {
+	class Min_Result {
-			public $num_rows, $columns, $meta;
+		var $num_rows, $_rows, $columns, $meta, $_offset = 0;
-			private $rows, $offset = 0;
 
 		function __construct($result) {
-				foreach ($result['data'] as $item) {
-					$row = array();
-					foreach ($item as $key => $val) {
-						$row[$key] = is_scalar($val) ? $val : json_encode($val, 256); // 256 - JSON_UNESCAPED_UNICODE
-					}
-					$this->rows[] = $row;
-				}
 			$this->num_rows = $result['rows'];
+			$this->_rows = $result['data'];
 			$this->meta = $result['meta'];
 			$this->columns = array_column($this->meta, 'name');
-				reset($this->rows);
+			reset($this->_rows);
 		}
 
 		function fetch_assoc() {
-				$row = current($this->rows);
+			$row = current($this->_rows);
-				next($this->rows);
+			next($this->_rows);
 			return $row === false ? false : array_combine($this->columns, $row);
 		}
 
 		function fetch_row() {
-				$row = current($this->rows);
+			$row = current($this->_rows);
-				next($this->rows);
+			next($this->_rows);
 			return $row;
 		}
 
 		function fetch_field() {
-				$column = $this->offset++;
+			$column = $this->_offset++;
-				$return = new \stdClass;
+			$return = new stdClass;
 			if ($column < count($this->columns)) {
 				$return->name = $this->meta[$column]['name'];
 				$return->orgname = $return->name;
@@ -131,25 +123,9 @@ if (isset($_GET["clickhouse"])) {
 			return $return;
 		}
 	}
-	}
 
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("allow_url_fopen");
-		static $jush = "clickhouse";
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array( //! arrays
-				lang('Numbers') => array("Int8" => 3, "Int16" => 5, "Int32" => 10, "Int64" => 19, "UInt8" => 3, "UInt16" => 5, "UInt32" => 10, "UInt64" => 20, "Float32" => 7, "Float64" => 16, 'Decimal' => 38, 'Decimal32' => 9, 'Decimal64' => 18, 'Decimal128' => 38),
-				lang('Date and time') => array("Date" => 13, "DateTime" => 20),
-				lang('Strings') => array("String" => 0),
-				lang('Binary') => array("FixedString" => 0),
-			);
-		}
 
+	class Min_Driver extends Min_SQL {
 		function delete($table, $queryWhere, $limit = 0) {
 			if ($queryWhere === '') {
 				$queryWhere = 'WHERE 1=1';
@@ -236,20 +212,18 @@ if (isset($_GET["clickhouse"])) {
 		return apply_queries("DROP TABLE", $tables);
 	}
 
-	function connect($credentials) {
+	function connect() {
-		$connection = new Db;
+		global $adminer;
-		list($server, $username, $password) = $credentials;
+		$connection = new Min_DB;
-		if (!preg_match('~^(https?://)?[-a-z\d.]+(:\d+)?$~', $server)) {
+		$credentials = $adminer->credentials();
-			return lang('Invalid server.');
+		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
-		}
-		if ($connection->connect($server, $username, $password)) {
 			return $connection;
 		}
 		return $connection->error;
 	}
 
 	function get_databases($flush) {
-		$connection = connection();
+		global $connection;
 		$result = get_rows('SHOW DATABASES');
 
 		$return = array();
@@ -276,7 +250,7 @@ if (isset($_GET["clickhouse"])) {
 	}
 
 	function logged_user() {
-		$adminer = adminer();
+		global $adminer;
 		$credentials = $adminer->credentials();
 		return $credentials[1];
 	}
@@ -296,7 +270,7 @@ if (isset($_GET["clickhouse"])) {
 	}
 
 	function table_status($name = "", $fast = false) {
-		$connection = connection();
+		global $connection;
 		$return = array();
 		$tables = get_rows("SELECT name, engine FROM system.tables WHERE database = " . q($connection->_db));
 		foreach ($tables as $table) {
@@ -332,7 +306,7 @@ if (isset($_GET["clickhouse"])) {
 	function fields($table) {
 		$return = array();
 		$result = get_rows("SELECT name, type, default_expression FROM system.columns WHERE " . idf_escape('table') . " = " . q($table));
-		foreach ($result as $row) {
+		foreach($result as $row) {
 			$type = trim($row['type']);
 			$nullable = strpos($type, 'Nullable(') === 0;
 			$return[trim($row['name'])] = array(
@@ -342,7 +316,7 @@ if (isset($_GET["clickhouse"])) {
 				"default" => trim($row['default_expression']),
 				"null" => $nullable,
 				"auto_increment" => '0',
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 0, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 0),
 			);
 		}
 
@@ -366,7 +340,7 @@ if (isset($_GET["clickhouse"])) {
 	}
 
 	function error() {
-		$connection = connection();
+		global $connection;
 		return h($connection->error);
 	}
 
@@ -374,6 +348,18 @@ if (isset($_GET["clickhouse"])) {
 		return array();
 	}
 
+	function schemas() {
+		return array();
+	}
+
+	function get_schema() {
+		return "";
+	}
+
+	function set_schema($schema) {
+		return true;
+	}
+
 	function auto_increment() {
 		return '';
 	}
@@ -385,4 +371,22 @@ if (isset($_GET["clickhouse"])) {
 	function support($feature) {
 		return preg_match("~^(columns|sql|status|table|drop_col)$~", $feature);
 	}
+
+	$jush = "clickhouse";
+	$types = array();
+	$structured_types = array();
+	foreach (array( //! arrays
+		lang('Numbers') => array("Int8" => 3, "Int16" => 5, "Int32" => 10, "Int64" => 19, "UInt8" => 3, "UInt16" => 5, "UInt32" => 10, "UInt64" => 20, "Float32" => 7, "Float64" => 16, 'Decimal' => 38, 'Decimal32' => 9, 'Decimal64' => 18, 'Decimal128' => 38),
+		lang('Date and time') => array("Date" => 13, "DateTime" => 20),
+		lang('Strings') => array("String" => 0),
+		lang('Binary') => array("FixedString" => 0),
+	) as $key => $val) {
+		$types += $val;
+		$structured_types[$key] = array_keys($val);
+	}
+	$unsigned = array();
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
+	$functions = array();
+	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+	$edit_functions = array();
 }

adminer/drivers/elastic.inc.php

@@ -0,0 +1,465 @@
+<?php
+$drivers["elastic"] = "Elasticsearch (beta)";
+
+if (isset($_GET["elastic"])) {
+	$possible_drivers = array("json + allow_url_fopen");
+	define("DRIVER", "elastic");
+
+	if (function_exists('json_decode') && ini_bool('allow_url_fopen')) {
+		class Min_DB {
+			var $extension = "JSON", $server_info, $errno, $error, $_url;
+
+			/** Performs query
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
+			 */
+			function rootQuery($path, $content = array(), $method = 'GET') {
+				@ini_set('track_errors', 1); // @ - may be disabled
+				$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
+					'method' => $method,
+					'content' => $content === null ? $content : json_encode($content),
+					'header' => 'Content-Type: application/json',
+					'ignore_errors' => 1, // available since PHP 5.2.10
+				))));
+				if (!$file) {
+					$this->error = $php_errormsg;
+					return $file;
+				}
+				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+					$this->error = $file;
+					return false;
+				}
+				$return = json_decode($file, true);
+				if ($return === null) {
+					$this->errno = json_last_error();
+					if (function_exists('json_last_error_msg')) {
+						$this->error = json_last_error_msg();
+					} else {
+						$constants = get_defined_constants(true);
+						foreach ($constants['json'] as $name => $value) {
+							if ($value == $this->errno && preg_match('~^JSON_ERROR_~', $name)) {
+								$this->error = $name;
+								break;
+							}
+						}
+					}
+				}
+				return $return;
+			}
+
+			/** Performs query relative to actual selected DB
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
+			 */
+			function query($path, $content = array(), $method = 'GET') {
+				return $this->rootQuery(($this->_db != "" ? "$this->_db/" : "/") . ltrim($path, '/'), $content, $method);
+			}
+
+			function connect($server, $username, $password) {
+				preg_match('~^(https?://)?(.*)~', $server, $match);
+				$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
+				$return = $this->query('');
+				if ($return) {
+					$this->server_info = $return['version']['number'];
+				}
+				return (bool) $return;
+			}
+
+			function select_db($database) {
+				$this->_db = $database;
+				return true;
+			}
+
+			function quote($string) {
+				return $string;
+			}
+
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows;
+
+			function __construct($rows) {
+				$this->num_rows = count($rows);
+				$this->_rows = $rows;
+				reset($this->_rows);
+			}
+
+			function fetch_assoc() {
+				$return = current($this->_rows);
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				return array_values($this->fetch_assoc());
+			}
+
+		}
+
+	}
+
+
+
+	class Min_Driver extends Min_SQL {
+
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+			global $adminer;
+			$data = array();
+			$query = "$table/_search";
+			if ($select != array("*")) {
+				$data["fields"] = $select;
+			}
+			if ($order) {
+				$sort = array();
+				foreach ($order as $col) {
+					$col = preg_replace('~ DESC$~', '', $col, 1, $count);
+					$sort[] = ($count ? array($col => "desc") : $col);
+				}
+				$data["sort"] = $sort;
+			}
+			if ($limit) {
+				$data["size"] = +$limit;
+				if ($page) {
+					$data["from"] = ($page * $limit);
+				}
+			}
+			foreach ($where as $val) {
+				list($col, $op, $val) = explode(" ", $val, 3);
+				if ($col == "_id") {
+					$data["query"]["ids"]["values"][] = $val;
+				}
+				elseif ($col . $val != "") {
+					$term = array("term" => array(($col != "" ? $col : "_all") => $val));
+					if ($op == "=") {
+						$data["query"]["filtered"]["filter"]["and"][] = $term;
+					} else {
+						$data["query"]["filtered"]["query"]["bool"]["must"][] = $term;
+					}
+				}
+			}
+			if ($data["query"] && !$data["query"]["filtered"]["query"] && !$data["query"]["ids"]) {
+				$data["query"]["filtered"]["query"] = array("match_all" => array());
+			}
+			$start = microtime(true);
+			$search = $this->_conn->query($query, $data);
+			if ($print) {
+				echo $adminer->selectQuery("$query: " . json_encode($data), $start, !$search);
+			}
+			if (!$search) {
+				return false;
+			}
+			$return = array();
+			foreach ($search['hits']['hits'] as $hit) {
+				$row = array();
+				if ($select == array("*")) {
+					$row["_id"] = $hit["_id"];
+				}
+				$fields = $hit['_source'];
+				if ($select != array("*")) {
+					$fields = array();
+					foreach ($select as $key) {
+						$fields[$key] = $hit['fields'][$key];
+					}
+				}
+				foreach ($fields as $key => $val) {
+					if ($data["fields"]) {
+						$val = $val[0];
+					}
+					$row[$key] = (is_array($val) ? json_encode($val) : $val); //! display JSON and others differently
+				}
+				$return[] = $row;
+			}
+			return new Min_Result($return);
+		}
+
+		function update($type, $record, $queryWhere, $limit = 0, $separator = "\n") {
+			//! use $limit
+			$parts = preg_split('~ *= *~', $queryWhere);
+			if (count($parts) == 2) {
+				$id = trim($parts[1]);
+				$query = "$type/$id";
+				return $this->_conn->query($query, $record, 'POST');
+			}
+			return false;
+		}
+
+		function insert($type, $record) {
+			$id = ""; //! user should be able to inform _id
+			$query = "$type/$id";
+			$response = $this->_conn->query($query, $record, 'POST');
+			$this->_conn->last_id = $response['_id'];
+			return $response['created'];
+		}
+
+		function delete($type, $queryWhere, $limit = 0) {
+			//! use $limit
+			$ids = array();
+			if (is_array($_GET["where"]) && $_GET["where"]["_id"]) {
+				$ids[] = $_GET["where"]["_id"];
+			}
+			if (is_array($_POST['check'])) {
+				foreach ($_POST['check'] as $check) {
+					$parts = preg_split('~ *= *~', $check);
+					if (count($parts) == 2) {
+						$ids[] = trim($parts[1]);
+					}
+				}
+			}
+			$this->_conn->affected_rows = 0;
+			foreach ($ids as $id) {
+				$query = "{$type}/{$id}";
+				$response = $this->_conn->query($query, '{}', 'DELETE');
+				if (is_array($response) && $response['found'] == true) {
+					$this->_conn->affected_rows++;
+				}
+			}
+			return $this->_conn->affected_rows;
+		}
+	}
+
+
+
+	function connect() {
+		global $adminer;
+		$connection = new Min_DB;
+		list($server, $username, $password) = $adminer->credentials();
+		if ($password != "" && $connection->connect($server, $username, "")) {
+			return lang('Database does not support password.');
+		}
+		if ($connection->connect($server, $username, $password)) {
+			return $connection;
+		}
+		return $connection->error;
+	}
+
+	function support($feature) {
+		return preg_match("~database|table|columns~", $feature);
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function get_databases() {
+		global $connection;
+		$return = $connection->rootQuery('_aliases');
+		if ($return) {
+			$return = array_keys($return);
+			sort($return, SORT_STRING);
+		}
+		return $return;
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function db_collation($db, $collations) {
+	}
+	
+	function engines() {
+		return array();
+	}
+
+	function count_tables($databases) {
+		global $connection;
+		$return = array();
+		$result = $connection->query('_stats');
+		if ($result && $result['indices']) {
+			$indices = $result['indices'];
+			foreach ($indices as $indice => $stats) {
+				$indexing = $stats['total']['indexing'];
+				$return[$indice] = $indexing['index_total'];
+			}
+		}
+		return $return;
+	}
+
+	function tables_list() {
+		global $connection;
+		$return = $connection->query('_mapping');
+		if ($return) {
+			$return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table');
+		}
+		return $return;
+	}
+
+	function table_status($name = "", $fast = false) {
+		global $connection;
+		$search = $connection->query("_search", array(
+			"size" => 0,
+			"aggregations" => array(
+				"count_by_type" => array(
+					"terms" => array(
+						"field" => "_type"
+					)
+				)
+			)
+		), "POST");
+		$return = array();
+		if ($search) {
+			$tables = $search["aggregations"]["count_by_type"]["buckets"];
+			foreach ($tables as $table) {
+				$return[$table["key"]] = array(
+					"Name" => $table["key"],
+					"Engine" => "table",
+					"Rows" => $table["doc_count"],
+				);
+				if ($name != "" && $name == $table["key"]) {
+					return $return[$name];
+				}
+			}
+		}
+		return $return;
+	}
+
+	function error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function information_schema() {
+	}
+
+	function is_view($table_status) {
+	}
+
+	function indexes($table, $connection2 = null) {
+		return array(
+			array("type" => "PRIMARY", "columns" => array("_id")),
+		);
+	}
+
+	function fields($table) {
+		global $connection;
+		$result = $connection->query("$table/_mapping");
+		$return = array();
+		if ($result) {
+			$mappings = $result[$table]['properties'];
+			if (!$mappings) {
+				$mappings = $result[$connection->_db]['mappings'][$table]['properties'];
+			}
+			if ($mappings) {
+				foreach ($mappings as $name => $field) {
+					$return[$name] = array(
+						"field" => $name,
+						"full_type" => $field["type"],
+						"type" => $field["type"],
+						"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+					);
+					if ($field["properties"]) { // only leaf fields can be edited
+						unset($return[$name]["privileges"]["insert"]);
+						unset($return[$name]["privileges"]["update"]);
+					}
+				}
+			}
+		}
+		return $return;
+	}
+
+	function foreign_keys($table) {
+		return array();
+	}
+
+	function table($idf) {
+		return $idf;
+	}
+
+	function idf_escape($idf) {
+		return $idf;
+	}
+
+	function convert_field($field) {
+	}
+
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+
+	function fk_support($table_status) {
+	}
+
+	function found_rows($table_status, $where) {
+		return null;
+	}
+
+	/** Create index
+	* @param string
+	* @return mixed
+	*/
+	function create_database($db) {
+		global $connection;
+		return $connection->rootQuery(urlencode($db), null, 'PUT');
+	}
+
+	/** Remove index
+	* @param array
+	* @return mixed
+	*/
+	function drop_databases($databases) {
+		global $connection;
+		return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE');
+	}
+
+	/** Alter type
+	* @param array
+	* @return mixed
+	*/
+	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
+		$properties = array();
+		foreach ($fields as $f) {
+			$field_name = trim($f[1][0]);
+			$field_type = trim($f[1][1] ? $f[1][1] : "text");
+			$properties[$field_name] = array(
+				'type' => $field_type
+			);
+		}
+		if (!empty($properties)) {
+			$properties = array('properties' => $properties);
+		}
+		return $connection->query("_mapping/{$name}", $properties, 'PUT');
+	}
+
+	/** Drop types
+	* @param array
+	* @return bool
+	*/
+	function drop_tables($tables) {
+		global $connection;
+		$return = true;
+		foreach ($tables as $table) { //! convert to bulk api
+			$return = $return && $connection->query(urlencode($table), array(), 'DELETE');
+		}
+		return $return;
+	}
+
+	function last_id() {
+		global $connection;
+		return $connection->last_id;
+	}
+
+	$jush = "elastic";
+	$operators = array("=", "query");
+	$functions = array();
+	$grouping = array();
+	$edit_functions = array(array("json"));
+	$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
+	$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
+	foreach (array(
+		lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
+		lang('Date and time') => array("date" => 10),
+		lang('Strings') => array("string" => 65535, "text" => 65535),
+		lang('Binary') => array("binary" => 255),
+	) as $key => $val) {
+		$types += $val;
+		$structured_types[$key] = array_keys($val);
+	}
+}

adminer/drivers/firebird.inc.php

@@ -3,24 +3,22 @@
 * @author Steve Krämer
 */
 
-namespace Adminer;
+$drivers['firebird'] = 'Firebird (alpha)';
-
-add_driver('firebird', 'Firebird (alpha)');
 	
 if (isset($_GET["firebird"])) {
-	define('Adminer\DRIVER', "firebird");
+	$possible_drivers = array("interbase");
+	define("DRIVER", "firebird");
 
-	if (extension_loaded("interbase")) {
+	if (extension_loaded("interbase") ) {
-		class Db {
+		class Min_DB {
-			public
+			var
 				$extension = "Firebird",
 				$server_info,
 				$affected_rows,
 				$errno,
 				$error,
-				$_link
+				$_link, $_result
 			;
-			private $result;
 
 			function connect($server, $username, $password) {
 				$this->_link = ibase_connect($server, $username, $password); 
@@ -55,15 +53,15 @@ if (isset($_GET["firebird"])) {
 					$this->affected_rows = ibase_affected_rows($this->_link);
 					return true;
 				}
-				return new Result($result);
+				return new Min_Result($result);
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			function next_result() {
@@ -80,25 +78,24 @@ if (isset($_GET["firebird"])) {
 			}
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows;
+			var $num_rows, $_result, $_offset = 0;
-			private $result, $offset = 0;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 				// $this->num_rows = ibase_num_rows($result);
 			}
 
 			function fetch_assoc() {
-				return ibase_fetch_assoc($this->result);
+				return ibase_fetch_assoc($this->_result);
 			}
 
 			function fetch_row() {
-				return ibase_fetch_row($this->result);
+				return ibase_fetch_row($this->_result);
 			}
 
 			function fetch_field() {
-				$field = ibase_field_info($this->result, $this->offset++);
+				$field = ibase_field_info($this->_result, $this->_offset++);
 				return (object) array(
 					'name' => $field['name'],
 					'orgname' => $field['name'],
@@ -108,7 +105,7 @@ if (isset($_GET["firebird"])) {
 			}
 
 			function __destruct() {
-				ibase_free_result($this->result);
+				ibase_free_result($this->_result);
 			}
 		}
 
@@ -116,11 +113,7 @@ if (isset($_GET["firebird"])) {
 	
 	
 	
-	class Driver extends SqlDriver {
+	class Min_Driver extends Min_SQL {
-		static $possibleDrivers = array("interbase");
-		static $jush = "firebird";
-
-		public $operators = array("=");
 	}
 
 
@@ -133,8 +126,10 @@ if (isset($_GET["firebird"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
+	function connect() {
-		$connection = new Db;
+		global $adminer;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -164,13 +159,13 @@ if (isset($_GET["firebird"])) {
 	}
 
 	function logged_user() {
-		$adminer = adminer();
+		global $adminer;
 		$credentials = $adminer->credentials();
 		return $credentials[1];
 	}
 
 	function tables_list() {
-		$connection = connection();
+		global $connection;
 		$query = 'SELECT RDB$RELATION_NAME FROM rdb$relations WHERE rdb$system_flag = 0';
 		$result = ibase_query($connection->_link, $query);
 		$return = array();
@@ -186,7 +181,7 @@ if (isset($_GET["firebird"])) {
 	}
 
 	function table_status($name = "", $fast = false) {
-		$connection = connection();
+		global $connection;
 		$return = array();
 		$data = tables_list();
 		foreach ($data as $index => $val) {
@@ -211,7 +206,7 @@ if (isset($_GET["firebird"])) {
 	}
 
 	function fields($table) {
-		$connection = connection();
+		global $connection;
 		$return = array();
 		$query = 'SELECT r.RDB$FIELD_NAME AS field_name,
 r.RDB$DESCRIPTION AS field_description,
@@ -256,7 +251,7 @@ ORDER BY r.RDB$FIELD_POSITION';
 				"null" => (trim($row["FIELD_NOT_NULL_CONSTRAINT"]) == "YES"),
 				"auto_increment" => '0',
 				"collation" => trim($row["FIELD_COLLATION"]),
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				"comment" => trim($row["FIELD_DESCRIPTION"]),
 			);
 		}
@@ -293,7 +288,7 @@ ORDER BY RDB$INDEX_SEGMENTS.RDB$FIELD_POSITION';
 	}
 
 	function error() {
-		$connection = connection();
+		global $connection;
 		return h($connection->error);
 	}
 
@@ -301,7 +296,25 @@ ORDER BY RDB$INDEX_SEGMENTS.RDB$FIELD_POSITION';
 		return array();
 	}
 
+	function schemas() {
+		return array();
+	}
+
+	function get_schema() {
+		return "";
+	}
+
+	function set_schema($schema) {
+		return true;
+	}
+
 	function support($feature) {
 		return preg_match("~^(columns|sql|status|table)$~", $feature);
 	}
+
+	$jush = "firebird";
+	$operators = array("=");
+	$functions = array();
+	$grouping = array();
+	$edit_functions = array();
 }

adminer/drivers/mongo.inc.php

@@ -1,45 +1,211 @@
 <?php
-namespace Adminer;
+$drivers["mongo"] = "MongoDB";
-
-$drivers["mongo"] = "MongoDB (alpha)";
 
 if (isset($_GET["mongo"])) {
-	define('Adminer\DRIVER', "mongo");
+	$possible_drivers = array("mongo", "mongodb");
+	define("DRIVER", "mongo");
 
-	if (class_exists('MongoDB\Driver\Manager')) {
+	if (class_exists('MongoDB')) {
-		class Db {
+		class Min_DB {
-			public $extension = "MongoDB", $server_info = MONGODB_VERSION, $affected_rows, $error, $last_id;
+			var $extension = "Mongo", $server_info = MongoClient::VERSION, $error, $last_id, $_link, $_db;
-			/** @var MongoDB\Driver\Manager */
-			public $_link;
-			public $_db, $_db_name;
 
 			function connect($uri, $options) {
-				$this->_link = new \MongoDB\Driver\Manager($uri, $options);
+				return @new MongoClient($uri, $options);
-				$this->executeDbCommand($options["db"], array('ping' => 1));
 			}
 			
-			function executeCommand($command) {
+			function query($query) {
-				return $this->executeDbCommand($this->_db_name);
-			}
-
-			function executeDbCommand($db, $command) {
-				try {
-					return $this->_link->executeCommand($db, new \MongoDB\Driver\Command($command));
-				} catch (Exception $e) {
-					$this->error = $e->getMessage();
-					return array();
-				}
-			}
-
-			function executeBulkWrite($namespace, $bulk, $counter) {
-				try {
-					$results = $this->_link->executeBulkWrite($namespace, $bulk);
-					$this->affected_rows = $results->$counter();
-					return true;
-				} catch (Exception $e) {
-					$this->error = $e->getMessage();
 				return false;
 			}
+
+			function select_db($database) {
+				try {
+					$this->_db = $this->_link->selectDB($database);
+					return true;
+				} catch (Exception $ex) {
+					$this->error = $ex->getMessage();
+					return false;
+				}
+			}
+
+			function quote($string) {
+				return $string;
+			}
+
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
+
+			function __construct($result) {
+				foreach ($result as $item) {
+					$row = array();
+					foreach ($item as $key => $val) {
+						if (is_a($val, 'MongoBinData')) {
+							$this->_charset[$key] = 63;
+						}
+						$row[$key] =
+							(is_a($val, 'MongoId') ? 'ObjectId("' . strval($val) . '")' :
+							(is_a($val, 'MongoDate') ? gmdate("Y-m-d H:i:s", $val->sec) . " GMT" :
+							(is_a($val, 'MongoBinData') ? $val->bin : //! allow downloading
+							(is_a($val, 'MongoRegex') ? strval($val) :
+							(is_object($val) ? get_class($val) : // MongoMinKey, MongoMaxKey
+							$val
+						)))));
+					}
+					$this->_rows[] = $row;
+					foreach ($row as $key => $val) {
+						if (!isset($this->_rows[0][$key])) {
+							$this->_rows[0][$key] = null;
+						}
+					}
+				}
+				$this->num_rows = count($this->_rows);
+			}
+
+			function fetch_assoc() {
+				$row = current($this->_rows);
+				if (!$row) {
+					return $row;
+				}
+				$return = array();
+				foreach ($this->_rows[0] as $key => $val) {
+					$return[$key] = $row[$key];
+				}
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				$return = $this->fetch_assoc();
+				if (!$return) {
+					return $return;
+				}
+				return array_values($return);
+			}
+
+			function fetch_field() {
+				$keys = array_keys($this->_rows[0]);
+				$name = $keys[$this->_offset++];
+				return (object) array(
+					'name' => $name,
+					'charsetnr' => $this->_charset[$name],
+				);
+			}
+
+		}
+
+
+
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
+			
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, true)
+				);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				return new Min_Result($this->_conn->_db->selectCollection($table)
+					->find(array(), $select)
+					->sort($sort)
+					->limit($limit != "" ? +$limit : 0)
+					->skip($page * $limit)
+				);
+			}
+			
+			function insert($table, $set) {
+				try {
+					$return = $this->_conn->_db->selectCollection($table)->insert($set);
+					$this->_conn->errno = $return['code'];
+					$this->_conn->error = $return['err'];
+					$this->_conn->last_id = $set['_id'];
+					return !$return['err'];
+				} catch (Exception $ex) {
+					$this->_conn->error = $ex->getMessage();
+					return false;
+				}
+			}
+		}
+
+		function get_databases($flush) {
+			global $connection;
+			$return = array();
+			$dbs = $connection->_link->listDBs();
+			foreach ($dbs['databases'] as $db) {
+				$return[] = $db['name'];
+			}
+			return $return;
+		}
+
+		function count_tables($databases) {
+			global $connection;
+			$return = array();
+			foreach ($databases as $db) {
+				$return[$db] = count($connection->_link->selectDB($db)->getCollectionNames(true));
+			}
+			return $return;
+		}
+
+		function tables_list() {
+			global $connection;
+			return array_fill_keys($connection->_db->getCollectionNames(true), 'table');
+		}
+
+		function drop_databases($databases) {
+			global $connection;
+			foreach ($databases as $db) {
+				$response = $connection->_link->selectDB($db)->drop();
+				if (!$response['ok']) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		function indexes($table, $connection2 = null) {
+			global $connection;
+			$return = array();
+			foreach ($connection->_db->selectCollection($table)->getIndexInfo() as $index) {
+				$descs = array();
+				foreach ($index["key"] as $column => $type) {
+					$descs[] = ($type == -1 ? '1' : null);
+				}
+				$return[$index["name"]] = array(
+					"type" => ($index["name"] == "_id_" ? "PRIMARY" : ($index["unique"] ? "UNIQUE" : "INDEX")),
+					"columns" => array_keys($index["key"]),
+					"lengths" => array(),
+					"descs" => $descs,
+				);
+			}
+			return $return;
+		}
+
+		function fields($table) {
+			return fields_from_edit();
+		}
+
+		function found_rows($table_status, $where) {
+			global $connection;
+			//! don't call count_rows()
+			return $connection->_db->selectCollection($_GET["select"])->count($where);
+		}
+
+		$operators = array("=");
+
+	} elseif (class_exists('MongoDB\Driver\Manager')) {
+		class Min_DB {
+			var $extension = "MongoDB", $server_info = MONGODB_VERSION, $error, $last_id;
+			/** @var MongoDB\Driver\Manager */
+			var $_link;
+			var $_db, $_db_name;
+
+			function connect($uri, $options) {
+				$class = 'MongoDB\Driver\Manager';
+				return new $class($uri, $options);
 			}
 
 			function query($query) {
@@ -54,48 +220,48 @@ if (isset($_GET["mongo"])) {
 			function quote($string) {
 				return $string;
 			}
+
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows;
+			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
-			private $rows = array(), $offset = 0, $charset = array();
 
 			function __construct($result) {
 				foreach ($result as $item) {
 					$row = array();
 					foreach ($item as $key => $val) {
 						if (is_a($val, 'MongoDB\BSON\Binary')) {
-							$this->charset[$key] = 63;
+							$this->_charset[$key] = 63;
 						}
 						$row[$key] =
-							(is_a($val, 'MongoDB\BSON\ObjectID') ? 'MongoDB\BSON\ObjectID("' . "$val\")" :
+							(is_a($val, 'MongoDB\BSON\ObjectID') ? 'MongoDB\BSON\ObjectID("' . strval($val) . '")' :
 								(is_a($val, 'MongoDB\BSON\UTCDatetime') ? $val->toDateTime()->format('Y-m-d H:i:s') :
-							(is_a($val, 'MongoDB\BSON\Binary') ? $val->getData() : //! allow downloading
+									(is_a($val, 'MongoDB\BSON\Binary') ? $val->bin : //! allow downloading
-							(is_a($val, 'MongoDB\BSON\Regex') ? "$val" :
+										(is_a($val, 'MongoDB\BSON\Regex') ? strval($val) :
-							(is_object($val) || is_array($val) ? json_encode($val, 256) : // 256 = JSON_UNESCAPED_UNICODE
+											(is_object($val) ? json_encode($val, 256) : // 256 = JSON_UNESCAPED_UNICODE
 												$val // MongoMinKey, MongoMaxKey
 											)))));
 					}
-					$this->rows[] = $row;
+					$this->_rows[] = $row;
 					foreach ($row as $key => $val) {
-						if (!isset($this->rows[0][$key])) {
+						if (!isset($this->_rows[0][$key])) {
-							$this->rows[0][$key] = null;
+							$this->_rows[0][$key] = null;
 						}
 					}
 				}
-				$this->num_rows = count($this->rows);
+				$this->num_rows = $result->count;
 			}
 
 			function fetch_assoc() {
-				$row = current($this->rows);
+				$row = current($this->_rows);
 				if (!$row) {
 					return $row;
 				}
 				$return = array();
-				foreach ($this->rows[0] as $key => $val) {
+				foreach ($this->_rows[0] as $key => $val) {
 					$return[$key] = $row[$key];
 				}
-				next($this->rows);
+				next($this->_rows);
 				return $return;
 			}
 
@@ -108,21 +274,107 @@ if (isset($_GET["mongo"])) {
 			}
 
 			function fetch_field() {
-				$keys = array_keys($this->rows[0]);
+				$keys = array_keys($this->_rows[0]);
-				$name = $keys[$this->offset++];
+				$name = $keys[$this->_offset++];
 				return (object) array(
 					'name' => $name,
-					'charsetnr' => $this->charset[$name],
+					'charsetnr' => $this->_charset[$name],
 				);
 			}
+
 		}
 
 
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
+
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				global $connection;
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, 1)
+				);
+				if (count($select) && !isset($select['_id'])) {
+					$select['_id'] = 0;
+				}
+				$where = where_to_query($where);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] > 0) {
+					$limit = $_GET['limit'];
+				}
+				$limit = min(200, max(1, (int) $limit));
+				$skip = $page * $limit;
+				$class = 'MongoDB\Driver\Query';
+				$query = new $class($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort));
+				$results = $connection->_link->executeQuery("$connection->_db_name.$table", $query);
+				return new Min_Result($results);
+			}
+
+			function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				if (isset($set['_id'])) {
+					unset($set['_id']);
+				}
+				$removeFields = array();
+				foreach ($set as $key => $value) {
+					if ($value == 'NULL') {
+						$removeFields[$key] = 1;
+						unset($set[$key]);
+					}
+				}
+				$update = array('$set' => $set);
+				if (count($removeFields)) {
+					$update['$unset'] = $removeFields;
+				}
+				$bulk->update($where, $update, array('upsert' => false));
+				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
+				$connection->affected_rows = $results->getModifiedCount();
+				return true;
+			}
+
+			function delete($table, $queryWhere, $limit = 0) {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				$bulk->delete($where, array('limit' => $limit));
+				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
+				$connection->affected_rows = $results->getDeletedCount();
+				return true;
+			}
+
+			function insert($table, $set) {
+				global $connection;
+				$db = $connection->_db_name;
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				if (isset($set['_id']) && empty($set['_id'])) {
+					unset($set['_id']);
+				}
+				$bulk->insert($set);
+				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
+				$connection->affected_rows = $results->getInsertedCount();
+				return true;
+			}
+		}
 
 		function get_databases($flush) {
+			/** @var Min_DB */
 			global $connection;
 			$return = array();
-			foreach ($connection->executeCommand(array('listDatabases' => 1)) as $dbs) {
+			$class = 'MongoDB\Driver\Command';
+			$command = new $class(array('listDatabases' => 1));
+			$results = $connection->_link->executeCommand('admin', $command);
+			foreach ($results as $dbs) {
 				foreach ($dbs->databases as $db) {
 					$return[] = $db->name;
 				}
@@ -137,8 +389,11 @@ if (isset($_GET["mongo"])) {
 
 		function tables_list() {
 			global $connection;
+			$class = 'MongoDB\Driver\Command';
+			$command = new $class(array('listCollections' => 1));
+			$results = $connection->_link->executeCommand($connection->_db_name, $command);
 			$collections = array();
-			foreach ($connection->executeCommand(array('listCollections' => 1)) as $result) {
+			foreach ($results as $result) {
 				$collections[$result->name] = 'table';
 			}
 			return $collections;
@@ -151,7 +406,10 @@ if (isset($_GET["mongo"])) {
 		function indexes($table, $connection2 = null) {
 			global $connection;
 			$return = array();
-			foreach ($connection->executeCommand(array('listIndexes' => $table)) as $index) {
+			$class = 'MongoDB\Driver\Command';
+			$command = new $class(array('listIndexes' => $table));
+			$results = $connection->_link->executeCommand($connection->_db_name, $command);
+			foreach ($results as $index) {
 				$descs = array();
 				$columns = array();
 				foreach (get_object_vars($index->key) as $column => $type) {
@@ -169,11 +427,10 @@ if (isset($_GET["mongo"])) {
 		}
 
 		function fields($table) {
-			global $driver;
 			$fields = fields_from_edit();
-			if (!$fields) {
+			if (!count($fields)) {
+				global $driver;
 				$result = $driver->select($table, array("*"), null, null, array(), 10);
-				if ($result) {
 				while ($row = $result->fetch_assoc()) {
 					foreach ($row as $key => $val) {
 						$row[$key] = null;
@@ -186,30 +443,27 @@ if (isset($_GET["mongo"])) {
 								"insert" => 1,
 								"select" => 1,
 								"update" => 1,
-									"where" => 1,
-									"order" => 1,
 							),
 						);
 					}
 				}
 			}
-			}
 			return $fields;
 		}
 
 		function found_rows($table_status, $where) {
 			global $connection;
 			$where = where_to_query($where);
-			$toArray = $connection->executeCommand(array('count' => $table_status['Name'], 'query' => $where))->toArray();
+			$class = 'MongoDB\Driver\Command';
+			$command = new $class(array('count' => $table_status['Name'], 'query' => $where));
+			$results = $connection->_link->executeCommand($connection->_db_name, $command);
+			$toArray = $results->toArray();
 			return $toArray[0]->n;
 		}
 
 		function sql_query_where_parser($queryWhere) {
-			$queryWhere = preg_replace('~^\s*WHERE\s*~', "", $queryWhere);
+			$queryWhere = trim(preg_replace('/WHERE[\s]?[(]?\(?/', '', $queryWhere));
-			while ($queryWhere[0] == "(") {
+			$queryWhere = preg_replace('/\)\)\)$/', ')', $queryWhere);
-				$queryWhere = preg_replace('~^\((.*)\)$~', "$1", $queryWhere);
-			}
-
 			$wheres = explode(' AND ', $queryWhere);
 			$wheresOr = explode(') OR (', $queryWhere);
 			$where = array();
@@ -231,8 +485,10 @@ if (isset($_GET["mongo"])) {
 				if (is_array($where)) {
 					foreach ($where as $expression) {
 						list($col, $op, $val) = explode(" ", $expression, 3);
-						if ($col == "_id" && preg_match('~^(MongoDB\\\\BSON\\\\ObjectID)\("(.+)"\)$~', $val, $match)) {
+						if ($col == "_id") {
-							list(, $class, $val) = $match;
+							$val = str_replace('MongoDB\BSON\ObjectID("', "", $val);
+							$val = str_replace('")', "", $val);
+							$class = 'MongoDB\BSON\ObjectID';
 							$val = new $class($val);
 						}
 						if (!in_array($op, $adminer->operators)) {
@@ -242,8 +498,9 @@ if (isset($_GET["mongo"])) {
 							$val = (float) $val;
 							$op = $match[1];
 						} elseif (preg_match('~^\(date\)(.+)~', $op, $match)) {
-							$dateTime = new \DateTime($val);
+							$dateTime = new DateTime($val);
-							$val = new \MongoDB\BSON\UTCDatetime($dateTime->getTimestamp() * 1000);
+							$class = 'MongoDB\BSON\UTCDatetime';
+							$val = new $class($dateTime->getTimestamp() * 1000);
 							$op = $match[1];
 						}
 						switch ($op) {
@@ -281,17 +538,8 @@ if (isset($_GET["mongo"])) {
 			}
 			return $data;
 		}
-	}
 
-
+		$operators = array(
-
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("mongodb");
-		static $jush = "mongo";
-
-		public $editFunctions = array(array("json"));
-
-		public $operators = array(
 			"=",
 			"!=",
 			">",
@@ -312,78 +560,7 @@ if (isset($_GET["mongo"])) {
 			"(date)>=",
 			"(date)<=",
 		);
-
-		public $primary = "_id";
-
-		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-			$select = ($select == array("*")
-				? array()
-				: array_fill_keys($select, 1)
-			);
-			if (count($select) && !isset($select['_id'])) {
-				$select['_id'] = 0;
 	}
-			$where = where_to_query($where);
-			$sort = array();
-			foreach ($order as $val) {
-				$val = preg_replace('~ DESC$~', '', $val, 1, $count);
-				$sort[$val] = ($count ? -1 : 1);
-			}
-			if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] > 0) {
-				$limit = $_GET['limit'];
-			}
-			$limit = min(200, max(1, (int) $limit));
-			$skip = $page * $limit;
-			try {
-				return new Result($this->conn->_link->executeQuery($this->conn->_db_name . ".$table", new \MongoDB\Driver\Query($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort))));
-			} catch (Exception $e) {
-				$this->conn->error = $e->getMessage();
-				return false;
-			}
-		}
-
-		function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
-			$db = $this->conn->_db_name;
-			$where = sql_query_where_parser($queryWhere);
-			$bulk = new \MongoDB\Driver\BulkWrite(array());
-			if (isset($set['_id'])) {
-				unset($set['_id']);
-			}
-			$removeFields = array();
-			foreach ($set as $key => $value) {
-				if ($value == 'NULL') {
-					$removeFields[$key] = 1;
-					unset($set[$key]);
-				}
-			}
-			$update = array('$set' => $set);
-			if (count($removeFields)) {
-				$update['$unset'] = $removeFields;
-			}
-			$bulk->update($where, $update, array('upsert' => false));
-			return $this->conn->executeBulkWrite("$db.$table", $bulk, 'getModifiedCount');
-		}
-
-		function delete($table, $queryWhere, $limit = 0) {
-			$db = $this->conn->_db_name;
-			$where = sql_query_where_parser($queryWhere);
-			$bulk = new \MongoDB\Driver\BulkWrite(array());
-			$bulk->delete($where, array('limit' => $limit));
-			return $this->conn->executeBulkWrite("$db.$table", $bulk, 'getDeletedCount');
-		}
-
-		function insert($table, $set) {
-			$db = $this->conn->_db_name;
-			$bulk = new \MongoDB\Driver\BulkWrite(array());
-			if ($set['_id'] == '') {
-				unset($set['_id']);
-			}
-			$bulk->insert($set);
-			return $this->conn->executeBulkWrite("$db.$table", $bulk, 'getInsertedCount');
-		}
-	}
-
-
 
 	function table($idf) {
 		return $idf;
@@ -428,15 +605,10 @@ if (isset($_GET["mongo"])) {
 		return $credentials[1];
 	}
 
-	function connect($credentials) {
+	function connect() {
 		global $adminer;
-		$connection = new Db;
+		$connection = new Min_DB;
-		list($server, $username, $password) = $credentials;
+		list($server, $username, $password) = $adminer->credentials();
-
-		if ($server == "") {
-			$server = "localhost:27017";
-		}
-
 		$options = array();
 		if ($username . $password != "") {
 			$options["username"] = $username;
@@ -449,11 +621,21 @@ if (isset($_GET["mongo"])) {
 		if (($auth_source = getenv("MONGO_AUTH_SOURCE"))) {
 			$options["authSource"] = $auth_source;
 		}
+		try {
+			$connection->_link = $connection->connect("mongodb://$server", $options);
+			if ($password != "") {
+				$options["password"] = "";
+				try {
 					$connection->connect("mongodb://$server", $options);
-		if ($connection->error) {
+					return lang('Database does not support password.');
-			return $connection->error;
+				} catch (Exception $ex) {
+					// this is what we want
+				}
 			}
 			return $connection;
+		} catch (Exception $ex) {
+			return $ex->getMessage();
+		}
 	}
 
 	function alter_indexes($table, $alter) {
@@ -542,4 +724,9 @@ if (isset($_GET["mongo"])) {
 		}
 		return true;
 	}
+
+	$jush = "mongo";
+	$functions = array();
+	$grouping = array();
+	$edit_functions = array(array("json"));
 }

adminer/drivers/mssql.inc.php

@@ -5,18 +5,16 @@
 * @author Jakub Vrana
 */
 
-namespace Adminer;
+$drivers["mssql"] = "MS SQL (beta)";
-
-$drivers["mssql"] = "MS SQL";
 
 if (isset($_GET["mssql"])) {
-	define('Adminer\DRIVER', "mssql");
+	$possible_drivers = array("SQLSRV", "MSSQL", "PDO_DBLIB");
+	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
-		class Db {
+		class Min_DB {
-			public $extension = "sqlsrv", $server_info, $affected_rows, $errno, $error;
+			var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $errno, $error;
-			private $link, $result;
 
-			private function get_error() {
+			function _get_error() {
 				$this->error = "";
 				foreach (sqlsrv_errors() as $error) {
 					$this->errno = $error["code"];
@@ -27,52 +25,44 @@ if (isset($_GET["mssql"])) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-				$connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
-				$ssl = $adminer->connectSsl();
-				if (isset($ssl["Encrypt"])) {
-					$connection_info["Encrypt"] = $ssl["Encrypt"];
-				}
-				if (isset($ssl["TrustServerCertificate"])) {
-					$connection_info["TrustServerCertificate"] = $ssl["TrustServerCertificate"];
-				}
 				$db = $adminer->database();
+				$connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
 				if ($db != "") {
 					$connection_info["Database"] = $db;
 				}
-				$this->link = @sqlsrv_connect(preg_replace('~:~', ',', $server), $connection_info);
+				$this->_link = @sqlsrv_connect(preg_replace('~:~', ',', $server), $connection_info);
-				if ($this->link) {
+				if ($this->_link) {
-					$info = sqlsrv_server_info($this->link);
+					$info = sqlsrv_server_info($this->_link);
 					$this->server_info = $info['SQLServerVersion'];
 				} else {
-					$this->get_error();
+					$this->_get_error();
 				}
-				return (bool) $this->link;
+				return (bool) $this->_link;
 			}
 
 			function quote($string) {
-				$unicode = strlen($string) != strlen(utf8_decode($string));
+				return "'" . str_replace("'", "''", $string) . "'";
-				return ($unicode ? "N" : "") . "'" . str_replace("'", "''", $string) . "'";
 			}
 
 			function select_db($database) {
-				return $this->query(use_sql($database));
+				return $this->query("USE " . idf_escape($database));
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = sqlsrv_query($this->link, $query); //! , array(), ($unbuffered ? array() : array("Scrollable" => "keyset"))
+				$result = sqlsrv_query($this->_link, $query); //! , array(), ($unbuffered ? array() : array("Scrollable" => "keyset"))
 				$this->error = "";
 				if (!$result) {
-					$this->get_error();
+					$this->_get_error();
 					return false;
 				}
 				return $this->store_result($result);
 			}
 
 			function multi_query($query) {
-				$this->result = sqlsrv_query($this->link, $query);
+				$this->_result = sqlsrv_query($this->_link, $query);
 				$this->error = "";
-				if (!$this->result) {
+				if (!$this->_result) {
-					$this->get_error();
+					$this->_get_error();
 					return false;
 				}
 				return true;
@@ -80,20 +70,20 @@ if (isset($_GET["mssql"])) {
 
 			function store_result($result = null) {
 				if (!$result) {
-					$result = $this->result;
+					$result = $this->_result;
 				}
 				if (!$result) {
 					return false;
 				}
 				if (sqlsrv_field_metadata($result)) {
-					return new Result($result);
+					return new Min_Result($result);
 				}
 				$this->affected_rows = sqlsrv_rows_affected($result);
 				return true;
 			}
 
 			function next_result() {
-				return $this->result ? sqlsrv_next_result($this->result) : null;
+				return $this->_result ? sqlsrv_next_result($this->_result) : null;
 			}
 
 			function result($query, $field = 0) {
@@ -106,16 +96,15 @@ if (isset($_GET["mssql"])) {
 			}
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows;
+			var $_result, $_offset = 0, $_fields, $num_rows;
-			private $result, $offset = 0, $fields;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 				// $this->num_rows = sqlsrv_num_rows($result); // available only in scrollable results
 			}
 
-			private function convert($row) {
+			function _convert($row) {
 				foreach ((array) $row as $key => $val) {
 					if (is_a($val, 'DateTime')) {
 						$row[$key] = $val->format("Y-m-d H:i:s");
@@ -126,19 +115,19 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function fetch_assoc() {
-				return $this->convert(sqlsrv_fetch_array($this->result, SQLSRV_FETCH_ASSOC));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC));
 			}
 
 			function fetch_row() {
-				return $this->convert(sqlsrv_fetch_array($this->result, SQLSRV_FETCH_NUMERIC));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC));
 			}
 
 			function fetch_field() {
-				if (!$this->fields) {
+				if (!$this->_fields) {
-					$this->fields = sqlsrv_field_metadata($this->result);
+					$this->_fields = sqlsrv_field_metadata($this->_result);
 				}
-				$field = $this->fields[$this->offset++];
+				$field = $this->_fields[$this->_offset++];
-				$return = new \stdClass;
+				$return = new stdClass;
 				$return->name = $field["Name"];
 				$return->orgname = $field["Name"];
 				$return->type = ($field["Type"] == 1 ? 254 : 0);
@@ -147,33 +136,115 @@ if (isset($_GET["mssql"])) {
 
 			function seek($offset) {
 				for ($i=0; $i < $offset; $i++) {
-					sqlsrv_fetch($this->result); // SQLSRV_SCROLL_ABSOLUTE added in sqlsrv 1.1
+					sqlsrv_fetch($this->_result); // SQLSRV_SCROLL_ABSOLUTE added in sqlsrv 1.1
 				}
 			}
 
 			function __destruct() {
-				sqlsrv_free_stmt($this->result);
+				sqlsrv_free_stmt($this->_result);
 			}
 		}
 
-	} elseif (extension_loaded("pdo_sqlsrv")) {
+	} elseif (extension_loaded("mssql")) {
-		class Db extends PdoDb {
+		class Min_DB {
-			public $extension = "PDO_SQLSRV";
+			var $extension = "MSSQL", $_link, $_result, $server_info, $affected_rows, $error;
 
 			function connect($server, $username, $password) {
-				$this->dsn("sqlsrv:Server=" . str_replace(":", ",", $server), $username, $password);
+				$this->_link = @mssql_connect($server, $username, $password);
-				return true;
+				if ($this->_link) {
+					$result = $this->query("SELECT SERVERPROPERTY('ProductLevel'), SERVERPROPERTY('Edition')");
+					if ($result) {
+						$row = $result->fetch_row();
+						$this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]";
+					}
+				} else {
+					$this->error = mssql_get_last_message();
+				}
+				return (bool) $this->_link;
+			}
+
+			function quote($string) {
+				return "'" . str_replace("'", "''", $string) . "'";
 			}
 
 			function select_db($database) {
-				// database selection is separated from the connection so dbname in DSN can't be used
+				return mssql_select_db($database);
-				return $this->query(use_sql($database));
+			}
+
+			function query($query, $unbuffered = false) {
+				$result = @mssql_query($query, $this->_link); //! $unbuffered
+				$this->error = "";
+				if (!$result) {
+					$this->error = mssql_get_last_message();
+					return false;
+				}
+				if ($result === true) {
+					$this->affected_rows = mssql_rows_affected($this->_link);
+					return true;
+				}
+				return new Min_Result($result);
+			}
+
+			function multi_query($query) {
+				return $this->_result = $this->query($query);
+			}
+
+			function store_result() {
+				return $this->_result;
+			}
+
+			function next_result() {
+				return mssql_next_result($this->_result->_result);
+			}
+
+			function result($query, $field = 0) {
+				$result = $this->query($query);
+				if (!is_object($result)) {
+					return false;
+				}
+				return mssql_result($result->_result, 0, $field);
+			}
+		}
+
+		class Min_Result {
+			var $_result, $_offset = 0, $_fields, $num_rows;
+
+			function __construct($result) {
+				$this->_result = $result;
+				$this->num_rows = mssql_num_rows($result);
+			}
+
+			function fetch_assoc() {
+				return mssql_fetch_assoc($this->_result);
+			}
+
+			function fetch_row() {
+				return mssql_fetch_row($this->_result);
+			}
+
+			function num_rows() {
+				return mssql_num_rows($this->_result);
+			}
+
+			function fetch_field() {
+				$return = mssql_fetch_field($this->_result);
+				$return->orgtable = $return->table;
+				$return->orgname = $return->name;
+				return $return;
+			}
+
+			function seek($offset) {
+				mssql_data_seek($this->_result, $offset);
+			}
+
+			function __destruct() {
+				mssql_free_result($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_dblib")) {
-		class Db extends PdoDb {
+		class Min_DB extends Min_PDO {
-			public $extension = "PDO_DBLIB";
+			var $extension = "PDO_DBLIB";
 
 			function connect($server, $username, $password) {
 				$this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)), $username, $password);
@@ -181,95 +252,40 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function select_db($database) {
-				return $this->query(use_sql($database));
+				// database selection is separated from the connection so dbname in DSN can't be used
+				return $this->query("USE " . idf_escape($database));
 			}
 		}
 	}
 
 
-	class Driver extends SqlDriver {
+	class Min_Driver extends Min_SQL {
-		static $possibleDrivers = array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB");
-		static $jush = "mssql";
-
-		public $editFunctions = array(
-			array(
-				"date|time" => "getdate",
-			), array(
-				"int|decimal|real|float|money|datetime" => "+/-",
-				"char|text" => "+",
-			)
-		);
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
-		public $functions = array("len", "lower", "round", "upper");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-		public $onActions = "NO ACTION|CASCADE|SET NULL|SET DEFAULT";
-		public $generated = array("PERSISTED", "VIRTUAL");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array( //! use sys.types
-				lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "int" => 10, "bigint" => 20, "bit" => 1, "decimal" => 0, "real" => 12, "float" => 53, "smallmoney" => 10, "money" => 20),
-				lang('Date and time') => array("date" => 10, "smalldatetime" => 19, "datetime" => 19, "datetime2" => 19, "time" => 8, "datetimeoffset" => 10),
-				lang('Strings') => array("char" => 8000, "varchar" => 8000, "text" => 2147483647, "nchar" => 4000, "nvarchar" => 4000, "ntext" => 1073741823),
-				lang('Binary') => array("binary" => 8000, "varbinary" => 8000, "image" => 2147483647),
-			);
-		}
 
 		function insertUpdate($table, $rows, $primary) {
-			$fields = fields($table);
+			foreach ($rows as $set) {
 				$update = array();
 				$where = array();
-			$set = reset($rows);
-			$columns = "c" . implode(", c", range(1, count($set)));
-			$c = 0;
-			$insert = array();
 				foreach ($set as $key => $val) {
-				$c++;
+					$update[] = "$key = $val";
-				$name = idf_unescape($key);
+					if (isset($primary[idf_unescape($key)])) {
-				if (!$fields[$name]["auto_increment"]) {
+						$where[] = "$key = $val";
-					$insert[$key] = "c$c";
-				}
-				if (isset($primary[$name])) {
-					$where[] = "$key = c$c";
-				} else {
-					$update[] = "$key = c$c";
 					}
 				}
-			$values = array();
+				//! can use only one query for all rows
-			foreach ($rows as $set) {
+				if (!queries("MERGE " . table($table) . " USING (VALUES(" . implode(", ", $set) . ")) AS source (c" . implode(", c", range(1, count($set))) . ") ON " . implode(" AND ", $where) //! source, c1 - possible conflict
-				$values[] = "(" . implode(", ", $set) . ")";
+					. " WHEN MATCHED THEN UPDATE SET " . implode(", ", $update)
+					. " WHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ");" // ; is mandatory
+				)) {
+					return false;
 				}
-			if ($where) {
-				$identity = queries("SET IDENTITY_INSERT " . table($table) . " ON");
-				$return = queries(
-					"MERGE " . table($table) . " USING (VALUES\n\t" . implode(",\n\t", $values) . "\n) AS source ($columns) ON " . implode(" AND ", $where) //! source, c1 - possible conflict
-					. ($update ? "\nWHEN MATCHED THEN UPDATE SET " . implode(", ", $update) : "")
-					. "\nWHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($identity ? $set : $insert)) . ") VALUES (" . ($identity ? $columns : implode(", ", $insert)) . ");" // ; is mandatory
-				);
-				if ($identity) {
-					queries("SET IDENTITY_INSERT " . table($table) . " OFF");
 			}
-			} else {
+			return true;
-				$return = queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES\n" . implode(",\n", $values));
-			}
-			return $return;
 		}
 
 		function begin() {
 			return queries("BEGIN TRANSACTION");
 		}
 
-		function tableHelp($name, $is_view = false) {
-			$links = array(
-				"sys" => "catalog-views/sys-",
-				"INFORMATION_SCHEMA" => "information-schema-views/",
-			);
-			$link = $links[get_schema()];
-			if ($link) {
-				return "relational-databases/system-$link" . preg_replace('~_~', '-', strtolower($name)) . "-transact-sql";
-			}
-		}
 	}
 
 
@@ -282,11 +298,10 @@ if (isset($_GET["mssql"])) {
 		return ($_GET["ns"] != "" ? idf_escape($_GET["ns"]) . "." : "") . idf_escape($idf);
 	}
 
-	function connect($credentials) {
+	function connect() {
-		$connection = new Db;
+		global $adminer;
-		if ($credentials[0] == "") {
+		$connection = new Min_DB;
-			$credentials[0] = "localhost:1433";
+		$credentials = $adminer->credentials();
-		}
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -306,7 +321,8 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
+		global $connection;
+		return $connection->result("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
 	}
 
 	function engines() {
@@ -314,7 +330,8 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function logged_user() {
-		return get_val("SELECT SUSER_NAME()");
+		global $connection;
+		return $connection->result("SELECT SUSER_NAME()");
 	}
 
 	function tables_list() {
@@ -326,18 +343,14 @@ if (isset($_GET["mssql"])) {
 		$return = array();
 		foreach ($databases as $db) {
 			$connection->select_db($db);
-			$return[$db] = get_val("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES");
+			$return[$db] = $connection->result("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES");
 		}
 		return $return;
 	}
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (
+		foreach (get_rows("SELECT ao.name AS Name, ao.type_desc AS Engine, (SELECT value FROM fn_listextendedproperty(default, 'SCHEMA', schema_name(schema_id), 'TABLE', ao.name, null, null)) AS Comment FROM sys.all_objects AS ao WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
-			get_rows("SELECT ao.name AS Name, ao.type_desc AS Engine, (SELECT value FROM fn_listextendedproperty(default, 'SCHEMA', schema_name(schema_id), 'TABLE', ao.name, null, null)) AS Comment
-FROM sys.all_objects AS ao
-WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row
-		) {
 			if ($name != "") {
 				return $row;
 			}
@@ -355,55 +368,43 @@ WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V')
 	}
 
 	function fields($table) {
-		$comments = get_key_vals("SELECT objname, cast(value as varchar(max)) FROM fn_listextendedproperty('MS_DESCRIPTION', 'schema', " . q(get_schema()) . ", 'table', " . q($table) . ", 'column', NULL)");
+		$comments = get_key_vals("SELECT objname, cast(value as varchar) FROM fn_listextendedproperty('MS_DESCRIPTION', 'schema', " . q(get_schema()) . ", 'table', " . q($table) . ", 'column', NULL)");
 		$return = array();
-		$table_id = get_val("SELECT object_id FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') AND name = " . q($table));
+		foreach (get_rows("SELECT c.max_length, c.precision, c.scale, c.name, c.is_nullable, c.is_identity, c.collation_name, t.name type, CAST(d.definition as text) [default]
-		foreach (
-			get_rows("SELECT c.max_length, c.precision, c.scale, c.name, c.is_nullable, c.is_identity, c.collation_name, t.name type, CAST(d.definition as text) [default], d.name default_constraint, i.is_primary_key
 FROM sys.all_columns c
+JOIN sys.all_objects o ON c.object_id = o.object_id
 JOIN sys.types t ON c.user_type_id = t.user_type_id
-LEFT JOIN sys.default_constraints d ON c.default_object_id = d.object_id
+LEFT JOIN sys.default_constraints d ON c.default_object_id = d.parent_column_id
-LEFT JOIN sys.index_columns ic ON c.object_id = ic.object_id AND c.column_id = ic.column_id
+WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . q($table)
-LEFT JOIN sys.indexes i ON ic.object_id = i.object_id AND ic.index_id = i.index_id
+		) as $row) {
-WHERE c.object_id = " . q($table_id)) as $row
-		) {
 			$type = $row["type"];
-			$length = (preg_match("~char|binary~", $type)
+			$length = (preg_match("~char|binary~", $type) ? $row["max_length"] : ($type == "decimal" ? "$row[precision],$row[scale]" : ""));
-				? $row["max_length"] / ($type[0] == 'n' ? 2 : 1)
-				: ($type == "decimal" ? "$row[precision],$row[scale]" : "")
-			);
 			$return[$row["name"]] = array(
 				"field" => $row["name"],
 				"full_type" => $type . ($length ? "($length)" : ""),
 				"type" => $type,
 				"length" => $length,
-				"default" => (preg_match("~^\('(.*)'\)$~", $row["default"], $match) ? str_replace("''", "'", $match[1]) : $row["default"]),
+				"default" => $row["default"],
-				"default_constraint" => $row["default_constraint"],
 				"null" => $row["is_nullable"],
 				"auto_increment" => $row["is_identity"],
 				"collation" => $row["collation_name"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
-				"primary" => $row["is_primary_key"],
+				"primary" => $row["is_identity"], //! or indexes.is_primary_key
 				"comment" => $comments[$row["name"]],
 			);
 		}
-		foreach (get_rows("SELECT * FROM sys.computed_columns WHERE object_id = " . q($table_id)) as $row) {
-			$return[$row["name"]]["generated"] = ($row["is_persisted"] ? "PERSISTED" : "VIRTUAL");
-			$return[$row["name"]]["default"] = $row["definition"];
-		}
 		return $return;
 	}
 
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		// sp_statistics doesn't return information about primary key
-		foreach (
+		foreach (get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name, is_descending_key
-			get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name, is_descending_key
 FROM sys.indexes i
 INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
 INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
-WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
+WHERE OBJECT_NAME(i.object_id) = " . q($table)
-		) {
+		, $connection2) as $row) {
 			$name = $row["name"];
 			$return[$name]["type"] = ($row["is_primary_key"] ? "PRIMARY" : ($row["is_unique"] ? "UNIQUE" : "INDEX"));
 			$return[$name]["lengths"] = array();
@@ -414,7 +415,8 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function view($name) {
-		return array("select" => preg_replace('~^(?:[^[]|\[[^]]*])*\s+AS\s+~isU', '', get_val("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));
+		global $connection;
+		return array("select" => preg_replace('~^(?:[^[]|\[[^]]*])*\s+AS\s+~isU', '', $connection->result("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));
 	}
 
 	function collations() {
@@ -426,7 +428,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function information_schema($db) {
-		return get_schema() == "INFORMATION_SCHEMA";
+		return false;
 	}
 
 	function error() {
@@ -439,7 +441,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function drop_databases($databases) {
-		return queries("DROP DATABASE " . implode(", ", array_map('Adminer\idf_escape', $databases)));
+		return queries("DROP DATABASE " . implode(", ", array_map('idf_escape', $databases)));
 	}
 
 	function rename_database($name, $collation) {
@@ -457,7 +459,6 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
 		$comments = array();
-		$orig_fields = fields($table);
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -467,28 +468,14 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", '\1\2', $val[1]);
 				$comments[$field[0]] = $val[5];
 				unset($val[5]);
-				if (preg_match('~ AS ~', $val[3])) {
-					unset($val[1], $val[2]);
-				}
 				if ($field[0] == "") {
 					$alter["ADD"][] = "\n  " . implode("", $val) . ($table == "" ? substr($foreign[$val[0]], 16 + strlen($val[0])) : ""); // 16 - strlen("  FOREIGN KEY ()")
 				} else {
-					$default = $val[3];
-					unset($val[3]); // default values are set separately
 					unset($val[6]); //! identity can't be removed
 					if ($column != $val[0]) {
 						queries("EXEC sp_rename " . q(table($table) . ".$column") . ", " . q(idf_unescape($val[0])) . ", 'COLUMN'");
 					}
 					$alter["ALTER COLUMN " . implode("", $val)][] = "";
-					$orig_field = $orig_fields[$field[0]];
-					if (default_value($orig_field) != $default) {
-						if ($orig_field["default"] !== null) {
-							$alter["DROP"][] = " " . idf_escape($orig_field["default_constraint"]);
-						}
-						if ($default) {
-							$alter["ADD"][] = "\n $default FOR $column";
-						}
-					}
 				}
 			}
 		}
@@ -502,7 +489,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 			$alter[""] = $foreign;
 		}
 		foreach ($alter as $key => $val) {
-			if (!queries("ALTER TABLE " . table($name) . " $key" . implode(",", $val))) {
+			if (!queries("ALTER TABLE " . idf_escape($name) . " $key" . implode(",", $val))) {
 				return false;
 			}
 		}
@@ -524,12 +511,10 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 				} else {
 					$index[] = idf_escape($val[1]) . " ON " . table($table);
 				}
-			} elseif (
+			} elseif (!queries(($val[0] != "PRIMARY"
-				!queries(($val[0] != "PRIMARY"
 				? "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table)
 				: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
-				) . " (" . implode(", ", $val[2]) . ")")
+			) . " (" . implode(", ", $val[2]) . ")")) {
-			) {
 				return false;
 			}
 		}
@@ -539,7 +524,8 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function last_id() {
-		return get_val("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
+		global $connection;
+		return $connection->result("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
 	}
 
 	function explain($connection, $query) {
@@ -554,14 +540,10 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 
 	function foreign_keys($table) {
 		$return = array();
-		$on_actions = array("CASCADE", "NO ACTION", "SET NULL", "SET DEFAULT");
+		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table)) as $row) {
-		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table) . ", @fktable_owner = " . q(get_schema())) as $row) {
 			$foreign_key = &$return[$row["FK_NAME"]];
 			$foreign_key["db"] = $row["PKTABLE_QUALIFIER"];
-			$foreign_key["ns"] = $row["PKTABLE_OWNER"];
 			$foreign_key["table"] = $row["PKTABLE_NAME"];
-			$foreign_key["on_update"] = $on_actions[$row["UPDATE_RULE"]];
-			$foreign_key["on_delete"] = $on_actions[$row["DELETE_RULE"]];
 			$foreign_key["source"][] = $row["FKCOLUMN_NAME"];
 			$foreign_key["target"][] = $row["PKCOLUMN_NAME"];
 		}
@@ -573,11 +555,11 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function drop_views($views) {
-		return queries("DROP VIEW " . implode(", ", array_map('Adminer\table', $views)));
+		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
 	}
 
 	function drop_tables($tables) {
-		return queries("DROP TABLE " . implode(", ", array_map('Adminer\table', $tables)));
+		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
 	}
 
 	function move_tables($tables, $views, $target) {
@@ -588,8 +570,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 		if ($name == "") {
 			return array();
 		}
-		$rows = get_rows(
+		$rows = get_rows("SELECT s.name [Trigger],
-			"SELECT s.name [Trigger],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(s.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(s.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing],
 c.text
@@ -606,14 +587,13 @@ WHERE s.xtype = 'TR' AND s.name = " . q($name)
 
 	function triggers($table) {
 		$return = array();
-		foreach (
+		foreach (get_rows("SELECT sys1.name,
-			get_rows("SELECT sys1.name,
 CASE WHEN OBJECTPROPERTY(sys1.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(sys1.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(sys1.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(sys1.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing]
 FROM sysobjects sys1
 JOIN sysobjects sys2 ON sys1.parent_obj = sys2.id
-WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
+WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
-		) { // triggers are not schema-scoped
+		) as $row) { // triggers are not schema-scoped
 			$return[$row["name"]] = array($row["Timing"], $row["Event"]);
 		}
 		return $return;
@@ -632,70 +612,27 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
 	}
 
 	function get_schema() {
+		global $connection;
 		if ($_GET["ns"] != "") {
 			return $_GET["ns"];
 		}
-		return get_val("SELECT SCHEMA_NAME()");
+		return $connection->result("SELECT SCHEMA_NAME()");
 	}
 
 	function set_schema($schema) {
-		$_GET["ns"] = $schema;
 		return true; // ALTER USER is permanent
 	}
 
-	function create_sql($table, $auto_increment, $style) {
-		global $driver;
-		if (is_view(table_status($table))) {
-			$view = view($table);
-			return "CREATE VIEW " . table($table) . " AS $view[select]";
-		}
-		$fields = array();
-		$primary = false;
-		foreach (fields($table) as $name => $field) {
-			$val = process_field($field, $field);
-			if ($val[6]) {
-				$primary = true;
-			}
-			$fields[] = implode("", $val);
-		}
-		foreach (indexes($table) as $name => $index) {
-			if (!$primary || $index["type"] != "PRIMARY") {
-				$columns = array();
-				foreach ($index["columns"] as $key => $val) {
-					$columns[] = idf_escape($val) . ($index["descs"][$key] ? " DESC" : "");
-				}
-				$name = idf_escape($name);
-				$fields[] = ($index["type"] == "INDEX" ? "INDEX $name" : "CONSTRAINT $name " . ($index["type"] == "UNIQUE" ? "UNIQUE" : "PRIMARY KEY")) . " (" . implode(", ", $columns) . ")";
-			}
-		}
-		foreach ($driver->checkConstraints($table) as $name => $check) {
-			$fields[] = "CONSTRAINT " . idf_escape($name) . " CHECK ($check)";
-		}
-		return "CREATE TABLE " . table($table) . " (\n\t" . implode(",\n\t", $fields) . "\n)";
-	}
-
-	function foreign_keys_sql($table) {
-		$fields = array();
-		foreach (foreign_keys($table) as $foreign) {
-			$fields[] = ltrim(format_foreign_key($foreign));
-		}
-		return ($fields ? "ALTER TABLE " . table($table) . " ADD\n\t" . implode(",\n\t", $fields) . ";\n\n" : "");
-	}
-
-	function truncate_sql($table) {
-		return "TRUNCATE TABLE " . table($table);
-	}
-
 	function use_sql($database) {
 		return "USE " . idf_escape($database);
 	}
 
-	function trigger_sql($table) {
+	function show_variables() {
-		$return = "";
+		return array();
-		foreach (triggers($table) as $name => $trigger) {
-			$return .= create_trigger(" ON " . table($table), trigger($name)) . ";";
 	}
-		return $return;
+
+	function show_status() {
+		return array();
 	}
 
 	function convert_field($field) {
@@ -706,6 +643,31 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
 	}
 
 	function support($feature) {
-		return preg_match('~^(check|comment|columns|database|drop_col|dump|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
+		return preg_match('~^(comment|columns|database|drop_col|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
 	}
+
+	$jush = "mssql";
+	$types = array();
+	$structured_types = array();
+	foreach (array( //! use sys.types
+		lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "int" => 10, "bigint" => 20, "bit" => 1, "decimal" => 0, "real" => 12, "float" => 53, "smallmoney" => 10, "money" => 20),
+		lang('Date and time') => array("date" => 10, "smalldatetime" => 19, "datetime" => 19, "datetime2" => 19, "time" => 8, "datetimeoffset" => 10),
+		lang('Strings') => array("char" => 8000, "varchar" => 8000, "text" => 2147483647, "nchar" => 4000, "nvarchar" => 4000, "ntext" => 1073741823),
+		lang('Binary') => array("binary" => 8000, "varbinary" => 8000, "image" => 2147483647),
+	) as $key => $val) {
+		$types += $val;
+		$structured_types[$key] = array_keys($val);
+	}
+	$unsigned = array();
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
+	$functions = array("len", "lower", "round", "upper");
+	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+	$edit_functions = array(
+		array(
+			"date|time" => "getdate",
+		), array(
+			"int|decimal|real|float|money|datetime" => "+/-",
+			"char|text" => "+",
+		)
+	);
 }

adminer/drivers/mysql.inc.php

@@ -1,14 +1,13 @@
 <?php
-namespace Adminer;
-
 $drivers = array("server" => "MySQL") + $drivers;
 
-if (!defined('Adminer\DRIVER')) {
+if (!defined("DRIVER")) {
-	define('Adminer\DRIVER', "server"); // server - backwards compatibility
+	$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")) {
-		class Db extends \MySQLi {
+		class Min_DB extends MySQLi {
-			public $extension = "MySQLi";
+			var $extension = "MySQLi";
 
 			function __construct() {
 				parent::init();
@@ -29,7 +28,7 @@ if (!defined('Adminer\DRIVER')) {
 					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
 					(!is_numeric($port) ? $port : $socket),
-					($ssl ? ($ssl['verify'] !== false ? 2048 : 64) : 0) // 2048 - MYSQLI_CLIENT_SSL, 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
+					($ssl ? 64 : 0) // 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
 				$this->options(MYSQLI_OPT_LOCAL_INFILE, false);
 				return $return;
@@ -59,15 +58,15 @@ if (!defined('Adminer\DRIVER')) {
 		}
 
 	} elseif (extension_loaded("mysql") && !((ini_bool("sql.safe_mode") || ini_bool("mysql.allow_local_infile")) && extension_loaded("pdo_mysql"))) {
-		class Db {
+		class Min_DB {
-			public
+			var
 				$extension = "MySQL", ///< @var string extension name
 				$server_info, ///< @var string server version
 				$affected_rows, ///< @var int number of affected rows
 				$errno, ///< @var int last error code
-				$error ///< @var string last error message
+				$error, ///< @var string last error message
+				$_link, $_result ///< @access private
 			;
-			private $link, $result;
 
 			/** Connect to server
 			* @param string
@@ -80,19 +79,19 @@ if (!defined('Adminer\DRIVER')) {
 					$this->error = lang('Disable %s or enable %s or %s extensions.', "'mysql.allow_local_infile'", "MySQLi", "PDO_MySQL");
 					return false;
 				}
-				$this->link = @mysql_connect(
+				$this->_link = @mysql_connect(
 					($server != "" ? $server : ini_get("mysql.default_host")),
 					("$server$username" != "" ? $username : ini_get("mysql.default_user")),
 					("$server$username$password" != "" ? $password : ini_get("mysql.default_password")),
 					true,
 					131072 // CLIENT_MULTI_RESULTS for CALL
 				);
-				if ($this->link) {
+				if ($this->_link) {
-					$this->server_info = mysql_get_server_info($this->link);
+					$this->server_info = mysql_get_server_info($this->_link);
 				} else {
 					$this->error = mysql_error();
 				}
-				return (bool) $this->link;
+				return (bool) $this->_link;
 			}
 
 			/** Sets the client character set
@@ -101,11 +100,11 @@ if (!defined('Adminer\DRIVER')) {
 			*/
 			function set_charset($charset) {
 				if (function_exists('mysql_set_charset')) {
-					if (mysql_set_charset($charset, $this->link)) {
+					if (mysql_set_charset($charset, $this->_link)) {
 						return true;
 					}
 					// the client library may not support utf8mb4
-					mysql_set_charset('utf8', $this->link);
+					mysql_set_charset('utf8', $this->_link);
 				}
 				return $this->query("SET NAMES $charset");
 			}
@@ -115,7 +114,7 @@ if (!defined('Adminer\DRIVER')) {
 			* @return string escaped string enclosed in '
 			*/
 			function quote($string) {
-				return "'" . mysql_real_escape_string($string, $this->link) . "'";
+				return "'" . mysql_real_escape_string($string, $this->_link) . "'";
 			}
 
 			/** Select database
@@ -123,28 +122,28 @@ if (!defined('Adminer\DRIVER')) {
 			* @return bool
 			*/
 			function select_db($database) {
-				return mysql_select_db($database, $this->link);
+				return mysql_select_db($database, $this->_link);
 			}
 
 			/** Send query
 			* @param string
 			* @param bool
-			* @return mixed bool or Result
+			* @return mixed bool or Min_Result
 			*/
 			function query($query, $unbuffered = false) {
-				$result = @($unbuffered ? mysql_unbuffered_query($query, $this->link) : mysql_query($query, $this->link)); // @ - mute mysql.trace_mode
+				$result = @($unbuffered ? mysql_unbuffered_query($query, $this->_link) : mysql_query($query, $this->_link)); // @ - mute mysql.trace_mode
 				$this->error = "";
 				if (!$result) {
-					$this->errno = mysql_errno($this->link);
+					$this->errno = mysql_errno($this->_link);
-					$this->error = mysql_error($this->link);
+					$this->error = mysql_error($this->_link);
 					return false;
 				}
 				if ($result === true) {
-					$this->affected_rows = mysql_affected_rows($this->link);
+					$this->affected_rows = mysql_affected_rows($this->_link);
-					$this->info = mysql_info($this->link);
+					$this->info = mysql_info($this->_link);
 					return true;
 				}
-				return new Result($result);
+				return new Min_Result($result);
 			}
 
 			/** Send query with more resultsets
@@ -152,14 +151,14 @@ if (!defined('Adminer\DRIVER')) {
 			* @return bool
 			*/
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			/** Get current resultset
-			* @return Result
+			* @return Min_Result
 			*/
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			/** Fetch next resultset
@@ -177,19 +176,24 @@ if (!defined('Adminer\DRIVER')) {
 			*/
 			function result($query, $field = 0) {
 				$result = $this->query($query);
-				return ($result ? $result->fetch_column($field) : false);
+				if (!$result || !$result->num_rows) {
+					return false;
+				}
+				return mysql_result($result->_result, 0, $field);
 			}
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows; ///< @var int number of rows in the result
+			var
-			private $result, $offset = 0;
+				$num_rows, ///< @var int number of rows in the result
+				$_result, $_offset = 0 ///< @access private
+			;
 
 			/** Constructor
 			* @param resource
 			*/
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 				$this->num_rows = mysql_num_rows($result);
 			}
 
@@ -197,29 +201,21 @@ if (!defined('Adminer\DRIVER')) {
 			* @return array
 			*/
 			function fetch_assoc() {
-				return mysql_fetch_assoc($this->result);
+				return mysql_fetch_assoc($this->_result);
 			}
 
 			/** Fetch next row as numbered array
 			* @return array
 			*/
 			function fetch_row() {
-				return mysql_fetch_row($this->result);
+				return mysql_fetch_row($this->_result);
-			}
-
-			/** Fetch a single column
-			* @param int
-			* @return string or false if there are no rows
-			*/
-			function fetch_column($field) {
-				return ($this->num_rows ? mysql_result($this->result, 0, $field) : false);
 			}
 
 			/** Fetch next field
 			* @return object properties: name, type, orgtable, orgname, charsetnr
 			*/
 			function fetch_field() {
-				$return = mysql_fetch_field($this->result, $this->offset++); // offset required under certain conditions
+				$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);
@@ -229,30 +225,27 @@ if (!defined('Adminer\DRIVER')) {
 			/** Free result set
 			*/
 			function __destruct() {
-				mysql_free_result($this->result);
+				mysql_free_result($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_mysql")) {
-		class Db extends PdoDb {
+		class Min_DB extends Min_PDO {
-			public $extension = "PDO_MySQL";
+			var $extension = "PDO_MySQL";
 
 			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']) {
+					if (!empty($ssl['key'])) {
-						$options[\PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
+						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
 					}
-					if ($ssl['cert']) {
+					if (!empty($ssl['cert'])) {
-						$options[\PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
+						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
 					}
-					if ($ssl['ca']) {
+					if (!empty($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'];
 					}
 				}
 				$this->dsn(
@@ -274,7 +267,7 @@ if (!defined('Adminer\DRIVER')) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$this->pdo->setAttribute(\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
+				$this->setAttribute(1000, !$unbuffered); // 1000 - PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
 				return parent::query($query, $unbuffered);
 			}
 		}
@@ -283,52 +276,7 @@ if (!defined('Adminer\DRIVER')) {
 
 
 
-	class Driver extends SqlDriver {
+	class Min_Driver extends Min_SQL {
-		static $possibleDrivers = array("MySQLi", "MySQL", "PDO_MySQL");
-		static $jush = "sql"; ///< @var string JUSH identifier
-
-		public $unsigned = array("unsigned", "zerofill", "unsigned zerofill");
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
-		public $functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper");
-		public $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array(
-				lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
-				lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
-				lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
-				lang('Lists') => array("enum" => 65535, "set" => 64),
-				lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
-				lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
-			);
-			$this->editFunctions = array(
-				array(
-					"char" => "md5/sha1/password/encrypt/uuid",
-					"binary" => "md5/sha1",
-					"date|time" => "now",
-				), array(
-					number_type() => "+/-",
-					"date" => "+ interval/- interval",
-					"time" => "addtime/subtime",
-					"char|text" => "concat",
-				)
-			);
-			if (min_version('5.7.8', 10.2, $connection)) {
-				$this->types[lang('Strings')]["json"] = 4294967295;
-			}
-			if (min_version('', 10.7, $connection)) {
-				$this->types[lang('Strings')]["uuid"] = 128;
-				$this->editFunctions[0]['uuid'] = 'uuid';
-			}
-			if (min_version(9, '', $connection)) {
-				$this->types[lang('Numbers')]["vector"] = 16383;
-				$this->editFunctions[0]['vector'] = 'string_to_vector';
-			}
-			if (min_version(5.7, 10.2, $connection)) {
-				$this->generated = array("STORED", "VIRTUAL");
-			}
-		}
 
 		function insert($table, $set) {
 			return ($set ? parent::insert($table, $set) : queries("INSERT INTO " . table($table) . " ()\nVALUES ()"));
@@ -361,7 +309,7 @@ if (!defined('Adminer\DRIVER')) {
 		
 		function slowQuery($query, $timeout) {
 			if (min_version('5.7.8', '10.1.2')) {
-				if (preg_match('~MariaDB~', $this->conn->server_info)) {
+				if (preg_match('~MariaDB~', $this->_conn->server_info)) {
 					return "SET STATEMENT max_statement_time=$timeout FOR $query";
 				} elseif (preg_match('~^(SELECT\b)(.+)~is', $query, $match)) {
 					return "$match[1] /*+ MAX_EXECUTION_TIME(" . ($timeout * 1000) . ") */ $match[2]";
@@ -371,13 +319,13 @@ if (!defined('Adminer\DRIVER')) {
 
 		function convertSearch($idf, $val, $field) {
 			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $val['val'])
-				? "CONVERT($idf USING " . charset($this->conn) . ")"
+				? "CONVERT($idf USING " . charset($this->_conn) . ")"
 				: $idf
 			);
 		}
 		
 		function warnings() {
-			$result = $this->conn->query("SHOW WARNINGS");
+			$result = $this->_conn->query("SHOW WARNINGS");
 			if ($result && $result->num_rows) {
 				ob_start();
 				select($result); // select() usually needs to print a big table progressively
@@ -385,24 +333,16 @@ if (!defined('Adminer\DRIVER')) {
 			}
 		}
 
-		function tableHelp($name, $is_view = false) {
+		function tableHelp($name) {
-			$maria = preg_match('~MariaDB~', $this->conn->server_info);
+			$maria = preg_match('~MariaDB~', $this->_conn->server_info);
 			if (information_schema(DB)) {
-				return strtolower("information-schema-" . ($maria ? "$name-table/" : str_replace("_", "-", $name) . "-table.html"));
+				return strtolower(($maria ? "information-schema-$name-table/" : str_replace("_", "-", $name) . "-table.html"));
 			}
 			if (DB == "mysql") {
-				return ($maria ? "mysql$name-table/" : "system-schema.html"); //! more precise link
+				return ($maria ? "mysql$name-table/" : "system-database.html"); //! more precise link
 			}
 		}
 
-		function hasCStyleEscapes() {
-			static $c_style;
-			if ($c_style === null) {
-				$sql_mode = $this->conn->result("SHOW VARIABLES LIKE 'sql_mode'", 1);
-				$c_style = (strpos($sql_mode, 'NO_BACKSLASH_ESCAPES') === false);
-			}
-			return $c_style;
-		}
 	}
 
 
@@ -424,14 +364,19 @@ if (!defined('Adminer\DRIVER')) {
 	}
 
 	/** Connect to the database
-	* @param array [$server, $username, $password]
+	* @return mixed Min_DB or string for error
-	* @return mixed Db or string for error
 	*/
-	function connect($credentials) {
+	function connect() {
-		$connection = new Db;
+		global $adminer, $types, $structured_types;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			$connection->set_charset(charset($connection)); // available in MySQLi since PHP 5.0.5
 			$connection->query("SET sql_quote_show_create = 1, autocommit = 1");
+			if (min_version('5.7.8', 10.2, $connection)) {
+				$structured_types[lang('Strings')][] = "json";
+				$types["json"] = 4294967295;
+			}
 			return $connection;
 		}
 		$return = $connection->error;
@@ -449,7 +394,10 @@ if (!defined('Adminer\DRIVER')) {
 		// SHOW DATABASES can take a very long time so it is cached
 		$return = get_session("dbs");
 		if ($return === null) {
-			$query = "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME"; // SHOW DATABASES can be disabled by skip_show_database
+			$query = (min_version(5)
+				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME"
+				: "SHOW DATABASES"
+			); // SHOW DATABASES can be disabled by skip_show_database
 			$return = ($flush ? slow_query($query) : get_vals($query));
 			restart_session();
 			set_session("dbs", $return);
@@ -487,8 +435,9 @@ if (!defined('Adminer\DRIVER')) {
 	* @return string
 	*/
 	function db_collation($db, $collations) {
+		global $connection;
 		$return = null;
-		$create = get_val("SHOW CREATE DATABASE " . idf_escape($db), 1);
+		$create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1);
 		if (preg_match('~ COLLATE ([^ ]+)~', $create, $match)) {
 			$return = $match[1];
 		} elseif (preg_match('~ CHARACTER SET ([^ ]+)~', $create, $match)) {
@@ -515,19 +464,23 @@ if (!defined('Adminer\DRIVER')) {
 	* @return string
 	*/
 	function logged_user() {
-		return get_val("SELECT USER()");
+		global $connection;
+		return $connection->result("SELECT USER()");
 	}
 
 	/** Get tables list
-	* @return array [$name => $type]
+	* @return array array($name => $type)
 	*/
 	function tables_list() {
-		return get_key_vals("SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME");
+		return get_key_vals(min_version(5)
+			? "SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME"
+			: "SHOW TABLES"
+		);
 	}
 
 	/** Count tables in all databases
 	* @param array
-	* @return array [$db => $tables]
+	* @return array array($db => $tables)
 	*/
 	function count_tables($databases) {
 		$return = array();
@@ -540,17 +493,14 @@ if (!defined('Adminer\DRIVER')) {
 	/** Get table status
 	* @param string
 	* @param bool return only "Name", "Engine" and "Comment" fields
-	* @return array [$name => ["Name" => , "Engine" => , "Comment" => , "Oid" => , "Rows" => , "Collation" => , "Auto_increment" => , "Data_length" => , "Index_length" => , "Data_free" => ]] or only inner array with $name
+	* @return array array($name => array("Name" => , "Engine" => , "Comment" => , "Oid" => , "Rows" => , "Collation" => , "Auto_increment" => , "Data_length" => , "Index_length" => , "Data_free" => )) or only inner array with $name
 	*/
 	function table_status($name = "", $fast = false) {
 		$return = array();
-		foreach (
+		foreach (get_rows($fast && min_version(5)
-			get_rows(
-				$fast
 			? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
 			: "SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_\\")) : "")
-			) as $row
+		) as $row) {
-		) {
 			if ($row["Engine"] == "InnoDB") {
 				// ignore internal comment, unnecessary since MySQL 5.1.21
 				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\1', $row["Comment"]);
@@ -559,8 +509,6 @@ if (!defined('Adminer\DRIVER')) {
 				$row["Comment"] = "";
 			}
 			if ($name != "") {
-				// MariaDB: Table name is returned as lowercase on macOS, so we fix it here.
-				$row["Name"] = $name;
 				return $row;
 			}
 			$return[$row["Name"]] = $row;
@@ -587,49 +535,28 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Get information about fields
 	* @param string
-	* @return array [$name => ["field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => , "generated" => ]]
+	* @return array array($name => array("field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => ))
 	*/
 	function fields($table) {
-		global $connection;
-		$maria = preg_match('~MariaDB~', $connection->server_info);
 		$return = array();
-		foreach (get_rows("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION") as $row) {
+		foreach (get_rows("SHOW FULL COLUMNS FROM " . table($table)) as $row) {
-			$field = $row["COLUMN_NAME"];
+			preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
-			$type = $row["COLUMN_TYPE"];
+			$return[$row["Field"]] = array(
-			$generation = $row["GENERATION_EXPRESSION"];
+				"field" => $row["Field"],
-			$extra = $row["EXTRA"];
+				"full_type" => $row["Type"],
-			// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
-			preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $extra, $generated);
-			preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $type, $match);
-			$default = $row["COLUMN_DEFAULT"];
-			$is_text = preg_match('~text~', $match[1]);
-			if (!$maria && $is_text) {
-				// default value a'b of text column is stored as _utf8mb4\'a\\\'b\' in MySQL
-				$default = preg_replace("~^(_\w+)?('.*')$~", '\2', stripslashes($default));
-			}
-			if ($maria || $is_text) {
-				$default = preg_replace_callback("~^'(.*)'$~", function ($match) {
-					return stripslashes(str_replace("''", "'", $match[1]));
-				}, $default);
-			}
-			$return[$field] = array(
-				"field" => $field,
-				"full_type" => $type,
 				"type" => $match[1],
 				"length" => $match[2],
 				"unsigned" => ltrim($match[3] . $match[4]),
-				"default" => ($generated
+				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? $row["Default"] : null),
-					? ($maria ? $generation : stripslashes($generation))
+				"null" => ($row["Null"] == "YES"),
-					: ($default != "" || preg_match("~char|set~", $match[1]) ? $default : null)
+				"auto_increment" => ($row["Extra"] == "auto_increment"),
-				),
+				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
-				"null" => ($row["IS_NULLABLE"] == "YES"),
+				"collation" => $row["Collation"],
-				"auto_increment" => ($extra == "auto_increment"),
+				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
-				"on_update" => (preg_match('~\bon update (\w+)~i', $extra, $match) ? $match[1] : ""), //! available since MySQL 5.1.23
+				"comment" => $row["Comment"],
-				"collation" => $row["COLLATION_NAME"],
+				"primary" => ($row["Key"] == "PRI"),
-				"privileges" => array_flip(explode(",", "$row[PRIVILEGES],where,order")),
+				// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
-				"comment" => $row["COLUMN_COMMENT"],
+				"generated" => preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $row["Extra"]),
-				"primary" => ($row["COLUMN_KEY"] == "PRI"),
-				"generated" => ($generated[1] == "PERSISTENT" ? "STORED" : $generated[1]),
 			);
 		}
 		return $return;
@@ -637,8 +564,8 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Get table indexes
 	* @param string
-	* @param string Db to use
+	* @param string Min_DB to use
-	* @return array [$key_name => ["type" => , "columns" => [], "lengths" => [], "descs" => []]]
+	* @return array array($key_name => array("type" => , "columns" => array(), "lengths" => array(), "descs" => array()))
 	*/
 	function indexes($table, $connection2 = null) {
 		$return = array();
@@ -654,25 +581,25 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Get foreign keys in table
 	* @param string
-	* @return array [$name => ["db" => , "ns" => , "table" => , "source" => [], "target" => [], "on_delete" => , "on_update" => ]]
+	* @return array array($name => array("db" => , "ns" => , "table" => , "source" => array(), "target" => array(), "on_delete" => , "on_update" => ))
 	*/
 	function foreign_keys($table) {
-		global $driver;
+		global $connection, $on_actions;
 		static $pattern = '(?:`(?:[^`]|``)+`|"(?:[^"]|"")+")';
 		$return = array();
-		$create_table = get_val("SHOW CREATE TABLE " . table($table), 1);
+		$create_table = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if ($create_table) {
-			preg_match_all("~CONSTRAINT ($pattern) FOREIGN KEY ?\\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE ($driver->onActions))?(?: ON UPDATE ($driver->onActions))?~", $create_table, $matches, PREG_SET_ORDER);
+			preg_match_all("~CONSTRAINT ($pattern) FOREIGN KEY ?\\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE ($on_actions))?(?: ON UPDATE ($on_actions))?~", $create_table, $matches, PREG_SET_ORDER);
 			foreach ($matches as $match) {
 				preg_match_all("~$pattern~", $match[2], $source);
 				preg_match_all("~$pattern~", $match[5], $target);
 				$return[idf_unescape($match[1])] = array(
 					"db" => idf_unescape($match[4] != "" ? $match[3] : $match[4]),
 					"table" => idf_unescape($match[4] != "" ? $match[4] : $match[3]),
-					"source" => array_map('Adminer\idf_unescape', $source[0]),
+					"source" => array_map('idf_unescape', $source[0]),
-					"target" => array_map('Adminer\idf_unescape', $target[0]),
+					"target" => array_map('idf_unescape', $target[0]),
-					"on_delete" => ($match[6] ?: "RESTRICT"),
+					"on_delete" => ($match[6] ? $match[6] : "RESTRICT"),
-					"on_update" => ($match[7] ?: "RESTRICT"),
+					"on_update" => ($match[7] ? $match[7] : "RESTRICT"),
 				);
 			}
 		}
@@ -681,10 +608,11 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Get view SELECT
 	* @param string
-	* @return array ["select" => ]
+	* @return array array("select" => )
 	*/
 	function view($name) {
-		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\s+AS\s+~isU', '', get_val("SHOW CREATE VIEW " . table($name), 1)));
+		global $connection;
+		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\s+AS\s+~isU', '', $connection->result("SHOW CREATE VIEW " . table($name), 1)));
 	}
 
 	/** Get sorted grouped list of collations
@@ -711,7 +639,7 @@ if (!defined('Adminer\DRIVER')) {
 	* @return bool
 	*/
 	function information_schema($db) {
-		return ($db == "information_schema")
+		return (min_version(5) && $db == "information_schema")
 			|| (min_version(5.5) && $db == "performance_schema");
 	}
 
@@ -737,7 +665,7 @@ if (!defined('Adminer\DRIVER')) {
 	* @return bool
 	*/
 	function drop_databases($databases) {
-		$return = apply_queries("DROP DATABASE", $databases, 'Adminer\idf_escape');
+		$return = apply_queries("DROP DATABASE", $databases, 'idf_escape');
 		restart_session();
 		set_session("dbs", null);
 		return $return;
@@ -751,17 +679,17 @@ if (!defined('Adminer\DRIVER')) {
 	function rename_database($name, $collation) {
 		$return = false;
 		if (create_database($name, $collation)) {
-			$tables = array();
+			//! move triggers
-			$views = array();
+			$rename = array();
 			foreach (tables_list() as $table => $type) {
-				if ($type == 'VIEW') {
+				$rename[] = table($table) . " TO " . idf_escape($name) . "." . table($table);
-					$views[] = $table;
-				} else {
-					$tables[] = $table;
 			}
+			$return = (!$rename || queries("RENAME TABLE " . implode(", ", $rename)));
+			if ($return) {
+				queries("DROP DATABASE " . idf_escape(DB));
 			}
-			$return = (!$tables && !$views) || move_tables($tables, $views, $name);
+			restart_session();
-			drop_databases($return ? array(DB) : array());
+			set_session("dbs", null);
 		}
 		return $return;
 	}
@@ -789,7 +717,7 @@ if (!defined('Adminer\DRIVER')) {
 	/** Run commands to create or alter table
 	* @param string "" to create
 	* @param string new name
-	* @param array of [$orig, $process_field, $after]
+	* @param array of array($orig, $process_field, $after)
 	* @param array of strings
 	* @param string
 	* @param string
@@ -799,20 +727,12 @@ if (!defined('Adminer\DRIVER')) {
 	* @return bool
 	*/
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
-		global $connection;
 		$alter = array();
 		foreach ($fields as $field) {
-			if ($field[1]) {
+			$alter[] = ($field[1]
-				$default = $field[1][3];
+				? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? $field[2] : "")
-				if (preg_match('~ GENERATED~', $default)) {
+				: "DROP " . idf_escape($field[0])
-					// swap default and null
+			);
-					$field[1][3] = (preg_match('~MariaDB~', $connection->server_info) ? "" : $field[1][2]); // MariaDB doesn't support NULL on virtual columns
-					$field[1][2] = $default;
-				}
-				$alter[] = ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? $field[2] : "");
-			} else {
-				$alter[] = "DROP " . idf_escape($field[0]);
-			}
 		}
 		$alter = array_merge($alter, $foreign);
 		$status = ($comment !== null ? " COMMENT=" . q($comment) : "")
@@ -834,7 +754,7 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Run commands to alter indexes
 	* @param string escaped table name
-	* @param array of ["index type", "name", ["column definition", ...]] or ["index type", "name", "DROP"]
+	* @param array of array("index type", "name", array("column definition", ...)) or array("index type", "name", "DROP")
 	* @return bool
 	*/
 	function alter_indexes($table, $alter) {
@@ -860,7 +780,7 @@ if (!defined('Adminer\DRIVER')) {
 	* @return bool
 	*/
 	function drop_views($views) {
-		return queries("DROP VIEW " . implode(", ", array_map('Adminer\table', $views)));
+		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
 	}
 
 	/** Drop tables
@@ -868,7 +788,7 @@ if (!defined('Adminer\DRIVER')) {
 	* @return bool
 	*/
 	function drop_tables($tables) {
-		return queries("DROP TABLE " . implode(", ", array_map('Adminer\table', $tables)));
+		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
 	}
 
 	/** Move tables to other schema
@@ -878,27 +798,12 @@ if (!defined('Adminer\DRIVER')) {
 	* @return bool
 	*/
 	function move_tables($tables, $views, $target) {
-		global $connection;
 		$rename = array();
-		foreach ($tables as $table) {
+		foreach (array_merge($tables, $views) as $table) { // views will report SQL error
 			$rename[] = table($table) . " TO " . idf_escape($target) . "." . table($table);
 		}
-		if (!$rename || queries("RENAME TABLE " . implode(", ", $rename))) {
+		return queries("RENAME TABLE " . implode(", ", $rename));
-			$definitions = array();
-			foreach ($views as $table) {
-				$definitions[table($table)] = view($table);
-			}
-			$connection->select_db($target);
-			$db = idf_escape(DB);
-			foreach ($definitions as $name => $view) {
-				if (!queries("CREATE VIEW $name AS " . str_replace(" $db.", " ", $view["select"])) || !queries("DROP VIEW $db.$name")) {
-					return false;
-				}
-			}
-			return true;
-		}
 		//! move triggers
-		return false;
 	}
 
 	/** Copy tables to other schema
@@ -911,8 +816,7 @@ if (!defined('Adminer\DRIVER')) {
 		queries("SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'");
 		foreach ($tables as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
-			if (
+			if (($_POST["overwrite"] && !queries("\nDROP TABLE IF EXISTS $name"))
-				($_POST["overwrite"] && !queries("\nDROP TABLE IF EXISTS $name"))
 				|| !queries("CREATE TABLE $name LIKE " . table($table))
 				|| !queries("INSERT INTO $name SELECT * FROM " . table($table))
 			) {
@@ -928,10 +832,8 @@ if (!defined('Adminer\DRIVER')) {
 		foreach ($views as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
 			$view = view($table);
-			if (
+			if (($_POST["overwrite"] && !queries("DROP VIEW IF EXISTS $name"))
-				($_POST["overwrite"] && !queries("DROP VIEW IF EXISTS $name"))
+				|| !queries("CREATE VIEW $name AS $view[select]")) { //! USE to avoid db.table
-				|| !queries("CREATE VIEW $name AS $view[select]") //! USE to avoid db.table
-			) {
 				return false;
 			}
 		}
@@ -940,7 +842,7 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Get information about trigger
 	* @param string trigger name
-	* @return array ["Trigger" => , "Timing" => , "Event" => , "Of" => , "Type" => , "Statement" => ]
+	* @return array array("Trigger" => , "Timing" => , "Event" => , "Of" => , "Type" => , "Statement" => )
 	*/
 	function trigger($name) {
 		if ($name == "") {
@@ -952,7 +854,7 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Get defined triggers
 	* @param string
-	* @return array [$name => [$timing, $event]]
+	* @return array array($name => array($timing, $event))
 	*/
 	function triggers($table) {
 		$return = array();
@@ -963,7 +865,7 @@ if (!defined('Adminer\DRIVER')) {
 	}
 
 	/** Get trigger options
-	* @return array ["Timing" => [], "Event" => [], "Type" => []]
+	* @return array ("Timing" => array(), "Event" => array(), "Type" => array())
 	*/
 	function trigger_options() {
 		return array(
@@ -976,15 +878,15 @@ if (!defined('Adminer\DRIVER')) {
 	/** Get information about stored routine
 	* @param string
 	* @param string "FUNCTION" or "PROCEDURE"
-	* @return array ["fields" => ["field" => , "type" => , "length" => , "unsigned" => , "inout" => , "collation" => ], "returns" => , "definition" => , "language" => ]
+	* @return array ("fields" => array("field" => , "type" => , "length" => , "unsigned" => , "inout" => , "collation" => ), "returns" => , "definition" => , "language" => )
 	*/
 	function routine($name, $type) {
-		global $driver;
+		global $connection, $enum_length, $inout, $types;
 		$aliases = array("bool", "boolean", "integer", "double precision", "real", "dec", "numeric", "fixed", "national char", "national varchar");
 		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)";
-		$type_pattern = "((" . implode("|", array_merge(array_keys($driver->types()), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]|$driver->enumLength)++)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?";
+		$type_pattern = "((" . implode("|", array_merge(array_keys($types), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]|$enum_length)++)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?";
-		$pattern = "$space*(" . ($type == "FUNCTION" ? "" : $driver->inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
+		$pattern = "$space*(" . ($type == "FUNCTION" ? "" : $inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
-		$create = get_val("SHOW CREATE $type " . idf_escape($name), 2);
+		$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
 		preg_match("~\\(((?:$pattern\\s*,?)*)\\)\\s*" . ($type == "FUNCTION" ? "RETURNS\\s+$type_pattern\\s+" : "") . "(.*)~is", $create, $match);
 		$fields = array();
 		preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
@@ -992,7 +894,7 @@ if (!defined('Adminer\DRIVER')) {
 			$fields[] = array(
 				"field" => str_replace("``", "`", $param[2]) . $param[3],
 				"type" => strtolower($param[5]),
-				"length" => preg_replace_callback("~$driver->enumLength~s", 'Adminer\normalize_enum', $param[6]),
+				"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
 				"unsigned" => strtolower(preg_replace('~\s+~', ' ', trim("$param[8] $param[7]"))),
 				"null" => 1,
 				"full_type" => $param[4],
@@ -1000,21 +902,22 @@ if (!defined('Adminer\DRIVER')) {
 				"collation" => strtolower($param[9]),
 			);
 		}
+		if ($type != "FUNCTION") {
+			return array("fields" => $fields, "definition" => $match[11]);
+		}
 		return array(
 			"fields" => $fields,
-			"comment" => get_val("SELECT ROUTINE_COMMENT FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = DATABASE() AND ROUTINE_NAME = " . q($name)),
-		) + ($type != "FUNCTION" ? array("definition" => $match[11]) : array(
 			"returns" => array("type" => $match[12], "length" => $match[13], "unsigned" => $match[15], "collation" => $match[16]),
 			"definition" => $match[17],
-			"language" => "SQL", // available in information_schema.ROUTINES.BODY_STYLE
+			"language" => "SQL", // available in information_schema.ROUTINES.PARAMETER_STYLE
-		));
+		);
 	}
 
 	/** Get list of routines
-	* @return array ["SPECIFIC_NAME" => , "ROUTINE_NAME" => , "ROUTINE_TYPE" => , "DTD_IDENTIFIER" => ]
+	* @return array ("SPECIFIC_NAME" => , "ROUTINE_NAME" => , "ROUTINE_TYPE" => , "DTD_IDENTIFIER" => )
 	*/
 	function routines() {
-		return get_rows("SELECT ROUTINE_NAME AS SPECIFIC_NAME, ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = DATABASE()");
+		return get_rows("SELECT ROUTINE_NAME AS SPECIFIC_NAME, ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
 	}
 
 	/** Get list of available routine languages
@@ -1037,16 +940,17 @@ if (!defined('Adminer\DRIVER')) {
 	* @return string
 	*/
 	function last_id() {
-		return get_val("SELECT LAST_INSERT_ID()"); // mysql_insert_id() truncates bigint
+		global $connection;
+		return $connection->result("SELECT LAST_INSERT_ID()"); // mysql_insert_id() truncates bigint
 	}
 
 	/** Explain select
-	* @param Db
+	* @param Min_DB
 	* @param string
-	* @return Result
+	* @return Min_Result
 	*/
 	function explain($connection, $query) {
-		return $connection->query("EXPLAIN " . (min_version(5.1) && !min_version(5.7) ? "PARTITIONS " : "") . $query);
+		return $connection->query("EXPLAIN " . (min_version(5.1) ? "PARTITIONS " : "") . $query);
 	}
 
 	/** Get approximate number of rows
@@ -1058,40 +962,35 @@ if (!defined('Adminer\DRIVER')) {
 		return ($where || $table_status["Engine"] != "InnoDB" ? null : $table_status["Rows"]);
 	}
 
-	/* Not used is MySQL but checked in compile.php:
 	/** Get user defined types
-	* @return array [$id => $name]
+	* @return array
+	*/
 	function types() {
 		return array();
 	}
 
-	/** Get values of user defined type
-	* @param int
-	* @return string
-	function type_values($id) {
-		return "";
-	}
-
 	/** Get existing schemas
 	* @return array
+	*/
 	function schemas() {
 		return array();
 	}
 
 	/** Get current schema
 	* @return string
+	*/
 	function get_schema() {
 		return "";
 	}
 
 	/** Set current schema
 	* @param string
-	* @param Db
+	* @param Min_DB
 	* @return bool
+	*/
 	function set_schema($schema, $connection2 = null) {
 		return true;
 	}
-	*/
 
 	/** Get SQL command to create table
 	* @param string
@@ -1100,7 +999,8 @@ if (!defined('Adminer\DRIVER')) {
 	* @return string
 	*/
 	function create_sql($table, $auto_increment, $style) {
-		$return = get_val("SHOW CREATE TABLE " . table($table), 1);
+		global $connection;
+		$return = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if (!$auto_increment) {
 			$return = preg_replace('~ AUTO_INCREMENT=\d+~', '', $return); //! skip comments
 		}
@@ -1136,21 +1036,21 @@ if (!defined('Adminer\DRIVER')) {
 	}
 
 	/** Get server variables
-	* @return array [$name => $value]
+	* @return array ($name => $value)
 	*/
 	function show_variables() {
 		return get_key_vals("SHOW VARIABLES");
 	}
 
 	/** Get process list
-	* @return array [$row]
+	* @return array ($row)
 	*/
 	function process_list() {
 		return get_rows("SHOW FULL PROCESSLIST");
 	}
 
 	/** Get status variables
-	* @return array [$name => $value]
+	* @return array ($name => $value)
 	*/
 	function show_status() {
 		return get_key_vals("SHOW STATUS");
@@ -1174,7 +1074,7 @@ if (!defined('Adminer\DRIVER')) {
 
 	/** Convert value in edit after applying functions back
 	* @param array one element from fields()
-	* @param string SQL expression
+	* @param string
 	* @return string
 	*/
 	function unconvert_field($field, $return) {
@@ -1182,42 +1082,63 @@ if (!defined('Adminer\DRIVER')) {
 			$return = "UNHEX($return)";
 		}
 		if ($field["type"] == "bit") {
-			$return = "CONVERT(b$return, UNSIGNED)";
+			$return = "CONV($return, 2, 10) + 0";
 		}
 		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-			$prefix = (min_version(8) ? "ST_" : "");
+			$return = (min_version(8) ? "ST_" : "") . "GeomFromText($return, SRID($field[field]))";
-			$return = $prefix . "GeomFromText($return, $prefix" . "SRID($field[field]))";
 		}
 		return $return;
 	}
 
 	/** Check whether a feature is supported
-	* @param string "check", "comment", "copy", "database", "descidx", "drop_col", "dump", "event", "indexes", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
+	* @param string "comment", "copy", "database", "descidx", "drop_col", "dump", "event", "indexes", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
 	* @return bool
 	*/
 	function support($feature) {
-		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . (min_version(8) ? "" : "|descidx" . (min_version(5.1) ? "" : "|event|partitioning")) . (min_version('8.0.16', '10.2.1') ? "" : "|check") . "~", $feature);
+		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . (min_version(8) ? "" : "|descidx" . (min_version(5.1) ? "" : "|event|partitioning" . (min_version(5) ? "" : "|routine|trigger|view"))) . "~", $feature);
 	}
 
-	/** Kill a process
-	* @param int
-	* @return bool
-	*/
 	function kill_process($val) {
 		return queries("KILL " . number($val));
 	}
 
-	/** Return query to get connection ID
+	function connection_id(){
-	* @return string
-	*/
-	function connection_id() {
 		return "SELECT CONNECTION_ID()";
 	}
 
-	/** Get maximum number of connections
-	* @return int
-	*/
 	function max_connections() {
-		return get_val("SELECT @@max_connections");
+		global $connection;
+		return $connection->result("SELECT @@max_connections");
 	}
+
+	$jush = "sql"; ///< @var string JUSH identifier
+	$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
+	$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
+	foreach (array(
+		lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
+		lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
+		lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
+		lang('Lists') => array("enum" => 65535, "set" => 64),
+		lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
+		lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
+	) as $key => $val) {
+		$types += $val;
+		$structured_types[$key] = array_keys($val);
+	}
+	$unsigned = array("unsigned", "zerofill", "unsigned zerofill"); ///< @var array number variants
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"); ///< @var array operators used in select
+	$functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"); ///< @var array functions used in select
+	$grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"); ///< @var array grouping functions used in select
+	$edit_functions = array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
+		array(
+			"char" => "md5/sha1/password/encrypt/uuid",
+			"binary" => "md5/sha1",
+			"date|time" => "now",
+		), array(
+			number_type() => "+/-",
+			"date" => "+ interval/- interval",
+			"time" => "addtime/subtime",
+			"char|text" => "concat",
+		)
+	);
 }

adminer/drivers/oracle.inc.php

@@ -1,15 +1,12 @@
 <?php
-namespace Adminer;
-
 $drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
-	define('Adminer\DRIVER', "oracle");
+	$possible_drivers = array("OCI8", "PDO_OCI");
+	define("DRIVER", "oracle");
 	if (extension_loaded("oci8")) {
-		class Db {
+		class Min_DB {
-			public $extension = "oci8", $server_info, $affected_rows, $errno, $error;
+			var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $errno, $error;
-			public $_current_db;
-			private $link, $result;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -20,9 +17,9 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function connect($server, $username, $password) {
-				$this->link = @oci_new_connect($username, $password, $server, "AL32UTF8");
+				$this->_link = @oci_new_connect($username, $password, $server, "AL32UTF8");
-				if ($this->link) {
+				if ($this->_link) {
-					$this->server_info = oci_server_version($this->link);
+					$this->server_info = oci_server_version($this->_link);
 					return true;
 				}
 				$error = oci_error();
@@ -35,15 +32,14 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function select_db($database) {
-				$this->_current_db = $database;
 				return true;
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = oci_parse($this->link, $query);
+				$result = oci_parse($this->_link, $query);
 				$this->error = "";
 				if (!$result) {
-					$error = oci_error($this->link);
+					$error = oci_error($this->_link);
 					$this->errno = $error["code"];
 					$this->error = $error["message"];
 					return false;
@@ -53,41 +49,42 @@ if (isset($_GET["oracle"])) {
 				restore_error_handler();
 				if ($return) {
 					if (oci_num_fields($result)) {
-						return new Result($result);
+						return new Min_Result($result);
 					}
 					$this->affected_rows = oci_num_rows($result);
-					oci_free_statement($result);
 				}
 				return $return;
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			function next_result() {
 				return false;
 			}
 
-			function result($query, $field = 0) {
+			function result($query, $field = 1) {
 				$result = $this->query($query);
-				return (is_object($result) ? $result->fetch_column($field) : false);
+				if (!is_object($result) || !oci_fetch($result->_result)) {
+					return false;
+				}
+				return oci_result($result->_result, $field);
 			}
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows;
+			var $_result, $_offset = 1, $num_rows;
-			private $result, $offset = 1;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 			}
 
-			private function convert($row) {
+			function _convert($row) {
 				foreach ((array) $row as $key => $val) {
 					if (is_a($val, 'OCI-Lob')) {
 						$row[$key] = $val->load();
@@ -97,36 +94,31 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function fetch_assoc() {
-				return $this->convert(oci_fetch_assoc($this->result));
+				return $this->_convert(oci_fetch_assoc($this->_result));
 			}
 
 			function fetch_row() {
-				return $this->convert(oci_fetch_row($this->result));
+				return $this->_convert(oci_fetch_row($this->_result));
-			}
-
-			function fetch_column($field) {
-				return (oci_fetch($this->result) ? oci_result($this->result, $field + 1) : false);
 			}
 
 			function fetch_field() {
-				$column = $this->offset++;
+				$column = $this->_offset++;
-				$return = new \stdClass;
+				$return = new stdClass;
-				$return->name = oci_field_name($this->result, $column);
+				$return->name = oci_field_name($this->_result, $column);
 				$return->orgname = $return->name;
-				$return->type = oci_field_type($this->result, $column);
+				$return->type = oci_field_type($this->_result, $column);
 				$return->charsetnr = (preg_match("~raw|blob|bfile~", $return->type) ? 63 : 0); // 63 - binary
 				return $return;
 			}
 
 			function __destruct() {
-				oci_free_statement($this->result);
+				oci_free_statement($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_oci")) {
-		class Db extends PdoDb {
+		class Min_DB extends Min_PDO {
-			public $extension = "PDO_OCI";
+			var $extension = "PDO_OCI";
-			public $_current_db;
 
 			function connect($server, $username, $password) {
 				$this->dsn("oci:dbname=//$server;charset=AL32UTF8", $username, $password);
@@ -134,7 +126,6 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function select_db($database) {
-				$this->_current_db = $database;
 				return true;
 			}
 		}
@@ -143,34 +134,7 @@ if (isset($_GET["oracle"])) {
 
 
 
-	class Driver extends SqlDriver {
+	class Min_Driver extends Min_SQL {
-		static $possibleDrivers = array("OCI8", "PDO_OCI");
-		static $jush = "oracle";
-
-		public $editFunctions = array(
-			array( //! no parentheses
-				"date" => "current_date",
-				"timestamp" => "current_timestamp",
-			), array(
-				"number|float|double" => "+/-",
-				"date|timestamp" => "+ interval/- interval",
-				"char|clob" => "||",
-			)
-		);
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
-		public $functions = array("length", "lower", "round", "upper");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array(
-				lang('Numbers') => array("number" => 38, "binary_float" => 12, "binary_double" => 21),
-				lang('Date and time') => array("date" => 10, "timestamp" => 29, "interval year" => 12, "interval day" => 28), //! year(), day() to second()
-				lang('Strings') => array("char" => 2000, "varchar2" => 4000, "nchar" => 2000, "nvarchar2" => 4000, "clob" => 4294967295, "nclob" => 4294967295),
-				lang('Binary') => array("raw" => 2000, "long raw" => 2147483648, "blob" => 4294967295, "bfile" => 4294967296),
-			);
-		}
 
 		//! support empty $set in insert()
 
@@ -178,30 +142,6 @@ if (isset($_GET["oracle"])) {
 			return true; // automatic start
 		}
 
-		function insertUpdate($table, $rows, $primary) {
-			global $connection;
-			foreach ($rows as $set) {
-				$update = array();
-				$where = array();
-				foreach ($set as $key => $val) {
-					$update[] = "$key = $val";
-					if (isset($primary[idf_unescape($key)])) {
-						$where[] = "$key = $val";
-					}
-				}
-				if (
-					!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
-					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")"))
-				) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		function hasCStyleEscapes() {
-			return true;
-		}
 	}
 
 
@@ -214,8 +154,10 @@ if (isset($_GET["oracle"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
+	function connect() {
-		$connection = new Db;
+		global $adminer;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -223,13 +165,7 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function get_databases() {
-		return get_vals(
+		return get_vals("SELECT tablespace_name FROM user_tablespaces");
-			"SELECT DISTINCT tablespace_name FROM (
-SELECT tablespace_name FROM user_tablespaces
-UNION SELECT tablespace_name FROM all_tables WHERE tablespace_name IS NOT NULL
-)
-ORDER BY 1"
-		);
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -244,7 +180,8 @@ ORDER BY 1"
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("SELECT value FROM nls_database_parameters WHERE parameter = 'NLS_CHARACTERSET'"); //! respect $db
+		global $connection;
+		return $connection->result("SELECT value FROM nls_database_parameters WHERE parameter = 'NLS_CHARACTERSET'"); //! respect $db
 	}
 
 	function engines() {
@@ -252,57 +189,28 @@ ORDER BY 1"
 	}
 
 	function logged_user() {
-		return get_val("SELECT USER FROM DUAL");
-	}
-
-	function get_current_db() {
 		global $connection;
-		$db = $connection->_current_db ?: DB;
+		return $connection->result("SELECT USER FROM DUAL");
-		unset($connection->_current_db);
-		return $db;
-	}
-
-	function where_owner($prefix, $owner = "owner") {
-		if (!$_GET["ns"]) {
-			return '';
-		}
-		return "$prefix$owner = sys_context('USERENV', 'CURRENT_SCHEMA')";
-	}
-
-	function views_table($columns) {
-		$owner = where_owner('');
-		return "(SELECT $columns FROM all_views WHERE " . ($owner ?: "rownum < 0") . ")";
 	}
 
 	function tables_list() {
-		$view = views_table("view_name");
+		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "
-		$owner = where_owner(" AND ");
+UNION SELECT view_name, 'view' FROM user_views
-		return get_key_vals(
-			"SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "$owner
-UNION SELECT view_name, 'view' FROM $view
 ORDER BY 1"
 		); //! views don't have schema
 	}
 
 	function count_tables($databases) {
-		$return = array();
+		return array();
-		foreach ($databases as $db) {
-			$return[$db] = get_val("SELECT COUNT(*) FROM all_tables WHERE tablespace_name = " . q($db));
-		}
-		return $return;
 	}
 
 	function table_status($name = "") {
 		$return = array();
 		$search = q($name);
-		$db = get_current_db();
+		foreach (get_rows('SELECT table_name "Name", \'table\' "Engine", avg_row_len * num_rows "Data_length", num_rows "Rows" FROM all_tables WHERE tablespace_name = ' . q(DB) . ($name != "" ? " AND table_name = $search" : "") . "
-		$view = views_table("view_name");
+UNION SELECT view_name, 'view', 0, 0 FROM user_views" . ($name != "" ? " WHERE view_name = $search" : "") . "
-		$owner = where_owner(" AND ");
+ORDER BY 1"
-		foreach (
+		) as $row) {
-			get_rows('SELECT table_name "Name", \'table\' "Engine", avg_row_len * num_rows "Data_length", num_rows "Rows" FROM all_tables WHERE tablespace_name = ' . q($db) . $owner . ($name != "" ? " AND table_name = $search" : "") . "
-UNION SELECT view_name, 'view', 0, 0 FROM $view" . ($name != "" ? " WHERE view_name = $search" : "") . "
-ORDER BY 1") as $row
-		) {
 			if ($name != "") {
 				return $row;
 			}
@@ -321,12 +229,11 @@ ORDER BY 1") as $row
 
 	function fields($table) {
 		$return = array();
-		$owner = where_owner(" AND ");
+		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . " ORDER BY column_id") as $row) {
-		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . "$owner ORDER BY column_id") as $row) {
 			$type = $row["DATA_TYPE"];
 			$length = "$row[DATA_PRECISION],$row[DATA_SCALE]";
 			if ($length == ",") {
-				$length = $row["CHAR_COL_DECL_LENGTH"];
+				$length = $row["DATA_LENGTH"];
 			} //! int
 			$return[$row["COLUMN_NAME"]] = array(
 				"field" => $row["COLUMN_NAME"],
@@ -337,7 +244,7 @@ ORDER BY 1") as $row
 				"null" => ($row["NULLABLE"] == "Y"),
 				//! "auto_increment" => false,
 				//! "collation" => $row["CHARACTER_SET_NAME"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				//! "comment" => $row["Comment"],
 				//! "primary" => ($row["Key"] == "PRI"),
 			);
@@ -347,29 +254,22 @@ ORDER BY 1") as $row
 
 	function indexes($table, $connection2 = null) {
 		$return = array();
-		$owner = where_owner(" AND ", "aic.table_owner");
+		foreach (get_rows("SELECT uic.*, uc.constraint_type
-		foreach (
+FROM user_ind_columns uic
-			get_rows("SELECT aic.*, ac.constraint_type, atc.data_default
+LEFT JOIN user_constraints uc ON uic.index_name = uc.constraint_name AND uic.table_name = uc.table_name
-FROM all_ind_columns aic
+WHERE uic.table_name = " . q($table) . "
-LEFT JOIN all_constraints ac ON aic.index_name = ac.constraint_name AND aic.table_name = ac.table_name AND aic.index_owner = ac.owner
+ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
-LEFT JOIN all_tab_cols atc ON aic.column_name = atc.column_name AND aic.table_name = atc.table_name AND aic.index_owner = atc.owner
-WHERE aic.table_name = " . q($table) . "$owner
-ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row
-		) {
 			$index_name = $row["INDEX_NAME"];
-			$column_name = $row["DATA_DEFAULT"];
-			$column_name = ($column_name ? trim($column_name, '"') : $row["COLUMN_NAME"]); // trim - possibly wrapped in quotes but never contains quotes inside
 			$return[$index_name]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX"));
-			$return[$index_name]["columns"][] = $column_name;
+			$return[$index_name]["columns"][] = $row["COLUMN_NAME"];
 			$return[$index_name]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);
-			$return[$index_name]["descs"][] = ($row["DESCEND"] && $row["DESCEND"] == "DESC" ? '1' : null);
+			$return[$index_name]["descs"][] = ($row["DESCEND"] ? '1' : null);
 		}
 		return $return;
 	}
 
 	function view($name) {
-		$view = views_table("view_name, text");
+		$rows = get_rows('SELECT text "select" FROM user_views WHERE view_name = ' . q($name));
-		$rows = get_rows('SELECT text "select" FROM ' . $view . ' WHERE view_name = ' . q($name));
 		return reset($rows);
 	}
 
@@ -378,7 +278,7 @@ ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row
 	}
 
 	function information_schema($db) {
-		return get_schema() == "INFORMATION_SCHEMA";
+		return false;
 	}
 
 	function error() {
@@ -394,25 +294,13 @@ ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row
 	function found_rows($table_status, $where) {
 	}
 
-	function auto_increment() {
-		return "";
-	}
-
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = $drop = array();
-		$orig_fields = ($table ? fields($table) : array());
 		foreach ($fields as $field) {
 			$val = $field[1];
 			if ($val && $field[0] != "" && idf_escape($field[0]) != $val[0]) {
 				queries("ALTER TABLE " . table($table) . " RENAME COLUMN " . idf_escape($field[0]) . " TO $val[0]");
 			}
-			$orig_field = $orig_fields[$field[0]];
-			if ($val && $orig_field) {
-				$old = process_field($orig_field, $orig_field);
-				if ($val[2] == $old[2]) {
-					$val[2] = "";
-				}
-			}
 			if ($val) {
 				$alter[] = ($table != "" ? ($field[0] != "" ? "MODIFY (" : "ADD (") : "  ") . implode($val) . ($table != "" ? ")" : ""); //! error with name change only
 			} else {
@@ -428,35 +316,6 @@ ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row
 		;
 	}
 
-	function alter_indexes($table, $alter) {
-		$drop = array();
-		$queries = array();
-		foreach ($alter as $val) {
-			if ($val[0] != "INDEX") {
-				//! descending UNIQUE indexes results in syntax error
-				$val[2] = preg_replace('~ DESC$~', '', $val[2]);
-				$create = ($val[2] == "DROP"
-					? "\nDROP CONSTRAINT " . idf_escape($val[1])
-					: "\nADD" . ($val[1] != "" ? " CONSTRAINT " . idf_escape($val[1]) : "") . " $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . "(" . implode(", ", $val[2]) . ")"
-				);
-				array_unshift($queries, "ALTER TABLE " . table($table) . $create);
-			} elseif ($val[2] == "DROP") {
-				$drop[] = idf_escape($val[1]);
-			} else {
-				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " (" . implode(", ", $val[2]) . ")";
-			}
-		}
-		if ($drop) {
-			array_unshift($queries, "DROP INDEX " . implode(", ", $drop));
-		}
-		foreach ($queries as $query) {
-			if (!queries($query)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
 	function foreign_keys($table) {
 		$return = array();
 		$query = "SELECT c_list.CONSTRAINT_NAME as NAME,
@@ -500,12 +359,12 @@ AND c_src.TABLE_NAME = " . q($table);
 	}
 
 	function schemas() {
-		$return = get_vals("SELECT DISTINCT owner FROM dba_segments WHERE owner IN (SELECT username FROM dba_users WHERE default_tablespace NOT IN ('SYSTEM','SYSAUX')) ORDER BY 1");
+		return get_vals("SELECT DISTINCT owner FROM dba_segments WHERE owner IN (SELECT username FROM dba_users WHERE default_tablespace NOT IN ('SYSTEM','SYSAUX'))");
-		return ($return ?: get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
 	}
 
 	function get_schema() {
-		return get_val("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
+		global $connection;
+		return $connection->result("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
 	}
 
 	function set_schema($scheme, $connection2 = null) {
@@ -542,6 +401,33 @@ ORDER BY PROCESS
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view)$~', $feature); //!
+		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view|view_trigger)$~', $feature); //!
 	}
+
+	$jush = "oracle";
+	$types = array();
+	$structured_types = array();
+	foreach (array(
+		lang('Numbers') => array("number" => 38, "binary_float" => 12, "binary_double" => 21),
+		lang('Date and time') => array("date" => 10, "timestamp" => 29, "interval year" => 12, "interval day" => 28), //! year(), day() to second()
+		lang('Strings') => array("char" => 2000, "varchar2" => 4000, "nchar" => 2000, "nvarchar2" => 4000, "clob" => 4294967295, "nclob" => 4294967295),
+		lang('Binary') => array("raw" => 2000, "long raw" => 2147483648, "blob" => 4294967295, "bfile" => 4294967296),
+	) as $key => $val) {
+		$types += $val;
+		$structured_types[$key] = array_keys($val);
+	}
+	$unsigned = array();
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
+	$functions = array("length", "lower", "round", "upper");
+	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+	$edit_functions = array(
+		array( //! no parentheses
+			"date" => "current_date",
+			"timestamp" => "current_timestamp",
+		), array(
+			"number|float|double" => "+/-",
+			"date|timestamp" => "+ interval/- interval",
+			"char|clob" => "||",
+		)
+	);
 }

adminer/drivers/pgsql.inc.php

@@ -1,14 +1,12 @@
 <?php
-namespace Adminer;
-
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
-	define('Adminer\DRIVER', "pgsql");
+	$possible_drivers = array("PgSQL", "PDO_PgSQL");
+	define("DRIVER", "pgsql");
 	if (extension_loaded("pgsql")) {
-		class Db {
+		class Min_DB {
-			public $extension = "PgSQL", $server_info, $affected_rows, $error, $timeout;
+			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error, $timeout;
-			private $link, $result, $string, $database = true;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -22,65 +20,61 @@ if (isset($_GET["pgsql"])) {
 				global $adminer;
 				$db = $adminer->database();
 				set_error_handler(array($this, '_error'));
-				$this->string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
+				$this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
-				$ssl = $adminer->connectSsl();
+				$this->_link = @pg_connect("$this->_string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", PGSQL_CONNECT_FORCE_NEW);
-				if (isset($ssl["mode"])) {
+				if (!$this->_link && $db != "") {
-					$this->string .= " sslmode='" . $ssl["mode"] . "'";
-				}
-				$this->link = @pg_connect("$this->string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", PGSQL_CONNECT_FORCE_NEW);
-				if (!$this->link && $db != "") {
 					// try to connect directly with database for performance
-					$this->database = false;
+					$this->_database = false;
-					$this->link = @pg_connect("$this->string dbname='postgres'", PGSQL_CONNECT_FORCE_NEW);
+					$this->_link = @pg_connect("$this->_string dbname='postgres'", PGSQL_CONNECT_FORCE_NEW);
 				}
 				restore_error_handler();
-				if ($this->link) {
+				if ($this->_link) {
-					$version = pg_version($this->link);
+					$version = pg_version($this->_link);
 					$this->server_info = $version["server"];
-					pg_set_client_encoding($this->link, "UTF8");
+					pg_set_client_encoding($this->_link, "UTF8");
 				}
-				return (bool) $this->link;
+				return (bool) $this->_link;
 			}
 
 			function quote($string) {
-				return pg_escape_literal($this->link, $string);
+				return "'" . pg_escape_string($this->_link, $string) . "'";
 			}
 
 			function value($val, $field) {
-				return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
+				return ($field["type"] == "bytea" ? pg_unescape_bytea($val) : $val);
 			}
 
 			function quoteBinary($string) {
-				return "'" . pg_escape_bytea($this->link, $string) . "'";
+				return "'" . pg_escape_bytea($this->_link, $string) . "'";
 			}
 
 			function select_db($database) {
 				global $adminer;
 				if ($database == $adminer->database()) {
-					return $this->database;
+					return $this->_database;
 				}
-				$return = @pg_connect("$this->string dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
+				$return = @pg_connect("$this->_string dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
 				if ($return) {
-					$this->link = $return;
+					$this->_link = $return;
 				}
 				return $return;
 			}
 
 			function close() {
-				$this->link = @pg_connect("$this->string dbname='postgres'");
+				$this->_link = @pg_connect("$this->_string dbname='postgres'");
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = @pg_query($this->link, $query);
+				$result = @pg_query($this->_link, $query);
 				$this->error = "";
 				if (!$result) {
-					$this->error = pg_last_error($this->link);
+					$this->error = pg_last_error($this->_link);
 					$return = false;
 				} elseif (!pg_num_fields($result)) {
 					$this->affected_rows = pg_affected_rows($result);
 					$return = true;
 				} else {
-					$return = new Result($result);
+					$return = new Min_Result($result);
 				}
 				if ($this->timeout) {
 					$this->timeout = 0;
@@ -90,11 +84,11 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			function next_result() {
@@ -104,67 +98,61 @@ if (isset($_GET["pgsql"])) {
 
 			function result($query, $field = 0) {
 				$result = $this->query($query);
-				return ($result ? $result->fetch_column($field) : false);
+				if (!$result || !$result->num_rows) {
+					return false;
+				}
+				return pg_fetch_result($result->_result, 0, $field);
 			}
 
 			function warnings() {
-				return h(pg_last_notice($this->link)); // second parameter is available since PHP 7.1.0
+				return h(pg_last_notice($this->_link)); // second parameter is available since PHP 7.1.0
 			}
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows;
+			var $_result, $_offset = 0, $num_rows;
-			private $result, $offset = 0;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 				$this->num_rows = pg_num_rows($result);
 			}
 
 			function fetch_assoc() {
-				return pg_fetch_assoc($this->result);
+				return pg_fetch_assoc($this->_result);
 			}
 
 			function fetch_row() {
-				return pg_fetch_row($this->result);
+				return pg_fetch_row($this->_result);
-			}
-
-			function fetch_column($field) {
-				return ($this->num_rows ? pg_fetch_result($this->result, 0, $field) : false);
 			}
 
 			function fetch_field() {
-				$column = $this->offset++;
+				$column = $this->_offset++;
-				$return = new \stdClass;
+				$return = new stdClass;
 				if (function_exists('pg_field_table')) {
-					$return->orgtable = pg_field_table($this->result, $column);
+					$return->orgtable = pg_field_table($this->_result, $column);
 				}
-				$return->name = pg_field_name($this->result, $column);
+				$return->name = pg_field_name($this->_result, $column);
 				$return->orgname = $return->name;
-				$return->type = pg_field_type($this->result, $column);
+				$return->type = pg_field_type($this->_result, $column);
 				$return->charsetnr = ($return->type == "bytea" ? 63 : 0); // 63 - binary
 				return $return;
 			}
 
 			function __destruct() {
-				pg_free_result($this->result);
+				pg_free_result($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_pgsql")) {
-		class Db extends PdoDb {
+		class Min_DB extends Min_PDO {
-			public $extension = "PDO_PgSQL", $timeout;
+			var $extension = "PDO_PgSQL", $timeout;
 
 			function connect($server, $username, $password) {
 				global $adminer;
 				$db = $adminer->database();
-				//! client_encoding is supported since 9.1, but we can't yet use min_version here
+				$string = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' options='-c client_encoding=utf8'";
-				$dsn = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'";
+				$this->dsn("$string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password);
-				$ssl = $adminer->connectSsl();
+				//! connect without DB in case of an error
-				if (isset($ssl["mode"])) {
-					$dsn .= " sslmode='" . $ssl["mode"] . "'";
-				}
-				$this->dsn($dsn, $username, $password);
 				return true;
 			}
 
@@ -198,53 +186,7 @@ if (isset($_GET["pgsql"])) {
 
 
 
-	class Driver extends SqlDriver {
+	class Min_Driver extends Min_SQL {
-		static $possibleDrivers = array("PgSQL", "PDO_PgSQL");
-		static $jush = "pgsql";
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid CSRF
-		public $functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array( //! arrays
-				lang('Numbers') => array("smallint" => 5, "integer" => 10, "bigint" => 19, "boolean" => 1, "numeric" => 0, "real" => 7, "double precision" => 16, "money" => 20),
-				lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
-				lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
-				lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
-				lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "macaddr8" => 23, "txid_snapshot" => 0),
-				lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
-			);
-			if (min_version(9.2, 0, $connection)) {
-				$this->types[lang('Strings')]["json"] = 4294967295;
-				if (min_version(9.4, 0, $connection)) {
-					$this->types[lang('Strings')]["jsonb"] = 4294967295;
-				}
-			}
-			$this->editFunctions = array(
-				array(
-					"char" => "md5",
-					"date|time" => "now",
-				), array(
-					number_type() => "+/-",
-					"date|time" => "+ interval/- interval", //! escape
-					"char|text" => "||",
-				)
-			);
-			if (min_version(12, 0, $connection)) {
-				$this->generated = array("STORED");
-			}
-		}
-
-		function enumLength($field) {
-			$enum = $this->types[lang('User types')][$field["type"]];
-			return ($enum ? type_values($enum) : "");
-		}
-
-		function setUserTypes($types) {
-			$this->types[lang('User types')] = array_flip($types);
-		}
 
 		function insertUpdate($table, $rows, $primary) {
 			global $connection;
@@ -257,10 +199,9 @@ if (isset($_GET["pgsql"])) {
 						$where[] = "$key = $val";
 					}
 				}
-				if (
+				if (!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
-					!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
+					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")")
-					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")"))
+				)) {
-				) {
 					return false;
 				}
 			}
@@ -268,32 +209,32 @@ if (isset($_GET["pgsql"])) {
 		}
 
 		function slowQuery($query, $timeout) {
-			$this->conn->query("SET statement_timeout = " . (1000 * $timeout));
+			$this->_conn->query("SET statement_timeout = " . (1000 * $timeout));
-			$this->conn->timeout = 1000 * $timeout;
+			$this->_conn->timeout = 1000 * $timeout;
 			return $query;
 		}
 
 		function convertSearch($idf, $val, $field) {
-			$textTypes = "char|text";
+			return (preg_match('~char|text'
-			if (strpos($val["op"], "LIKE") === false) {
+					. (!preg_match('~LIKE~', $val["op"]) ? '|date|time(stamp)?|boolean|uuid|' . number_type() : '')
-				$textTypes .= "|date|time(stamp)?|boolean|uuid|inet|cidr|macaddr|" . number_type();
+					. '~', $field["type"])
-			}
+				? $idf
-
+				: "CAST($idf AS text)"
-			return (preg_match("~$textTypes~", $field["type"]) ? $idf : "CAST($idf AS text)");
+			);
 		}
 
 		function quoteBinary($s) {
-			return $this->conn->quoteBinary($s);
+			return $this->_conn->quoteBinary($s);
 		}
 
 		function warnings() {
-			return $this->conn->warnings();
+			return $this->_conn->warnings();
 		}
 
-		function tableHelp($name, $is_view = false) {
+		function tableHelp($name) {
 			$links = array(
 				"information_schema" => "infoschema",
-				"pg_catalog" => ($is_view ? "view" : "catalog"),
+				"pg_catalog" => "catalog",
 			);
 			$link = $links[$_GET["ns"]];
 			if ($link) {
@@ -301,18 +242,6 @@ if (isset($_GET["pgsql"])) {
 			}
 		}
 
-		function supportsIndex($table_status) {
-			// returns true for "materialized view"
-			return $table_status["Engine"] != "view";
-		}
-
-		function hasCStyleEscapes() {
-			static $c_style;
-			if ($c_style === null) {
-				$c_style = ($this->conn->result("SHOW standard_conforming_strings") == "off");
-			}
-			return $c_style;
-		}
 	}
 
 
@@ -325,11 +254,21 @@ if (isset($_GET["pgsql"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
+	function connect() {
-		$connection = new Db;
+		global $adminer, $types, $structured_types;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			if (min_version(9, 0, $connection)) {
 				$connection->query("SET application_name = 'Adminer'");
+				if (min_version(9.2, 0, $connection)) {
+					$structured_types[lang('Strings')][] = "json";
+					$types["json"] = 4294967295;
+					if (min_version(9.4, 0, $connection)) {
+						$structured_types[lang('Strings')][] = "jsonb";
+						$types["jsonb"] = 4294967295;
+					}
+				}
 			}
 			return $connection;
 		}
@@ -337,9 +276,7 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT datname FROM pg_database
+		return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
-WHERE datallowconn = TRUE AND has_database_privilege(datname, 'CONNECT')
-ORDER BY datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -349,12 +286,13 @@ ORDER BY datname");
 	function limit1($table, $query, $where, $separator = "\n") {
 		return (preg_match('~^INTO~', $query)
 			? limit($query, $where, 1, 0, $separator)
-			: " $query" . (is_view(table_status1($table)) ? $where : $separator . "WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)")
+			: " $query" . (is_view(table_status1($table)) ? $where : " WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)")
 		);
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("SELECT datcollate FROM pg_database WHERE datname = " . q($db));
+		global $connection;
+		return $connection->result("SHOW LC_COLLATE"); //! respect $db
 	}
 
 	function engines() {
@@ -362,12 +300,13 @@ ORDER BY datname");
 	}
 
 	function logged_user() {
-		return get_val("SELECT user");
+		global $connection;
+		return $connection->result("SELECT user");
 	}
 
 	function tables_list() {
 		$query = "SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema()";
-		if (support("materializedview")) {
+		if (support('materializedview')) {
 			$query .= "
 UNION ALL
 SELECT matviewname, 'MATERIALIZED VIEW'
@@ -380,38 +319,17 @@ ORDER BY 1";
 	}
 
 	function count_tables($databases) {
-		global $connection;
+		return array(); // would require reconnect
-		$return = array();
-		foreach ($databases as $db) {
-			if ($connection->select_db($db)) {
-				$return[$db] = count(tables_list());
-			}
-		}
-		return $return;
 	}
 
 	function table_status($name = "") {
-		static $has_size;
-		if ($has_size === null) {
-			// https://github.com/cockroachdb/cockroach/issues/40391
-			$has_size = get_val("SELECT 'pg_table_size'::regproc");
-		}
 		$return = array();
-		foreach (
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
-			get_rows("SELECT
-	c.relname AS \"Name\",
-	CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\"" . ($has_size ? ",
-	pg_table_size(c.oid) AS \"Data_length\",
-	pg_indexes_size(c.oid) AS \"Index_length\"" : "") . ",
-	obj_description(c.oid, 'pg_class') AS \"Comment\",
-	" . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\",
-	c.reltuples as \"Rows\",
-	n.nspname
 FROM pg_class c
 JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
-WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
+WHERE relkind IN ('r', 'm', 'v', 'f')
-" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")) as $row //! Index_length, Auto_increment
+" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
-		) {
+		) as $row) { //! Index_length, Auto_increment
 			$return[$row["Name"]] = $row;
 		}
 		return ($name != "" ? $return[$name] : $return);
@@ -431,8 +349,10 @@ WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
 			'timestamp without time zone' => 'timestamp',
 			'timestamp with time zone' => 'timestamptz',
 		);
-		foreach (
+
-			get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, pg_get_expr(d.adbin, d.adrelid) AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment" . (min_version(10) ? ", a.attidentity" . (min_version(12) ? ", a.attgenerated" : "") : "") . "
+		$identity_column = min_version(10) ? "(a.attidentity = 'd')::int" : '0';
+
+		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, pg_get_expr(d.adbin, d.adrelid) AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment, $identity_column AS identity
 FROM pg_class c
 JOIN pg_namespace n ON c.relnamespace = n.oid
 JOIN pg_attribute a ON c.oid = a.attrelid
@@ -441,8 +361,8 @@ WHERE c.relname = " . q($table) . "
 AND n.nspname = current_schema()
 AND NOT a.attisdropped
 AND a.attnum > 0
-ORDER BY a.attnum") as $row
+ORDER BY a.attnum"
-		) {
+		) as $row) {
 			//! collation, primary
 			preg_match('~([^([]+)(\((.*)\))?([a-z ]+)?((\[[0-9]*])*)$~', $row["full_type"], $match);
 			list(, $type, $length, $row["length"], $addon, $array) = $match;
@@ -455,15 +375,14 @@ ORDER BY a.attnum") as $row
 				$row["type"] = $type;
 				$row["full_type"] = $row["type"] . $length . $addon . $array;
 			}
-			if (in_array($row['attidentity'], array('a', 'd'))) {
+			if ($row['identity']) {
-				$row['default'] = 'GENERATED ' . ($row['attidentity'] == 'd' ? 'BY DEFAULT' : 'ALWAYS') . ' AS IDENTITY';
+				$row['default'] = 'GENERATED BY DEFAULT AS IDENTITY';
 			}
-			$row["generated"] = ($row["attgenerated"] == "s" ? "STORED" : "");
 			$row["null"] = !$row["attnotnull"];
-			$row["auto_increment"] = $row['attidentity'] || preg_match('~^nextval\(~i', $row["default"]);
+			$row["auto_increment"] = $row['identity'] || preg_match('~^nextval\(~i', $row["default"]);
-			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1);
+			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
-			if (preg_match('~(.+)::[^,)]+(.*)~', $row["default"], $match)) {
+			if (preg_match('~(.+)::[^)]+(.*)~', $row["default"], $match)) {
-				$row["default"] = ($match[1] == "NULL" ? null : idf_unescape($match[1]) . $match[2]);
+				$row["default"] = ($match[1] == "NULL" ? null : (($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2]));
 			}
 			$return[$row["field"]] = $row;
 		}
@@ -478,43 +397,39 @@ ORDER BY a.attnum") as $row
 		$return = array();
 		$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table));
 		$columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);
-		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid ORDER BY indisprimary DESC, indisunique DESC", $connection2) as $row) {
+		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption , (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
 			$relname = $row["relname"];
 			$return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
 			$return[$relname]["columns"] = array();
-			$return[$relname]["descs"] = array();
-			if ($row["indkey"]) {
 			foreach (explode(" ", $row["indkey"]) as $indkey) {
 				$return[$relname]["columns"][] = $columns[$indkey];
 			}
+			$return[$relname]["descs"] = array();
 			foreach (explode(" ", $row["indoption"]) as $indoption) {
 				$return[$relname]["descs"][] = ($indoption & 1 ? '1' : null); // 1 - INDOPTION_DESC
 			}
-			}
 			$return[$relname]["lengths"] = array();
 		}
 		return $return;
 	}
 
 	function foreign_keys($table) {
-		global $driver;
+		global $on_actions;
 		$return = array();
-		foreach (
+		foreach (get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
-			get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
 FROM pg_constraint
 WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS pn ON (pn.oid = pc.relnamespace) WHERE pc.relname = " . q($table) . " AND pn.nspname = current_schema())
 AND contype = 'f'::char
-ORDER BY conkey, conname") as $row
+ORDER BY conkey, conname") as $row) {
-		) {
 			if (preg_match('~FOREIGN KEY\s*\((.+)\)\s*REFERENCES (.+)\((.+)\)(.*)$~iA', $row['definition'], $match)) {
-				$row['source'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[1])));
+				$row['source'] = array_map('trim', explode(',', $match[1]));
 				if (preg_match('~^(("([^"]|"")+"|[^"]+)\.)?"?("([^"]|"")+"|[^"]+)$~', $match[2], $match2)) {
-					$row['ns'] = idf_unescape($match2[2]);
+					$row['ns'] = str_replace('""', '"', preg_replace('~^"(.+)"$~', '\1', $match2[2]));
-					$row['table'] = idf_unescape($match2[4]);
+					$row['table'] = str_replace('""', '"', preg_replace('~^"(.+)"$~', '\1', $match2[4]));
 				}
-				$row['target'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[3])));
+				$row['target'] = array_map('trim', explode(',', $match[3]));
-				$row['on_delete'] = (preg_match("~ON DELETE ($driver->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
-				$row['on_update'] = (preg_match("~ON UPDATE ($driver->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['on_update'] = (preg_match("~ON UPDATE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
 				$return[$row['conname']] = $row;
 			}
 		}
@@ -522,7 +437,8 @@ ORDER BY conkey, conname") as $row
 	}
 
 	function view($name) {
-		return array("select" => trim(get_val("SELECT pg_get_viewdef(" . get_val("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($name)) . ")")));
+		global $connection;
+		return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . $connection->result("SELECT oid FROM pg_class WHERE relname = " . q($name)) . ")")));
 	}
 
 	function collations() {
@@ -531,7 +447,7 @@ ORDER BY conkey, conname") as $row
 	}
 
 	function information_schema($db) {
-		return get_schema() == "information_schema";
+		return ($db == "information_schema");
 	}
 
 	function error() {
@@ -550,12 +466,11 @@ ORDER BY conkey, conname") as $row
 	function drop_databases($databases) {
 		global $connection;
 		$connection->close();
-		return apply_queries("DROP DATABASE", $databases, 'Adminer\idf_escape');
+		return apply_queries("DROP DATABASE", $databases, 'idf_escape');
 	}
 
 	function rename_database($name, $collation) {
-		global $connection;
+		//! current database cannot be renamed
-		$connection->close();
 		return queries("ALTER DATABASE " . idf_escape(DB) . " RENAME TO " . idf_escape($name));
 	}
 
@@ -569,7 +484,6 @@ ORDER BY conkey, conname") as $row
 		if ($table != "" && $table != $name) {
 			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
 		}
-		$sequence = "";
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -578,29 +492,21 @@ ORDER BY conkey, conname") as $row
 			} else {
 				$val5 = $val[5];
 				unset($val[5]);
+				if (isset($val[6]) && $field[0] == "") { // auto_increment
+					$val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial";
+				}
 				if ($field[0] == "") {
-					if (isset($val[6])) { // auto_increment
-						$val[1] = ($val[1] == " bigint" ? " big" : ($val[1] == " smallint" ? " small" : " ")) . "serial";
-					}
 					$alter[] = ($table != "" ? "ADD " : "  ") . implode($val);
-					if (isset($val[6])) {
-						$alter[] = ($table != "" ? "ADD" : " ") . " PRIMARY KEY ($val[0])";
-					}
 				} else {
 					if ($column != $val[0]) {
 						$queries[] = "ALTER TABLE " . table($name) . " RENAME $column TO $val[0]";
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
-					$sequence_name = $table . "_" . idf_unescape($val[0]) . "_seq";
+					if (!$val[6]) {
-					$alter[] = "ALTER $column " . ($val[3] ? "SET" . preg_replace('~GENERATED ALWAYS(.*) STORED~', 'EXPRESSION\1', $val[3])
+						$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]" : "DROP DEFAULT");
-						: (isset($val[6]) ? "SET DEFAULT nextval(" . q($sequence_name) . ")"
-						: "DROP DEFAULT" //! change to DROP EXPRESSION with generated columns
-					));
-					if (isset($val[6])) {
-						$sequence = "CREATE SEQUENCE IF NOT EXISTS " . idf_escape($sequence_name) . " OWNED BY " . idf_escape($table) . ".$val[0]";
-					}
 						$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
 					}
+				}
 				if ($field[0] != "" || $val5 != "") {
 					$queries[] = "COMMENT ON COLUMN " . table($name) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
 				}
@@ -612,15 +518,12 @@ ORDER BY conkey, conname") as $row
 		} elseif ($alter) {
 			array_unshift($queries, "ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter));
 		}
-		if ($sequence) {
+		if ($table != "" || $comment != "") {
-			array_unshift($queries, $sequence);
-		}
-		if ($comment !== null) {
 			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . q($comment);
 		}
-		// if ($auto_increment != "") {
+		if ($auto_increment != "") {
 			//! $queries[] = "SELECT setval(pg_get_serial_sequence(" . q($name) . ", ), $auto_increment)";
-		// }
+		}
 		foreach ($queries as $query) {
 			if (!queries($query)) {
 				return false;
@@ -661,7 +564,8 @@ ORDER BY conkey, conname") as $row
 	}
 
 	function truncate_tables($tables) {
-		return queries("TRUNCATE " . implode(", ", array_map('Adminer\table', $tables)));
+		return queries("TRUNCATE " . implode(", ", array_map('table', $tables)));
+		return true;
 	}
 
 	function drop_views($views) {
@@ -688,34 +592,21 @@ ORDER BY conkey, conname") as $row
 		return true;
 	}
 
-	function trigger($name, $table) {
+	function trigger($name, $table = null) {
 		if ($name == "") {
 			return array("Statement" => "EXECUTE PROCEDURE ()");
 		}
-		$columns = array();
+		if ($table === null) {
-		$where = "WHERE trigger_schema = current_schema() AND event_object_table = " . q($table) . " AND trigger_name = " . q($name);
+			$table = $_GET['trigger'];
-		foreach (get_rows("SELECT * FROM information_schema.triggered_update_columns $where") as $row) {
-			$columns[] = $row["event_object_column"];
 		}
-		$return = array();
+		$rows = get_rows('SELECT t.trigger_name AS "Trigger", t.action_timing AS "Timing", (SELECT STRING_AGG(event_manipulation, \' OR \') FROM information_schema.triggers WHERE event_object_table = t.event_object_table AND trigger_name = t.trigger_name ) AS "Events", t.event_manipulation AS "Event", \'FOR EACH \' || t.action_orientation AS "Type", t.action_statement AS "Statement" FROM information_schema.triggers t WHERE t.event_object_table = ' . q($table) . ' AND t.trigger_name = ' . q($name));
-		foreach (get_rows('SELECT trigger_name AS "Trigger", action_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers ' . "$where ORDER BY event_manipulation DESC") as $row) {
+		return reset($rows);
-			if ($columns && $row["Event"] == "UPDATE") {
-				$row["Event"] .= " OF";
-			}
-			$row["Of"] = implode(", ", $columns);
-			if ($return) {
-				$row["Event"] .= " OR $return[Event]";
-			}
-			$return = $row;
-		}
-		return $return;
 	}
 
 	function triggers($table) {
 		$return = array();
-		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE trigger_schema = current_schema() AND event_object_table = " . q($table)) as $row) {
+		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE event_object_table = " . q($table)) as $row) {
-			$trigger = trigger($row["trigger_name"], $table);
+			$return[$row["trigger_name"]] = array($row["action_timing"], $row["event_manipulation"]);
-			$return[$trigger["Trigger"]] = array($trigger["Timing"], $trigger["Event"]);
 		}
 		return $return;
 	}
@@ -723,7 +614,7 @@ ORDER BY conkey, conname") as $row
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),
-			"Event" => array("INSERT", "UPDATE", "UPDATE OF", "DELETE", "INSERT OR UPDATE", "INSERT OR UPDATE OF", "DELETE OR INSERT", "DELETE OR UPDATE", "DELETE OR UPDATE OF", "DELETE OR INSERT OR UPDATE", "DELETE OR INSERT OR UPDATE OF"),
+			"Event" => array("INSERT", "UPDATE", "DELETE"),
 			"Type" => array("FOR EACH ROW", "FOR EACH STATEMENT"),
 		);
 	}
@@ -769,15 +660,19 @@ ORDER BY SPECIFIC_NAME');
 	}
 
 	function found_rows($table_status, $where) {
-		if (preg_match("~ rows=([0-9]+)~", get_val("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")), $regs)) {
+		global $connection;
+		if (preg_match(
+			"~ rows=([0-9]+)~",
+			$connection->result("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")),
+			$regs
+		)) {
 			return $regs[1];
 		}
 		return false;
 	}
 
 	function types() {
-		return get_key_vals(
+		return get_vals("SELECT typname
-			"SELECT oid, typname
 FROM pg_type
 WHERE typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
 AND typtype IN ('b','d','e')
@@ -785,49 +680,33 @@ AND typelem = 0"
 		);
 	}
 
-	function type_values($id) {
-		// to get values from type string: unnest(enum_range(NULL::"$type"))
-		$enums = get_vals("SELECT enumlabel FROM pg_enum WHERE enumtypid = $id ORDER BY enumsortorder");
-		return ($enums ? "'" . implode("', '", array_map('addslashes', $enums)) . "'" : "");
-	}
-
 	function schemas() {
 		return get_vals("SELECT nspname FROM pg_namespace ORDER BY nspname");
 	}
 
 	function get_schema() {
-		return get_val("SELECT current_schema()");
+		global $connection;
+		return $connection->result("SELECT current_schema()");
 	}
 
 	function set_schema($schema, $connection2 = null) {
-		global $connection, $driver;
+		global $connection, $types, $structured_types;
 		if (!$connection2) {
 			$connection2 = $connection;
 		}
 		$return = $connection2->query("SET search_path TO " . idf_escape($schema));
-		$driver->setUserTypes(types()); //! get types from current_schemas('t')
+		foreach (types() as $type) { //! get types from current_schemas('t')
+			if (!isset($types[$type])) {
+				$types[$type] = 0;
+				$structured_types[lang('User types')][] = $type;
+			}
+		}
 		return $return;
 	}
 
-	// create_sql() produces CREATE TABLE without FK CONSTRAINTs
-	// foreign_keys_sql() produces all FK CONSTRAINTs as ALTER TABLE ... ADD CONSTRAINT
-	// so that all FKs can be added after all tables have been created, avoiding any need to reorder CREATE TABLE statements in order of their FK dependencies
-	function foreign_keys_sql($table) {
-		$return = "";
-
-		$status = table_status($table);
-		$fkeys = foreign_keys($table);
-		ksort($fkeys);
-
-		foreach ($fkeys as $fkey_name => $fkey) {
-			$return .= "ALTER TABLE ONLY " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " ADD CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE') . ";\n";
-		}
-
-		return ($return ? "$return\n" : $return);
-	}
-
 	function create_sql($table, $auto_increment, $style) {
-		global $driver;
+		global $connection;
+		$return = '';
 		$return_parts = array();
 		$sequences = array();
 
@@ -837,6 +716,10 @@ AND typelem = 0"
 			return rtrim("CREATE VIEW " . idf_escape($table) . " AS $view[select]", ";");
 		}
 		$fields = fields($table);
+		$indexes = indexes($table);
+		ksort($indexes);
+		$fkeys = foreign_keys($table);
+		ksort($fkeys);
 
 		if (!$status || empty($fields)) {
 			return false;
@@ -845,7 +728,7 @@ AND typelem = 0"
 		$return = "CREATE TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " (\n    ";
 
 		// fields' definitions
-		foreach ($fields as $field) {
+		foreach ($fields as $field_name => $field) {
 			$part = idf_escape($field['field']) . ' ' . $field['full_type']
 				. default_value($field)
 				. ($field['attnotnull'] ? " NOT NULL" : "");
@@ -854,15 +737,12 @@ AND typelem = 0"
 			// sequences for fields
 			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
 				$sequence_name = $matches[1];
-				$sq = reset(get_rows((min_version(10)
+				$sq = reset(get_rows(min_version(10)
-					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name))
+					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q($sequence_name)
 					: "SELECT * FROM $sequence_name"
-				), null, "-- "));
+				));
 				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE IF EXISTS $sequence_name;\n" : "")
-					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]"
+					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value] START " . ($auto_increment ? $sq['last_value'] : 1) . " CACHE $sq[cache_value];";
-					. ($auto_increment && $sq['last_value'] ? " START " . ($sq["last_value"] + 1) : "")
-					. " CACHE $sq[cache_value];"
-				;
 			}
 		}
 
@@ -871,21 +751,33 @@ AND typelem = 0"
 			$return = implode("\n\n", $sequences) . "\n\n$return";
 		}
 
-		$primary = "";
+		// primary + unique keys
-		foreach (indexes($table) as $index_name => $index) {
+		foreach ($indexes as $index_name => $index) {
-			if ($index['type'] == 'PRIMARY') {
+			switch($index['type']) {
-				$primary = $index_name;
+				case 'UNIQUE': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " UNIQUE (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
-				$return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('Adminer\idf_escape', $index['columns'])) . ")";
+				case 'PRIMARY': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
 			}
 		}
 
-		foreach ($driver->checkConstraints($table) as $conname => $consrc) {
+		// foreign keys
-			$return_parts[] = "CONSTRAINT " . idf_escape($conname) . " CHECK $consrc";
+		foreach ($fkeys as $fkey_name => $fkey) {
+			$return_parts[] = "CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
 		}
 
 		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
 
-		// comments for table & fields
+		// "basic" indexes after table definition
+		foreach ($indexes as $index_name => $index) {
+			if ($index['type'] == 'INDEX') {
+				$columns = array();
+				foreach ($index['columns'] as $key => $val) {
+					$columns[] = idf_escape($val) . ($index['descs'][$key] ? " DESC" : "");
+				}
+				$return .= "\n\nCREATE INDEX " . idf_escape($index_name) . " ON " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " USING btree (" . implode(', ', $columns) . ");";
+			}
+		}
+
+		// coments for table & fields
 		if ($status['Comment']) {
 			$return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
 		}
@@ -896,10 +788,6 @@ AND typelem = 0"
 			}
 		}
 
-		foreach (get_rows("SELECT indexdef FROM pg_catalog.pg_indexes WHERE schemaname = current_schema() AND tablename = " . q($table) . ($primary ? " AND indexname != " . q($primary) : ""), null, "-- ") as $row) {
-			$return .= "\n\n$row[indexdef];";
-		}
-
 		return rtrim($return, ';');
 	}
 
@@ -912,7 +800,7 @@ AND typelem = 0"
 		$return = "";
 		foreach (triggers($table) as $trg_id => $trg) {
 			$trigger = trigger($trg_id, $status['Name']);
-			$return .= "\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Event] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];;\n";
+			$return .= "\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Events] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];;\n";
 		}
 		return $return;
 	}
@@ -930,6 +818,9 @@ AND typelem = 0"
 		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
 
+	function show_status() {
+	}
+
 	function convert_field($field) {
 	}
 
@@ -938,18 +829,48 @@ AND typelem = 0"
 	}
 
 	function support($feature) {
-		return preg_match('~^(check|database|table|columns|sql|indexes|descidx|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
+		return preg_match('~^(database|table|columns|sql|indexes|descidx|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
 	}
 
 	function kill_process($val) {
 		return queries("SELECT pg_terminate_backend(" . number($val) . ")");
 	}
 
-	function connection_id() {
+	function connection_id(){
 		return "SELECT pg_backend_pid()";
 	}
 
 	function max_connections() {
-		return get_val("SHOW max_connections");
+		global $connection;
+		return $connection->result("SHOW max_connections");
 	}
+
+	$jush = "pgsql";
+	$types = array();
+	$structured_types = array();
+	foreach (array( //! arrays
+		lang('Numbers') => array("smallint" => 5, "integer" => 10, "bigint" => 19, "boolean" => 1, "numeric" => 0, "real" => 7, "double precision" => 16, "money" => 20),
+		lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
+		lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
+		lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
+		lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
+		lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
+	) as $key => $val) { //! can be retrieved from pg_type
+		$types += $val;
+		$structured_types[$key] = array_keys($val);
+	}
+	$unsigned = array();
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid CSRF
+	$functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
+	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+	$edit_functions = array(
+		array(
+			"char" => "md5",
+			"date|time" => "now",
+		), array(
+			number_type() => "+/-",
+			"date|time" => "+ interval/- interval", //! escape
+			"char|text" => "||",
+		)
+	);
 }

adminer/drivers/simpledb.inc.php

@@ -1,15 +1,13 @@
 <?php
-namespace Adminer;
+$drivers["simpledb"] = "SimpleDB";
-
-add_driver("simpledb", "SimpleDB");
 
 if (isset($_GET["simpledb"])) {
-	define('Adminer\DRIVER', "simpledb");
+	$possible_drivers = array("SimpleXML + allow_url_fopen");
+	define("DRIVER", "simpledb");
 
 	if (class_exists('SimpleXMLElement') && ini_bool('allow_url_fopen')) {
-		class Db {
+		class Min_DB {
-			public $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows;
+			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_result;
-			private $result;
 
 			function select_db($database) {
 				return ($database == "domain");
@@ -35,15 +33,15 @@ if (isset($_GET["simpledb"])) {
 						'Value' => $sum,
 					))));
 				}
-				return new Result($result);
+				return new Min_Result($result);
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			function next_result() {
@@ -53,11 +51,11 @@ if (isset($_GET["simpledb"])) {
 			function quote($string) {
 				return "'" . str_replace("'", "''", $string) . "'";
 			}
+
 		}
 
-		class Result {
+		class Min_Result {
-			public $num_rows;
+			var $num_rows, $_rows = array(), $_offset = 0;
-			private $rows = array(), $offset = 0;
 
 			function __construct($result) {
 				foreach ($result as $item) {
@@ -66,8 +64,8 @@ if (isset($_GET["simpledb"])) {
 						$row['itemName()'] = (string) $item->Name;
 					}
 					foreach ($item->Attribute as $attribute) {
-						$name = $this->processValue($attribute->Name);
+						$name = $this->_processValue($attribute->Name);
-						$value = $this->processValue($attribute->Value);
+						$value = $this->_processValue($attribute->Value);
 						if (isset($row[$name])) {
 							$row[$name] = (array) $row[$name];
 							$row[$name][] = $value;
@@ -75,30 +73,30 @@ if (isset($_GET["simpledb"])) {
 							$row[$name] = $value;
 						}
 					}
-					$this->rows[] = $row;
+					$this->_rows[] = $row;
 					foreach ($row as $key => $val) {
-						if (!isset($this->rows[0][$key])) {
+						if (!isset($this->_rows[0][$key])) {
-							$this->rows[0][$key] = null;
+							$this->_rows[0][$key] = null;
 						}
 					}
 				}
-				$this->num_rows = count($this->rows);
+				$this->num_rows = count($this->_rows);
 			}
 
-			private function processValue($element) {
+			function _processValue($element) {
 				return (is_object($element) && $element['encoding'] == 'base64' ? base64_decode($element) : (string) $element);
 			}
 
 			function fetch_assoc() {
-				$row = current($this->rows);
+				$row = current($this->_rows);
 				if (!$row) {
 					return $row;
 				}
 				$return = array();
-				foreach ($this->rows[0] as $key => $val) {
+				foreach ($this->_rows[0] as $key => $val) {
 					$return[$key] = $row[$key];
 				}
-				next($this->rows);
+				next($this->_rows);
 				return $return;
 			}
 
@@ -111,25 +109,20 @@ if (isset($_GET["simpledb"])) {
 			}
 
 			function fetch_field() {
-				$keys = array_keys($this->rows[0]);
+				$keys = array_keys($this->_rows[0]);
-				return (object) array('name' => $keys[$this->offset++]);
+				return (object) array('name' => $keys[$this->_offset++]);
-			}
-		}
 			}
 
+		}
+	}
 
 
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("SimpleXML + allow_url_fopen");
-		static $jush = "simpledb";
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "IS NOT NULL");
-		public $grouping = array("count");
 
+	class Min_Driver extends Min_SQL {
 		public $primary = "itemName()";
 
-		private function chunkRequest($ids, $action, $params, $expand = array()) {
+		function _chunkRequest($ids, $action, $params, $expand = array()) {
-			$connection = connection();
+			global $connection;
 			foreach (array_chunk($ids, 25) as $chunk) {
 				$params2 = $params;
 				foreach ($chunk as $i => $id) {
@@ -146,10 +139,10 @@ if (isset($_GET["simpledb"])) {
 			return true;
 		}
 
-		private function extractIds($table, $queryWhere, $limit) {
+		function _extractIds($table, $queryWhere, $limit) {
 			$return = array();
 			if (preg_match_all("~itemName\(\) = (('[^']*+')+)~", $queryWhere, $matches)) {
-				$return = array_map('Adminer\idf_unescape', $matches[1]);
+				$return = array_map('idf_unescape', $matches[1]);
 			} else {
 				foreach (sdb_request_all('Select', 'Item', array('SelectExpression' => 'SELECT itemName() FROM ' . table($table) . $queryWhere . ($limit ? " LIMIT 1" : ""))) as $item) {
 					$return[] = $item->Name;
@@ -159,7 +152,7 @@ if (isset($_GET["simpledb"])) {
 		}
 
 		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-			$connection = connection();
+			global $connection;
 			$connection->next = $_GET["next"];
 			$return = parent::select($table, $select, $where, $group, $order, $limit, $page, $print);
 			$connection->next = 0;
@@ -167,8 +160,8 @@ if (isset($_GET["simpledb"])) {
 		}
 
 		function delete($table, $queryWhere, $limit = 0) {
-			return $this->chunkRequest(
+			return $this->_chunkRequest(
-				$this->extractIds($table, $queryWhere, $limit),
+				$this->_extractIds($table, $queryWhere, $limit),
 				'BatchDeleteAttributes',
 				array('DomainName' => $table)
 			);
@@ -178,7 +171,7 @@ if (isset($_GET["simpledb"])) {
 			$delete = array();
 			$insert = array();
 			$i = 0;
-			$ids = $this->extractIds($table, $queryWhere, $limit);
+			$ids = $this->_extractIds($table, $queryWhere, $limit);
 			$id = idf_unescape($set["`itemName()`"]);
 			unset($set["`itemName()`"]);
 			foreach ($set as $key => $val) {
@@ -198,8 +191,8 @@ if (isset($_GET["simpledb"])) {
 				}
 			}
 			$params = array('DomainName' => $table);
-			return (!$insert || $this->chunkRequest(($id != "" ? array($id) : $ids), 'BatchPutAttributes', $params, $insert))
+			return (!$insert || $this->_chunkRequest(($id != "" ? array($id) : $ids), 'BatchPutAttributes', $params, $insert))
-				&& (!$delete || $this->chunkRequest($ids, 'BatchDeleteAttributes', $params, $delete))
+				&& (!$delete || $this->_chunkRequest($ids, 'BatchDeleteAttributes', $params, $delete))
 			;
 		}
 
@@ -246,22 +239,21 @@ if (isset($_GET["simpledb"])) {
 		}
 		
 		function slowQuery($query, $timeout) {
-			$this->conn->timeout = $timeout;
+			$this->_conn->timeout = $timeout;
 			return $query;
 		}
+
 	}
 
 
 
-	function connect($credentials) {
+	function connect() {
-		list($host, , $password) = $credentials;
+		global $adminer;
-		if (!preg_match('~^(https?://)?[-a-z\d.]+(:\d+)?$~', $host)) {
+		list(, , $password) = $adminer->credentials();
-			return lang('Invalid server.');
-		}
 		if ($password != "") {
 			return lang('Database does not support password.');
 		}
-		return new Db;
+		return new Min_DB;
 	}
 
 	function support($feature) {
@@ -269,7 +261,7 @@ if (isset($_GET["simpledb"])) {
 	}
 
 	function logged_user() {
-		$adminer = adminer();
+		global $adminer;
 		$credentials = $adminer->credentials();
 		return $credentials[1];
 	}
@@ -286,12 +278,12 @@ if (isset($_GET["simpledb"])) {
 	}
 
 	function tables_list() {
-		$connection = connection();
+		global $connection;
 		$return = array();
 		foreach (sdb_request_all('ListDomains', 'DomainName') as $table) {
 			$return[(string) $table] = 'table';
 		}
-		if ($connection->error && defined('Adminer\PAGE_HEADER')) {
+		if ($connection->error && defined("PAGE_HEADER")) {
 			echo "<p class='error'>" . error() . "\n";
 		}
 		return $return;
@@ -304,14 +296,12 @@ if (isset($_GET["simpledb"])) {
 			if (!$fast) {
 				$meta = sdb_request('DomainMetadata', array('DomainName' => $table));
 				if ($meta) {
-					foreach (
+					foreach (array(
-						array(
 						"Rows" => "ItemCount",
 						"Data_length" => "ItemNamesSizeBytes",
 						"Index_length" => "AttributeValuesSizeBytes",
 						"Data_free" => "AttributeNamesSizeBytes",
-						) as $key => $val
+					) as $key => $val) {
-					) {
 						$row[$key] = (string) $meta->$val;
 					}
 				}
@@ -328,13 +318,16 @@ if (isset($_GET["simpledb"])) {
 	}
 
 	function error() {
-		$connection = connection();
+		global $connection;
 		return h($connection->error);
 	}
 
 	function information_schema() {
 	}
 
+	function is_view($table_status) {
+	}
+
 	function indexes($table, $connection2 = null) {
 		return array(
 			array("type" => "PRIMARY", "columns" => array("itemName()")),
@@ -398,9 +391,24 @@ if (isset($_GET["simpledb"])) {
 	function last_id() {
 	}
 
+	function hmac($algo, $data, $key, $raw_output = false) {
+		// can use hash_hmac() since PHP 5.1.2
+		$blocksize = 64;
+		if (strlen($key) > $blocksize) {
+			$key = pack("H*", $algo($key));
+		}
+		$key = str_pad($key, $blocksize, "\0");
+		$k_ipad = $key ^ str_repeat("\x36", $blocksize);
+		$k_opad = $key ^ str_repeat("\x5C", $blocksize);
+		$return = $algo($k_opad . pack("H*", $algo($k_ipad . $data)));
+		if ($raw_output) {
+			$return = pack("H*", $return);
+		}
+		return $return;
+	}
+
 	function sdb_request($action, $params = array()) {
-		$adminer = adminer();
+		global $adminer, $connection;
-		$connection = connection();
 		list($host, $params['AWSAccessKeyId'], $secret) = $adminer->credentials();
 		$params['Action'] = $action;
 		$params['Timestamp'] = gmdate('Y-m-d\TH:i:s+00:00');
@@ -413,20 +421,18 @@ if (isset($_GET["simpledb"])) {
 			$query .= '&' . rawurlencode($key) . '=' . rawurlencode($val);
 		}
 		$query = str_replace('%7E', '~', substr($query, 1));
-		$query .= "&Signature=" . urlencode(base64_encode(hash_hmac('sha1', "POST\n" . preg_replace('~^https?://~', '', $host) . "\n/\n$query", $secret, true)));
+		$query .= "&Signature=" . urlencode(base64_encode(hmac('sha1', "POST\n" . preg_replace('~^https?://~', '', $host) . "\n/\n$query", $secret, true)));
+		@ini_set('track_errors', 1); // @ - may be disabled
 		$file = @file_get_contents((preg_match('~^https?://~', $host) ? $host : "http://$host"), false, stream_context_create(array('http' => array(
 			'method' => 'POST', // may not fit in URL with GET
 			'content' => $query,
-			'ignore_errors' => 1,
+			'ignore_errors' => 1, // available since PHP 5.2.10
-			'follow_location' => 0,
-			'max_redirects' => 0,
 		))));
 		if (!$file) {
-			$this->error = lang('Invalid credentials.');
+			$connection->error = $php_errormsg;
 			return false;
 		}
 		libxml_use_internal_errors(true);
-		libxml_disable_entity_loader();
 		$xml = simplexml_load_string($file);
 		if (!$xml) {
 			$error = libxml_get_last_error();
@@ -440,7 +446,7 @@ if (isset($_GET["simpledb"])) {
 		}
 		$connection->error = '';
 		$tag = $action . "Result";
-		return ($xml->$tag ?: true);
+		return ($xml->$tag ? $xml->$tag : true);
 	}
 
 	function sdb_request_all($action, $tag, $params = array(), $timeout = 0) {
@@ -469,4 +475,10 @@ if (isset($_GET["simpledb"])) {
 		} while ($xml->NextToken);
 		return $return;
 	}
+
+	$jush = "simpledb";
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "IS NOT NULL");
+	$functions = array();
+	$grouping = array("count");
+	$edit_functions = array(array("json"));
 }

adminer/drivers/sqlite.inc.php

@@ -1,45 +1,45 @@
 <?php
-namespace Adminer;
+$drivers["sqlite"] = "SQLite 3";
+$drivers["sqlite2"] = "SQLite 2";
 
-$drivers["sqlite"] = "SQLite";
+if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
+	$possible_drivers = array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite");
+	define("DRIVER", (isset($_GET["sqlite"]) ? "sqlite" : "sqlite2"));
+	if (class_exists(isset($_GET["sqlite"]) ? "SQLite3" : "SQLiteDatabase")) {
+		if (isset($_GET["sqlite"])) {
 
-if (isset($_GET["sqlite"])) {
+			class Min_SQLite {
-	define('Adminer\DRIVER', "sqlite");
+				var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
-	if (class_exists("SQLite3")) {
-
-		class SqliteDb {
-			public $extension = "SQLite3", $server_info, $affected_rows, $errno, $error;
-			private $link;
 
 				function __construct($filename) {
-				$this->link = new \SQLite3($filename);
+					$this->_link = new SQLite3($filename);
-				$version = $this->link->version();
+					$version = $this->_link->version();
 					$this->server_info = $version["versionString"];
 				}
 
 				function query($query) {
-				$result = @$this->link->query($query);
+					$result = @$this->_link->query($query);
 					$this->error = "";
 					if (!$result) {
-					$this->errno = $this->link->lastErrorCode();
+						$this->errno = $this->_link->lastErrorCode();
-					$this->error = $this->link->lastErrorMsg();
+						$this->error = $this->_link->lastErrorMsg();
 						return false;
 					} elseif ($result->numColumns()) {
-					return new Result($result);
+						return new Min_Result($result);
 					}
-				$this->affected_rows = $this->link->changes();
+					$this->affected_rows = $this->_link->changes();
 					return true;
 				}
 
 				function quote($string) {
 					return (is_utf8($string)
-					? "'" . $this->link->escapeString($string) . "'"
+						? "'" . $this->_link->escapeString($string) . "'"
 						: "x'" . reset(unpack('H*', $string)) . "'"
 					);
 				}
 
 				function store_result() {
-				return $this->result;
+					return $this->_result;
 				}
 
 				function result($query, $field = 0) {
@@ -47,59 +47,140 @@ if (isset($_GET["sqlite"])) {
 					if (!is_object($result)) {
 						return false;
 					}
-				$row = $result->fetch_row();
+					$row = $result->_result->fetchArray();
-				return $row ? $row[$field] : false;
+					return $row[$field];
 				}
 			}
 
-		class Result {
+			class Min_Result {
-			public $num_rows;
+				var $_result, $_offset = 0, $num_rows;
-			private $result, $offset = 0;
 
 				function __construct($result) {
-				$this->result = $result;
+					$this->_result = $result;
 				}
 
 				function fetch_assoc() {
-				return $this->result->fetchArray(SQLITE3_ASSOC);
+					return $this->_result->fetchArray(SQLITE3_ASSOC);
 				}
 
 				function fetch_row() {
-				return $this->result->fetchArray(SQLITE3_NUM);
+					return $this->_result->fetchArray(SQLITE3_NUM);
 				}
 
 				function fetch_field() {
-				$column = $this->offset++;
+					$column = $this->_offset++;
-				$type = $this->result->columnType($column);
+					$type = $this->_result->columnType($column);
 					return (object) array(
-					"name" => $this->result->columnName($column),
+						"name" => $this->_result->columnName($column),
 						"type" => $type,
 						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
 					);
 				}
 
 				function __desctruct() {
-				return $this->result->finalize();
+					return $this->_result->finalize();
 				}
 			}
 
+		} else {
+
+			class Min_SQLite {
+				var $extension = "SQLite", $server_info, $affected_rows, $error, $_link;
+
+				function __construct($filename) {
+					$this->server_info = sqlite_libversion();
+					$this->_link = new SQLiteDatabase($filename);
+				}
+
+				function query($query, $unbuffered = false) {
+					$method = ($unbuffered ? "unbufferedQuery" : "query");
+					$result = @$this->_link->$method($query, SQLITE_BOTH, $error);
+					$this->error = "";
+					if (!$result) {
+						$this->error = $error;
+						return false;
+					} elseif ($result === true) {
+						$this->affected_rows = $this->changes();
+						return true;
+					}
+					return new Min_Result($result);
+				}
+
+				function quote($string) {
+					return "'" . sqlite_escape_string($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->fetch();
+					return $row[$field];
+				}
+			}
+
+			class Min_Result {
+				var $_result, $_offset = 0, $num_rows;
+
+				function __construct($result) {
+					$this->_result = $result;
+					if (method_exists($result, 'numRows')) { // not available in unbuffered query
+						$this->num_rows = $result->numRows();
+					}
+				}
+
+				function fetch_assoc() {
+					$row = $this->_result->fetch(SQLITE_ASSOC);
+					if (!$row) {
+						return false;
+					}
+					$return = array();
+					foreach ($row as $key => $val) {
+						$return[($key[0] == '"' ? idf_unescape($key) : $key)] = $val;
+					}
+					return $return;
+				}
+
+				function fetch_row() {
+					return $this->_result->fetch(SQLITE_NUM);
+				}
+
+				function fetch_field() {
+					$name = $this->_result->fieldName($this->_offset++);
+					$pattern = '(\[.*]|"(?:[^"]|"")*"|(.+))';
+					if (preg_match("~^($pattern\\.)?$pattern\$~", $name, $match)) {
+						$table = ($match[3] != "" ? $match[3] : idf_unescape($match[2]));
+						$name = ($match[5] != "" ? $match[5] : idf_unescape($match[4]));
+					}
+					return (object) array(
+						"name" => $name,
+						"orgname" => $name,
+						"orgtable" => $table,
+					);
+				}
+
+			}
+
+		}
+
 	} elseif (extension_loaded("pdo_sqlite")) {
-		class SqliteDb extends PdoDb {
+		class Min_SQLite extends Min_PDO {
-			public $extension = "PDO_SQLite";
+			var $extension = "PDO_SQLite";
 
 			function __construct($filename) {
 				$this->dsn(DRIVER . ":$filename", "", "");
 			}
-
-			function select_db($db) {
-				return false;
-			}
 		}
 
 	}
 
-	if (class_exists('Adminer\SqliteDb')) {
+	if (class_exists("Min_SQLite")) {
-		class Db extends SqliteDb {
+		class Min_DB extends Min_SQLite {
 
 			function __construct() {
 				parent::__construct(":memory:");
@@ -110,14 +191,13 @@ if (isset($_GET["sqlite"])) {
 				if (is_readable($filename) && $this->query("ATTACH " . $this->quote(preg_match("~(^[/\\\\]|:)~", $filename) ? $filename : dirname($_SERVER["SCRIPT_FILENAME"]) . "/$filename") . " AS a")) { // is_readable - SQLite 3
 					parent::__construct($filename);
 					$this->query("PRAGMA foreign_keys = 1");
-					$this->query("PRAGMA busy_timeout = 500");
 					return true;
 				}
 				return false;
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function next_result() {
@@ -128,36 +208,7 @@ if (isset($_GET["sqlite"])) {
 
 
 
-	class Driver extends SqlDriver {
+	class Min_Driver extends Min_SQL {
-		static $possibleDrivers = array("SQLite3", "PDO_SQLite");
-		static $jush = "sqlite";
-
-		protected $types = array(array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0));
-
-		public $editFunctions = array(
-			array(
-				// "text" => "date('now')/time('now')/datetime('now')",
-			), array(
-				"integer|real|numeric" => "+/-",
-				// "text" => "date/time/datetime",
-				"text" => "||",
-			)
-		);
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
-		public $functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
-		public $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			if (min_version(3.31, 0, $connection)) {
-				$this->generated = array("STORED", "VIRTUAL");
-			}
-		}
-
-		function structuredTypes() {
-			return array_keys($this->types[0]);
-		}
 
 		function insertUpdate($table, $rows, $primary) {
 			$values = array();
@@ -167,7 +218,7 @@ if (isset($_GET["sqlite"])) {
 			return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys(reset($rows))) . ") VALUES\n" . implode(",\n", $values));
 		}
 
-		function tableHelp($name, $is_view = false) {
+		function tableHelp($name) {
 			if ($name == "sqlite_sequence") {
 				return "fileformat2.html#seqtab";
 			}
@@ -176,10 +227,6 @@ if (isset($_GET["sqlite"])) {
 			}
 		}
 
-		function checkConstraints($table) {
-			preg_match_all('~ CHECK *(\( *(((?>[^()]*[^() ])|(?1))*) *\))~', $this->conn->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table)), $matches); //! could be inside a comment
-			return array_combine($matches[2], $matches[2]);
-		}
 	}
 
 
@@ -192,12 +239,13 @@ if (isset($_GET["sqlite"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
+	function connect() {
-		list(, , $password) = $credentials;
+		global $adminer;
+		list(, , $password) = $adminer->credentials();
 		if ($password != "") {
 			return lang('Database does not support password.');
 		}
-		return new Db;
+		return new Min_DB;
 	}
 
 	function get_databases() {
@@ -209,14 +257,16 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function limit1($table, $query, $where, $separator = "\n") {
-		return (preg_match('~^INTO~', $query) || get_val("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
+		global $connection;
+		return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
 			? limit($query, $where, 1, 0, $separator)
 			: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)" //! use primary key in tables with WITHOUT rowid
 		);
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("PRAGMA encoding"); // there is no database list so $db == DB
+		global $connection;
+		return $connection->result("PRAGMA encoding"); // there is no database list so $db == DB
 	}
 
 	function engines() {
@@ -236,9 +286,10 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function table_status($name = "") {
+		global $connection;
 		$return = array();
 		foreach (get_rows("SELECT name AS Name, type AS Engine, 'rowid' AS Oid, '' AS Auto_increment FROM sqlite_master WHERE type IN ('table', 'view') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
-			$row["Rows"] = get_val("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
+			$row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
 			$return[$row["Name"]] = $row;
 		}
 		foreach (get_rows("SELECT * FROM sqlite_sequence", null, "") as $row) {
@@ -252,13 +303,15 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function fk_support($table_status) {
-		return !get_val("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
+		global $connection;
+		return !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
 	}
 
 	function fields($table) {
+		global $connection;
 		$return = array();
 		$primary = "";
-		foreach (get_rows("PRAGMA table_" . (min_version(3.31) ? "x" : "") . "info(" . table($table) . ")") as $row) {
+		foreach (get_rows("PRAGMA table_info(" . table($table) . ")") as $row) {
 			$name = $row["name"];
 			$type = strtolower($row["type"]);
 			$default = $row["dflt_value"];
@@ -266,9 +319,9 @@ if (isset($_GET["sqlite"])) {
 				"field" => $name,
 				"type" => (preg_match('~int~i', $type) ? "integer" : (preg_match('~char|clob|text~i', $type) ? "text" : (preg_match('~blob~i', $type) ? "blob" : (preg_match('~real|floa|doub~i', $type) ? "real" : "numeric")))),
 				"full_type" => $type,
-				"default" => (preg_match("~^'(.*)'$~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
+				"default" => (preg_match("~'(.*)'~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
 				"null" => !$row["notnull"],
-				"privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
 				"primary" => $row["pk"],
 			);
 			if ($row["pk"]) {
@@ -280,21 +333,14 @@ if (isset($_GET["sqlite"])) {
 				$primary = $name;
 			}
 		}
-		$sql = get_val("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
+		$sql = $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
-		$idf = '(("[^"]*+")+|[a-z0-9_]+)';
+		preg_match_all('~(("[^"]*+")+|[a-z0-9_]+)\s+text\s+COLLATE\s+(\'[^\']+\'|\S+)~i', $sql, $matches, PREG_SET_ORDER);
-		preg_match_all('~' . $idf . '\s+text\s+COLLATE\s+(\'[^\']+\'|\S+)~i', $sql, $matches, PREG_SET_ORDER);
 		foreach ($matches as $match) {
 			$name = str_replace('""', '"', preg_replace('~^"|"$~', '', $match[1]));
 			if ($return[$name]) {
 				$return[$name]["collation"] = trim($match[3], "'");
 			}
 		}
-		preg_match_all('~' . $idf . '\s.*GENERATED ALWAYS AS \((.+)\) (STORED|VIRTUAL)~i', $sql, $matches, PREG_SET_ORDER);
-		foreach ($matches as $match) {
-			$name = str_replace('""', '"', preg_replace('~^"|"$~', '', $match[1]));
-			$return[$name]["default"] = $match[3];
-			$return[$name]["generated"] = strtoupper($match[4]);
-		}
 		return $return;
 	}
 
@@ -349,6 +395,7 @@ if (isset($_GET["sqlite"])) {
 		$return = array();
 		foreach (get_rows("PRAGMA foreign_key_list(" . table($table) . ")") as $row) {
 			$foreign_key = &$return[$row["id"]];
+			//! idf_unescape in SQLite2
 			if (!$foreign_key) {
 				$foreign_key = $row;
 			}
@@ -359,7 +406,8 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function view($name) {
-		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\s+~iU', '', get_val("SELECT sql FROM sqlite_master WHERE type = 'view' AND name = " . q($name)))); //! identifiers may be inside []
+		global $connection;
+		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)))); //! identifiers may be inside []
 	}
 
 	function collations() {
@@ -396,7 +444,7 @@ if (isset($_GET["sqlite"])) {
 			return false;
 		}
 		try {
-			$link = new SqliteDb($db);
+			$link = new Min_SQLite($db);
 		} catch (Exception $ex) {
 			$connection->error = $ex->getMessage();
 			return false;
@@ -430,7 +478,7 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function auto_increment() {
-		return " PRIMARY KEY AUTOINCREMENT";
+		return " PRIMARY KEY" . (DRIVER == "sqlite" ? " AUTOINCREMENT" : "");
 	}
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
@@ -475,20 +523,8 @@ if (isset($_GET["sqlite"])) {
 		return true;
 	}
 
-	/** Recreate table
+	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment, $indexes = array()) {
-	* @param string original name
+		global $connection;
-	* @param string new name
-	* @param array [process_field()], empty to preserve
-	* @param array [$original => idf_escape($new_column)], empty to preserve
-	* @param string [format_foreign_key()], empty to preserve
-	* @param int set auto_increment to this value, 0 to preserve
-	* @param array [[$type, $name, $columns]], empty to preserve
-	* @param string CHECK constraint to drop
-	* @param string CHECK constraint to add
-	* @return bool
-	*/
-	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment = 0, $indexes = array(), $drop_check = "", $add_check = "") {
-		global $driver;
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
@@ -546,27 +582,16 @@ if (isset($_GET["sqlite"])) {
 			queries("BEGIN");
 		}
 		foreach ($fields as $key => $field) {
-			if (preg_match('~GENERATED~', $field[3])) {
-				unset($originals[array_search($field[0], $originals)]);
-			}
 			$fields[$key] = "  " . implode($field);
 		}
 		$fields = array_merge($fields, array_filter($foreign));
-		foreach ($driver->checkConstraints($table) as $check) {
-			if ($check != $drop_check) {
-				$fields[] = "  CHECK ($check)";
-			}
-		}
-		if ($add_check) {
-			$fields[] = "  CHECK ($add_check)";
-		}
 		$temp_name = ($table == $name ? "adminer_$name" : $name);
 		if (!queries("CREATE TABLE " . table($temp_name) . " (\n" . implode(",\n", $fields) . "\n)")) {
 			// implicit ROLLBACK to not overwrite $connection->error
 			return false;
 		}
 		if ($table != "") {
-			if ($originals && !queries("INSERT INTO " . table($temp_name) . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('Adminer\idf_escape', array_keys($originals))) . " FROM " . table($table))) {
+			if ($originals && !queries("INSERT INTO " . table($temp_name) . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
 				return false;
 			}
 			$triggers = array();
@@ -574,9 +599,8 @@ if (isset($_GET["sqlite"])) {
 				$trigger = trigger($trigger_name);
 				$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
 			}
-			$auto_increment = $auto_increment ? 0 : get_val("SELECT seq FROM sqlite_sequence WHERE name = " . q($table)); // if $auto_increment is set then it will be updated later
+			$auto_increment = $auto_increment ? 0 : $connection->result("SELECT seq FROM sqlite_sequence WHERE name = " . q($table)); // if $auto_increment is set then it will be updated later
-			if (
+			if (!queries("DROP TABLE " . table($table)) // drop before creating indexes and triggers to allow using old names
-				!queries("DROP TABLE " . table($table)) // drop before creating indexes and triggers to allow using old names
 				|| ($table == $name && !queries("ALTER TABLE " . table($temp_name) . " RENAME TO " . table($name)))
 				|| !alter_indexes($name, $indexes)
 			) {
@@ -610,11 +634,10 @@ if (isset($_GET["sqlite"])) {
 			}
 		}
 		foreach (array_reverse($alter) as $val) {
-			if (
+			if (!queries($val[2] == "DROP"
-				!queries($val[2] == "DROP"
 				? "DROP INDEX " . idf_escape($val[1])
-				: index_sql($table, $val[0], $val[1], "(" . implode(", ", $val[2]) . ")"))
+				: index_sql($table, $val[0], $val[1], "(" . implode(", ", $val[2]) . ")")
-			) {
+			)) {
 				return false;
 			}
 		}
@@ -638,6 +661,7 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function trigger($name) {
+		global $connection;
 		if ($name == "") {
 			return array("Statement" => "BEGIN\n\t;\nEND");
 		}
@@ -645,14 +669,14 @@ if (isset($_GET["sqlite"])) {
 		$trigger_options = trigger_options();
 		preg_match(
 			"~^CREATE\\s+TRIGGER\\s*$idf\\s*(" . implode("|", $trigger_options["Timing"]) . ")\\s+([a-z]+)(?:\\s+OF\\s+($idf))?\\s+ON\\s*$idf\\s*(?:FOR\\s+EACH\\s+ROW\\s)?(.*)~is",
-			get_val("SELECT sql FROM sqlite_master WHERE type = 'trigger' AND name = " . q($name)),
+			$connection->result("SELECT sql FROM sqlite_master WHERE type = 'trigger' AND name = " . q($name)),
 			$match
 		);
 		$of = $match[3];
 		return array(
 			"Timing" => strtoupper($match[1]),
 			"Event" => strtoupper($match[2]) . ($of ? " OF" : ""),
-			"Of" => idf_unescape($of),
+			"Of" => ($of[0] == '`' || $of[0] == '"' ? idf_unescape($of) : $of),
 			"Trigger" => $name,
 			"Statement" => $match[4],
 		);
@@ -681,7 +705,8 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function last_id() {
-		return get_val("SELECT LAST_INSERT_ROWID()");
+		global $connection;
+		return $connection->result("SELECT LAST_INSERT_ROWID()");
 	}
 
 	function explain($connection, $query) {
@@ -695,13 +720,26 @@ if (isset($_GET["sqlite"])) {
 		return array();
 	}
 
+	function schemas() {
+		return array();
+	}
+
+	function get_schema() {
+		return "";
+	}
+
+	function set_schema($scheme) {
+		return true;
+	}
+
 	function create_sql($table, $auto_increment, $style) {
-		$return = get_val("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
+		global $connection;
+		$return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
 		foreach (indexes($table) as $name => $index) {
 			if ($name == '') {
 				continue;
 			}
-			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('Adminer\idf_escape', $index['columns'])) . ")");
+			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('idf_escape', $index['columns'])) . ")");
 		}
 		return $return;
 	}
@@ -718,14 +756,10 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function show_variables() {
+		global $connection;
 		$return = array();
-		foreach (get_rows("PRAGMA pragma_list") as $row) {
+		foreach (array("auto_vacuum", "cache_size", "count_changes", "default_cache_size", "empty_result_callbacks", "encoding", "foreign_keys", "full_column_names", "fullfsync", "journal_mode", "journal_size_limit", "legacy_file_format", "locking_mode", "page_size", "max_page_count", "read_uncommitted", "recursive_triggers", "reverse_unordered_selects", "secure_delete", "short_column_names", "synchronous", "temp_store", "temp_store_directory", "schema_version", "integrity_check", "quick_check") as $key) {
-			$name = $row["name"];
+			$return[$key] = $connection->result("PRAGMA $key");
-			if ($name != "pragma_list" && $name != "compile_options") {
-				foreach (get_rows("PRAGMA $name") as $row) {
-					$return[$name] .= implode(", ", $row) . "\n";
-				}
-			}
 		}
 		return $return;
 	}
@@ -747,6 +781,23 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(check|columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
+		return preg_match('~^(columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
 	}
+
+	$jush = "sqlite";
+	$types = array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0);
+	$structured_types = array_keys($types);
+	$unsigned = array();
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
+	$functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
+	$grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
+	$edit_functions = array(
+		array(
+			// "text" => "date('now')/time('now')/datetime('now')",
+		), array(
+			"integer|real|numeric" => "+/-",
+			// "text" => "date/time/datetime",
+			"text" => "||",
+		)
+	);
 }

adminer/dump.inc.php

@@ -1,32 +1,28 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["dump"];
 
 if ($_POST && !$error) {
 	$cookie = "";
-	foreach (array("output", "format", "db_style", "types", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
+	foreach (array("output", "format", "db_style", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
 		$cookie .= "&$key=" . urlencode($_POST[$key]);
 	}
 	cookie("adminer_export", substr($cookie, 1));
 	$tables = array_flip((array) $_POST["tables"]) + array_flip((array) $_POST["data"]);
 	$ext = dump_headers(
 		(count($tables) == 1 ? key($tables) : DB),
-		(DB == "" || count($tables) > 1)
+		(DB == "" || count($tables) > 1));
-	);
 	$is_sql = preg_match('~sql~', $_POST["format"]);
 
 	if ($is_sql) {
-		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " " . str_replace("\n", " ", $connection->server_info) . " dump\n\n";
+		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump\n\n";
-		if (JUSH == "sql") {
+		if ($jush == "sql") {
 			echo "SET NAMES utf8;
 SET time_zone = '+00:00';
 SET foreign_key_checks = 0;
 " . ($_POST["data_style"] ? "SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 " : "") . "
 ";
-			$connection->query("SET time_zone = '+00:00'");
+			$connection->query("SET time_zone = '+00:00';");
-			$connection->query("SET sql_mode = ''");
 		}
 	}
 
@@ -42,7 +38,7 @@ SET foreign_key_checks = 0;
 	foreach ((array) $databases as $db) {
 		$adminer->dumpDatabase($db);
 		if ($connection->select_db($db)) {
-			if ($is_sql && preg_match('~CREATE~', $style) && ($create = get_val("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
+			if ($is_sql && preg_match('~CREATE~', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
 				set_utf8mb4($create);
 				if ($style == "DROP+CREATE") {
 					echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n";
@@ -55,37 +51,27 @@ SET foreign_key_checks = 0;
 				}
 				$out = "";
 
-				if ($_POST["types"]) {
-					foreach (types() as $id => $type) {
-						$enums = type_values($id);
-						if ($enums) {
-							$out .= ($style != 'DROP+CREATE' ? "DROP TYPE IF EXISTS " . idf_escape($type) . ";;\n" : "") . "CREATE TYPE " . idf_escape($type) . " AS ENUM ($enums);\n\n";
-						} else {
-							//! https://github.com/postgres/postgres/blob/REL_17_4/src/bin/pg_dump/pg_dump.c#L10846
-							$out .= "-- Could not export type $type\n\n";
-						}
-					}
-				}
-
 				if ($_POST["routines"]) {
-					foreach (routines() as $row) {
+					foreach (array("FUNCTION", "PROCEDURE") as $routine) {
-						$name = $row["ROUTINE_NAME"];
+						foreach (get_rows("SHOW $routine STATUS WHERE Db = " . q($db), null, "-- ") as $row) {
-						$routine = $row["ROUTINE_TYPE"];
+							$create = remove_definer($connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2));
-						$create = create_routine($routine, array("name" => $name) + routine($row["SPECIFIC_NAME"], $routine));
 							set_utf8mb4($create);
-						$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($name) . ";;\n" : "") . "$create;\n\n";
+							$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
+						}
 					}
 				}
 
 				if ($_POST["events"]) {
 					foreach (get_rows("SHOW EVENTS", null, "-- ") as $row) {
-						$create = remove_definer(get_val("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3));
+						$create = remove_definer($connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3));
 						set_utf8mb4($create);
 						$out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
 					}
 				}
 
-				echo ($out && JUSH == 'sql' ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : $out);
+				if ($out) {
+					echo "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n";
+				}
 			}
 
 			if ($_POST["table_style"] || $_POST["data_style"]) {
@@ -119,16 +105,6 @@ SET foreign_key_checks = 0;
 					}
 				}
 
-				// add FKs after creating tables (except in MySQL which uses SET FOREIGN_KEY_CHECKS=0)
-				if (function_exists('Adminer\foreign_keys_sql')) {
-					foreach (table_status('', true) as $name => $table_status) {
-						$table = (DB == "" || in_array($name, (array) $_POST["tables"]));
-						if ($table && !is_view($table_status)) {
-							echo foreign_keys_sql($name);
-						}
-					}
-				}
-
 				foreach ($views as $view) {
 					$adminer->dumpTable($view, $_POST["table_style"], 1);
 				}
@@ -140,7 +116,9 @@ SET foreign_key_checks = 0;
 		}
 	}
 
-	$adminer->dumpFooter();
+	if ($is_sql) {
+		echo "-- " . $connection->result("SELECT NOW()") . "\n";
+	}
 	exit;
 }
 
@@ -148,12 +126,12 @@ page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_
 ?>
 
 <form action="" method="post">
-<table class="layout">
+<table cellspacing="0" class="layout">
 <?php
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');
 $data_style = array('', 'TRUNCATE+INSERT', 'INSERT');
-if (JUSH == "sql") { //! use insertUpdate() in all drivers
+if ($jush == "sql") { //! use insertUpdate() in all drivers
 	$data_style[] = 'INSERT+UPDATE';
 }
 parse_str($_COOKIE["adminer_export"], $row);
@@ -165,12 +143,11 @@ if (!isset($row["events"])) { // backwards compatibility
 	$row["triggers"] = $row["table_style"];
 }
 
-echo "<tr><th>" . lang('Output') . "<td>" . html_radios("output", $adminer->dumpOutput(), $row["output"]) . "\n";
+echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
 
-echo "<tr><th>" . lang('Format') . "<td>" . html_radios("format", $adminer->dumpFormat(), $row["format"]) . "\n";
+echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
 
-echo (JUSH == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
+echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
-	. (support("type") ? checkbox("types", 1, $row["types"], lang('User types')) : "")
 	. (support("routine") ? checkbox("routines", 1, $row["routines"], lang('Routines')) : "")
 	. (support("event") ? checkbox("events", 1, $row["events"], lang('Events')) : "")
 );
@@ -186,7 +163,7 @@ echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style,
 <p><input type="submit" value="<?php echo lang('Export'); ?>">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 
-<table>
+<table cellspacing="0">
 <?php
 echo script("qsl('table').onclick = dumpClick;");
 $prefixes = array();

adminer/edit.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["edit"];
 $fields = fields($TABLE);
 $where = (isset($_GET["select"]) ? ($_POST["check"] && count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
@@ -68,7 +66,13 @@ if ($_POST["save"]) {
 	$select = array();
 	foreach ($fields as $name => $field) {
 		if (isset($field["privileges"]["select"])) {
-			$as = ($_POST["clone"] && $field["auto_increment"] ? "''" : convert_field($field));
+			$as = convert_field($field);
+			if ($_POST["clone"] && $field["auto_increment"]) {
+				$as = "''";
+			}
+			if ($jush == "sql" && preg_match("~enum|set~", $field["type"])) {
+				$as = "1*" . idf_escape($name);
+			}
 			$select[] = ($as ? "$as AS " : "") . idf_escape($name);
 		}
 	}

adminer/elastic.php

@@ -1,14 +0,0 @@
-<?php
-// To create Adminer just for Elasticsearch, run `../compile.php elastic`.
-
-function adminer_object() {
-	include_once "../plugins/plugin.php";
-	include_once "../plugins/login-password-less.php";
-	include_once "../plugins/drivers/elastic.php";
-	return new AdminerPlugin(array(
-			// TODO: inline the result of password_hash() so that the password is not visible in source codes
-			new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
-	));
-}
-
-include "./index.php";

adminer/event.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $EVENT = $_GET["event"];
 $intervals = array("YEAR", "QUARTER", "MONTH", "DAY", "HOUR", "MINUTE", "WEEK", "SECOND", "YEAR_MONTH", "DAY_HOUR", "DAY_MINUTE", "DAY_SECOND", "HOUR_MINUTE", "HOUR_SECOND", "MINUTE_SECOND");
 $statuses = array("ENABLED" => "ENABLE", "DISABLED" => "DISABLE", "SLAVESIDE_DISABLED" => "DISABLE ON SLAVE");
@@ -18,17 +16,13 @@ if ($_POST && !$error) {
 			) . " ON COMPLETION" . ($row["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
 		;
 		
-		queries_redirect(
+		queries_redirect(substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')), queries(($EVENT != ""
-			substr(ME, 0, -1),
+			? "ALTER EVENT " . idf_escape($EVENT) . $schedule
-			($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')),
+			. ($EVENT != $row["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($row["EVENT_NAME"]) : "")
-			queries(
-				($EVENT != ""
-				? "ALTER EVENT " . idf_escape($EVENT) . $schedule . ($EVENT != $row["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($row["EVENT_NAME"]) : "")
 			: "CREATE EVENT " . idf_escape($row["EVENT_NAME"]) . $schedule
 			) . "\n" . $statuses[$row["STATUS"]] . " COMMENT " . q($row["EVENT_COMMENT"])
 			. rtrim(" DO\n$row[EVENT_DEFINITION]", ";") . ";"
-			)
+		));
-		);
 	}
 }
 
@@ -41,7 +35,7 @@ if (!$row && $EVENT != "") {
 ?>
 
 <form action="" method="post">
-<table class="layout">
+<table cellspacing="0" class="layout">
 <tr><th><?php echo lang('Name'); ?><td><input name="EVENT_NAME" value="<?php echo h($row["EVENT_NAME"]); ?>" data-maxlength="64" autocapitalize="off">
 <tr><th title="datetime"><?php echo lang('Start'); ?><td><input name="STARTS" value="<?php echo h("$row[EXECUTE_AT]$row[STARTS]"); ?>">
 <tr><th title="datetime"><?php echo lang('End'); ?><td><input name="ENDS" value="<?php echo h($row["ENDS"]); ?>">
@@ -53,8 +47,6 @@ if (!$row && $EVENT != "") {
 <p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?>
+<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?><?php } ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?>
-<?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/file.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 // caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
@@ -14,34 +12,15 @@ if ($_GET["file"] == "favicon.ico") {
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;
+	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
-../externals/jush/modules/jush-textarea.js;
-../externals/jush/modules/jush-txt.js;
-../externals/jush/modules/jush-js.js;
-../externals/jush/modules/jush-sql.js;
-../externals/jush/modules/jush-pgsql.js;
-../externals/jush/modules/jush-sqlite.js;
-../externals/jush/modules/jush-mssql.js;
-../externals/jush/modules/jush-oracle.js;
-../externals/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {
-		case "plus.gif":
+		case "plus.gif": echo compile_file('../adminer/static/plus.gif'); break;
-			echo compile_file('../adminer/static/plus.gif');
+		case "cross.gif": echo compile_file('../adminer/static/cross.gif'); break;
-			break;
+		case "up.gif": echo compile_file('../adminer/static/up.gif'); break;
-		case "cross.gif":
+		case "down.gif": echo compile_file('../adminer/static/down.gif'); break;
-			echo compile_file('../adminer/static/cross.gif');
+		case "arrow.gif": echo compile_file('../adminer/static/arrow.gif'); break;
-			break;
-		case "up.gif":
-			echo compile_file('../adminer/static/up.gif');
-			break;
-		case "down.gif":
-			echo compile_file('../adminer/static/down.gif');
-			break;
-		case "arrow.gif":
-			echo compile_file('../adminer/static/arrow.gif');
-			break;
 	}
 }
 exit;

adminer/foreign.inc.php

@@ -1,11 +1,12 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["foreign"];
 $name = $_GET["name"];
 $row = $_POST;
 
 if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-js"]) {
+	$message = ($_POST["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
+	$location = ME . "table=" . urlencode($TABLE);
+	
 	if (!$_POST["drop"]) {
 		$row["source"] = array_filter($row["source"], 'strlen');
 		ksort($row["source"]); // enforce input order
@@ -16,23 +17,18 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
 		$row["target"] = $target;
 	}
 	
-	if (JUSH == "sqlite") {
+	if ($jush == "sqlite") {
-		$result = recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($row["drop"] ? "" : " " . format_foreign_key($row))));
+		queries_redirect($location, $message, recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($_POST["drop"] ? "" : " " . format_foreign_key($row)))));
 	} else {
 		$alter = "ALTER TABLE " . table($TABLE);
-		$result = ($name == "" || queries("$alter DROP " . (JUSH == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name)));
+		$drop = "\nDROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name);
-		if (!$row["drop"]) {
+		if ($_POST["drop"]) {
-			$result = queries("$alter ADD" . format_foreign_key($row));
+			query_redirect($alter . $drop, $location, $message);
+		} else {
+			query_redirect($alter . ($name != "" ? "$drop," : "") . "\nADD" . format_foreign_key($row), $location, $message);
+			$error = lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.') . "<br>$error"; //! no partitioning
 		}
 	}
-	queries_redirect(
-		ME . "table=" . urlencode($TABLE),
-		($row["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.'))),
-		$result
-	);
-	if (!$row["drop"]) {
-		$error = "$error<br>" . lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.'); //! no partitioning
-	}
 }
 
 page_header(lang('Foreign key'), $error, array("table" => $TABLE), h($TABLE));
@@ -61,22 +57,15 @@ if ($row["db"] != "") {
 	$connection->select_db($row["db"]);
 }
 if ($row["ns"] != "") {
-	$orig_schema = get_schema();
 	set_schema($row["ns"]);
 }
-$referencable = array_keys(array_filter(table_status('', true), 'Adminer\fk_support'));
+$referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
-$target = array_keys(fields(in_array($row["table"], $referencable) ? $row["table"] : reset($referencable)));
+$target = ($TABLE === $row["table"] ? $source : array_keys(fields(in_array($row["table"], $referencable) ? $row["table"] : reset($referencable))));
 $onchange = "this.form['change-js'].value = '1'; this.form.submit();";
 echo "<p>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "\n";
-if (support("scheme")) {
+if ($jush == "pgsql") {
-	$schemas = array_filter($adminer->schemas(), function ($schema) {
+	echo lang('Schema') . ": " . html_select("ns", $adminer->schemas(), $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
-		return !preg_match('~^information_schema$~i', $schema);
+} elseif ($jush != "sqlite") {
-	});
-	echo lang('Schema') . ": " . html_select("ns", $schemas, $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
-	if ($row["ns"] != "") {
-		set_schema($orig_schema);
-	}
-} elseif (JUSH != "sqlite") {
 	$dbs = array();
 	foreach ($adminer->databases() as $db) {
 		if (!information_schema($db)) {
@@ -88,33 +77,31 @@ if (support("scheme")) {
 ?>
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
-<table>
+<table cellspacing="0">
 <thead><tr><th id="label-source"><?php echo lang('Source'); ?><th id="label-target"><?php echo lang('Target'); ?></thead>
 <?php
 $j = 0;
 foreach ($row["source"] as $key => $val) {
 	echo "<tr>";
-	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow.call(this);" : ""), "label-source");
+	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow.call(this);" : 1), "label-source");
-	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], "", "label-target");
+	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], 1, "label-target");
 	$j++;
 }
 ?>
 </table>
 <p>
-<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", $driver->onActions), $row["on_delete"]); ?>
+<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", $on_actions), $row["on_delete"]); ?>
- <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $driver->onActions), $row["on_update"]); ?>
+ <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $on_actions), $row["on_update"]); ?>
 <?php echo doc_link(array(
 	'sql' => "innodb-foreign-key-constraints.html",
 	'mariadb' => "foreign-keys/",
 	'pgsql' => "sql-createtable.html#SQL-CREATETABLE-REFERENCES",
-	'mssql' => "t-sql/statements/create-table-transact-sql",
+	'mssql' => "ms174979.aspx",
-	'oracle' => "SQLRF01111",
+	'oracle' => "https://docs.oracle.com/cd/B19306_01/server.102/b14200/clauses002.htm#sthref2903",
 )); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
-<?php if ($name != "") { ?>
+<?php if ($name != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?><?php } ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
-<?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/include/adminer.inc.php

@@ -1,11 +1,9 @@
 <?php
-namespace Adminer;
-
 // any method change in this file should be transferred to editor/include/adminer.inc.php and plugins/plugin.php
 
 class Adminer {
 	/** @var array operators used in select, null for all operators */
-	public $operators;
+	var $operators;
 
 	/** Name in title and navigation
 	* @return string HTML code
@@ -15,14 +13,14 @@ class Adminer {
 	}
 
 	/** Connection parameters
-	* @return array [$server, $username, $password]
+	* @return array ($server, $username, $password)
 	*/
 	function credentials() {
 		return array(SERVER, $_GET["username"], get_password());
 	}
 
 	/** Get SSL connection options
-	* @return array ["key" => filename, "cert" => filename, "ca" => filename] or null
+	* @return array array("key" => filename, "cert" => filename, "ca" => filename) or null
 	*/
 	function connectSsl() {
 	}
@@ -120,12 +118,12 @@ class Adminer {
 	*/
 	function loginForm() {
 		global $drivers;
-		echo "<table class='layout'>\n";
+		echo "<table cellspacing='0' class='layout'>\n";
-		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);"));
+		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);") . "\n");
-		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">');
+		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">' . "\n");
-		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" autofocus value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("qs('#username').form['auth[driver]'].onchange();"));
+		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("focus(qs('#username')); qs('#username').form['auth[driver]'].onchange();"));
-		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">');
+		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">' . "\n");
-		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">');
+		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">' . "\n");
 		echo "</table>\n";
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
@@ -138,7 +136,7 @@ class Adminer {
 	* @return string
 	*/
 	function loginFormField($name, $heading, $value) {
-		return $heading . $value . "\n";
+		return $heading . $value;
 	}
 
 	/** Authorize the user
@@ -176,16 +174,14 @@ class Adminer {
 	* @return null
 	*/
 	function selectLinks($tableStatus, $set = "") {
-		global $driver;
+		global $jush, $driver;
 		echo '<p class="links">';
 		$links = array("select" => lang('Select data'));
 		if (support("table") || support("indexes")) {
 			$links["table"] = lang('Show structure');
 		}
-		$is_view = false;
 		if (support("table")) {
-			$is_view = is_view($tableStatus);
+			if (is_view($tableStatus)) {
-			if ($is_view) {
 				$links["view"] = lang('Alter view');
 			} else {
 				$links["create"] = lang('Alter table');
@@ -198,7 +194,7 @@ class Adminer {
 		foreach ($links as $key => $val) {
 			echo " <a href='" . h(ME) . "$key=" . urlencode($name) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
 		}
-		echo doc_link(array(JUSH => $driver->tableHelp($name, $is_view)), "?");
+		echo doc_link(array($jush => $driver->tableHelp($name)), "?");
 		echo "\n";
 	}
 
@@ -234,7 +230,7 @@ class Adminer {
 	* @return string
 	*/
 	function selectQuery($query, $start, $failed = false) {
-		global $driver;
+		global $jush, $driver;
 		$return = "</p>\n"; // required for IE9 inline edit
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
@@ -242,7 +238,7 @@ class Adminer {
 				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
 			;
 		}
-		return "<p><code class='jush-" . JUSH . "'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
+		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
 			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
 			. $return
 		;
@@ -252,7 +248,8 @@ class Adminer {
 	* @param string query to be executed
 	* @return string escaped query to be printed
 	*/
-	function sqlCommandQuery($query) {
+	function sqlCommandQuery($query)
+	{
 		return shorten_utf8(trim($query), 1000);
 	}
 
@@ -313,22 +310,15 @@ class Adminer {
 	* @return null
 	*/
 	function tableStructurePrint($fields) {
-		global $driver;
 		echo "<div class='scrollable'>\n";
-		echo "<table class='nowrap odds'>\n";
+		echo "<table cellspacing='0' class='nowrap'>\n";
 		echo "<thead><tr><th>" . lang('Column') . "<td>" . lang('Type') . (support("comment") ? "<td>" . lang('Comment') : "") . "</thead>\n";
-		$structured_types = $driver->structuredTypes();
 		foreach ($fields as $field) {
-			echo "<tr><th>" . h($field["field"]);
+			echo "<tr" . odd() . "><th>" . h($field["field"]);
-			$type = h($field["full_type"]);
+			echo "<td><span title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . "</span>";
-			echo "<td><span title='" . h($field["collation"]) . "'>"
-				. (in_array($type, (array) $structured_types[lang('User types')]) ? "<a href='" . h(ME . 'type=' . urlencode($type)) . "'>$type</a>" : $type)
-				. "</span>"
-			;
 			echo ($field["null"] ? " <i>NULL</i>" : "");
 			echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
-			$default = h($field["default"]);
+			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
-			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . ($field["generated"] ? "<code class='jush-" . JUSH . "'>$default</code>" : $default) . "</b>]</span>" : "");
 			echo (support("comment") ? "<td>" . h($field["comment"]) : "");
 			echo "\n";
 		}
@@ -341,7 +331,7 @@ class Adminer {
 	* @return null
 	*/
 	function tableIndexesPrint($indexes) {
-		echo "<table>\n";
+		echo "<table cellspacing='0'>\n";
 		foreach ($indexes as $name => $index) {
 			ksort($index["columns"]); // enforce correct columns order
 			$print = array();
@@ -362,7 +352,7 @@ class Adminer {
 	* @return null
 	*/
 	function selectColumnsPrint($select, $columns) {
-		global $driver;
+		global $functions, $grouping;
 		print_fieldset("select", lang('Select'), $select);
 		$i = 0;
 		$select[""] = array();
@@ -374,7 +364,8 @@ class Adminer {
 				$val["col"],
 				($key !== "" ? "selectFieldChange" : "selectAddRow")
 			);
-			echo "<div>" . ($driver->functions || $driver->grouping ? html_select("columns[$i][fun]", array(-1 => "") + array_filter(array(lang('Functions') => $driver->functions, lang('Aggregation') => $driver->grouping)), $val["fun"])
+			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
+				. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
 				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1)
 				. script("qsl('select').onchange = function () { helpClose();" . ($key !== "" ? "" : " qsl('select, input', this.parentNode).onchange();") . " };", "")
 				. "($column)" : $column) . "</div>\n";
@@ -393,7 +384,7 @@ class Adminer {
 		print_fieldset("search", lang('Search'), $where);
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT") {
-				echo "<div>(<i>" . implode("</i>, <i>", array_map('Adminer\h', $index["columns"])) . "</i>) AGAINST";
+				echo "<div>(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
 				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
 				echo script("qsl('input').oninput = selectFieldChange;", "");
 				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
@@ -515,16 +506,16 @@ class Adminer {
 	/** Process columns box in select
 	* @param array selectable columns
 	* @param array
-	* @return array [[select_expressions], [group_expressions]]
+	* @return array (array(select_expressions), array(group_expressions))
 	*/
 	function selectColumnsProcess($columns, $indexes) {
-		global $driver;
+		global $functions, $grouping;
 		$select = array(); // select expressions, empty for *
 		$group = array(); // expressions without aggregation - will be used for GROUP BY if an aggregation function is used
 		foreach ((array) $_GET["columns"] as $key => $val) {
-			if ($val["fun"] == "count" || ($val["col"] != "" && (!$val["fun"] || in_array($val["fun"], $driver->functions) || in_array($val["fun"], $driver->grouping)))) {
+			if ($val["fun"] == "count" || ($val["col"] != "" && (!$val["fun"] || in_array($val["fun"], $functions) || in_array($val["fun"], $grouping)))) {
 				$select[$key] = apply_sql_function($val["fun"], ($val["col"] != "" ? idf_escape($val["col"]) : "*"));
-				if (!in_array($val["fun"], $driver->grouping)) {
+				if (!in_array($val["fun"], $grouping)) {
 					$group[] = $select[$key];
 				}
 			}
@@ -542,7 +533,7 @@ class Adminer {
 		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
-				$return[] = "MATCH (" . implode(", ", array_map('Adminer\idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
+				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
 		foreach ((array) $_GET["where"] as $key => $val) {
@@ -570,11 +561,8 @@ class Adminer {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if (
+						if ((preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
-							isset($field["privileges"]["where"])
-							&& (preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
 							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
-							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
 						) {
 							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
 						}
@@ -646,7 +634,7 @@ class Adminer {
 	* @return string
 	*/
 	function messageQuery($query, $time, $failed = false) {
-		global $driver;
+		global $jush, $driver;
 		restart_session();
 		$history = &get_session("queries");
 		if (!$history[$_GET["db"]]) {
@@ -663,44 +651,33 @@ class Adminer {
 			$return = "<a href='#$id' class='toggle'>" . lang('Warnings') . "</a>, $return<div id='$id' class='hidden'>\n$warnings</div>\n";
 		}
 		return " <span class='time'>" . @date("H:i:s") . "</span>" // @ - time zone may be not set
-			. " $return<div id='$sql_id' class='hidden'><pre><code class='jush-" . JUSH . "'>" . shorten_utf8($query, 1000) . "</code></pre>"
+			. " $return<div id='$sql_id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . "</code></pre>"
 			. ($time ? " <span class='time'>($time)</span>" : '')
 			. (support("sql") ? '<p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a>' : '')
 			. '</div>'
 		;
 	}
 
-	/** Print before edit form
-	* @param string
-	* @param array
-	* @param mixed
-	* @param bool
-	* @return null
-	*/
-	function editRowPrint($table, $fields, $row, $update) {
-	}
-
 	/** Functions displayed in edit form
 	* @param array single field from fields()
 	* @return array
 	*/
 	function editFunctions($field) {
-		global $driver;
+		global $edit_functions;
 		$return = ($field["null"] ? "NULL/" : "");
-		$update = isset($_GET["select"]) || where($_GET);
+		foreach ($edit_functions as $key => $functions) {
-		foreach ($driver->editFunctions as $key => $functions) {
+			if (!$key || (!isset($_GET["call"]) && (isset($_GET["select"]) || where($_GET)))) { // relative functions
-			if (!$key || (!isset($_GET["call"]) && $update)) { // relative functions
 				foreach ($functions as $pattern => $val) {
 					if (!$pattern || preg_match("~$pattern~", $field["type"])) {
 						$return .= "/$val";
 					}
 				}
-			}
+				if ($key && !preg_match('~set|blob|bytea|raw|file~', $field["type"])) {
-			if ($key && !preg_match('~set|blob|bytea|raw|file|bool~', $field["type"])) {
 					$return .= "/SQL";
 				}
 			}
-		if ($field["auto_increment"] && !$update) {
+		}
+		if ($field["auto_increment"] && !isset($_GET["select"]) && !where($_GET)) {
 			$return = lang('Auto Increment');
 		}
 		return explode("/", $return);
@@ -717,7 +694,7 @@ class Adminer {
 		if ($field["type"] == "enum") {
 			return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
 				. ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value !== null || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
-				. enum_input("radio", $attrs, $field, $value, $value === 0 ? 0 : null) // 0 - empty value
+				. enum_input("radio", $attrs, $field, $value, 0) // 0 - empty
 			;
 		}
 		return "";
@@ -776,7 +753,7 @@ class Adminer {
 	* @return array empty to disable export
 	*/
 	function dumpFormat() {
-		return (support("dump") ? array('sql' => 'SQL') : array()) + array('csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
+		return array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
 	}
 
 	/** Export database structure
@@ -828,32 +805,20 @@ class Adminer {
 	* @return null prints data
 	*/
 	function dumpData($table, $style, $query) {
-		global $connection;
+		global $connection, $jush;
+		$max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
 		if ($style) {
-			$max_packet = (JUSH == "sqlite" ? 0 : 1048576); // default, minimum is 1024
-			$fields = array();
-			$identity_insert = false;
 			if ($_POST["format"] == "sql") {
 				if ($style == "TRUNCATE+INSERT") {
 					echo truncate_sql($table) . ";\n";
 				}
 				$fields = fields($table);
-				if (JUSH == "mssql") {
-					foreach ($fields as $field) {
-						if ($field["auto_increment"]) {
-							echo "SET IDENTITY_INSERT " . table($table) . " ON;\n";
-							$identity_insert = true;
-							break;
-						}
-					}
-				}
 			}
 			$result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
 			if ($result) {
 				$insert = "";
 				$buffer = "";
 				$keys = array();
-				$generated = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
 				while ($row = $result->$fetch_function()) {
@@ -861,10 +826,6 @@ class Adminer {
 						$values = array();
 						foreach ($row as $val) {
 							$field = $result->fetch_field();
-							if ($fields[$field->name]['generated']) {
-								$generated[$field->name] = true;
-								continue;
-							}
 							$keys[] = $field->name;
 							$key = idf_escape($field->name);
 							$values[] = "$key = VALUES($key)";
@@ -879,13 +840,9 @@ class Adminer {
 						dump_csv($row);
 					} else {
 						if (!$insert) {
-							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('Adminer\idf_escape', $keys)) . ") VALUES";
+							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
-							if ($generated[$key]) {
-								unset($row[$key]);
-								continue;
-							}
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
 								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
@@ -909,9 +866,6 @@ class Adminer {
 			} elseif ($_POST["format"] == "sql") {
 				echo "-- " . str_replace("\n", " ", $connection->error) . "\n";
 			}
-			if ($identity_insert) {
-				echo "SET IDENTITY_INSERT " . table($table) . " OFF;\n";
-			}
 		}
 	}
 
@@ -937,23 +891,11 @@ class Adminer {
 			($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
 		)));
 		if ($output == "gz") {
-			ob_start(function ($string) {
+			ob_start('ob_gzencode', 1e6);
-				// ob_start() callback receives an optional parameter $phase but gzencode() accepts optional parameter $level
-				return gzencode($string);
-			}, 1e6);
 		}
 		return $ext;
 	}
 
-	/** Print text after export
-	* @return null prints data
-	*/
-	function dumpFooter() {
-		if ($_POST["format"] == "sql") {
-			echo "-- " . gmdate("Y-m-d H:i:s e") . "\n";
-		}
-	}
-
 	/** Set the path of the file for webserver load
 	* @return string path of the sql dump file
 	*/
@@ -977,17 +919,13 @@ class Adminer {
 	* @return null
 	*/
 	function navigation($missing) {
-		global $VERSION, $drivers, $connection;
+		global $VERSION, $jush, $drivers, $connection;
 		?>
 <h1>
-<?php echo $this->name(); ?>
+<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
-<span class="version">
+<a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-<?php echo $VERSION; ?>
- <a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-</span>
 </h1>
 <?php
-		switch_lang();
 		if ($missing == "auth") {
 			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
@@ -1006,7 +944,6 @@ class Adminer {
 				echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
 			}
 		} else {
-			$tables = array();
 			if ($_GET["ns"] !== "" && !$missing && DB != "") {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
@@ -1016,7 +953,7 @@ class Adminer {
 			echo script_src("../externals/jush/modules/jush-txt.js");
 			echo script_src("../externals/jush/modules/jush-js.js");
 			if (support("sql")) {
-				echo script_src("../externals/jush/modules/jush-" . JUSH . ".js");
+				echo script_src("../externals/jush/modules/jush-$jush.js");
 				?>
 <script<?php echo nonce(); ?>>
 <?php
@@ -1025,9 +962,9 @@ class Adminer {
 					foreach ($tables as $table => $type) {
 						$links[] = preg_quote($table, '/');
 					}
-					echo "var jushLinks = { " . JUSH . ": [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+					echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
 					foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
-						echo "jushLinks.$val = jushLinks." . JUSH . ";\n";
+						echo "jushLinks.$val = jushLinks.$jush;\n";
 					}
 				}
 				$server_info = $connection->server_info;
@@ -1037,24 +974,18 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 <?php
 			}
 			$this->databasesPrint($missing);
-			$actions = array();
 			if (DB == "" || !$missing) {
-				if (support("sql")) {
+				echo "<p class='links'>" . (support("sql") ? "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>\n<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>\n" : "") . "";
-					$actions[] = "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>";
+				if (support("dump")) {
-					$actions[] = "<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>";
+					echo "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>\n";
 				}
-				$actions[] = "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>";
 			}
-			$in_db = $_GET["ns"] !== "" && !$missing && DB != "";
+			if ($_GET["ns"] !== "" && !$missing && DB != "") {
-			if ($in_db) {
+				echo '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
-				$actions[] = '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>";
+				if (!$tables) {
-			}
+					echo "<p class='message'>" . lang('No tables.') . "\n";
-			echo ($actions ? "<p class='links'>\n" . implode("\n", $actions) . "\n" : "");
-			if ($in_db) {
-				if ($tables) {
-					$this->tablesPrint($tables);
 				} else {
-					echo "<p class='message'>" . lang('No tables.') . "</p>\n";
+					$this->tablesPrint($tables);
 				}
 			}
 		}
@@ -1067,7 +998,7 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 	function databasesPrint($missing) {
 		global $adminer, $connection;
 		$databases = $this->databases();
-		if (DB && $databases && !in_array(DB, $databases)) {
+		if ($databases && !in_array(DB, $databases)) {
 			array_unshift($databases, DB);
 		}
 		?>
@@ -1076,14 +1007,14 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 <?php
 		hidden_fields_get();
 		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
-		echo "<span title='" . lang('Database') . "'>" . lang('DB') . "</span>: " . ($databases
+		echo "<span title='" . lang('database') . "'>" . lang('DB') . "</span>: " . ($databases
-			? html_select("db", array("" => "") + $databases, DB) . $db_events
+			? "<select name='db'>" . optionlist(array("" => "") + $databases, DB) . "</select>$db_events"
-			: "<input name='db' value='" . h(DB) . "' autocapitalize='off' size='19'>\n"
+			: "<input name='db' value='" . h(DB) . "' autocapitalize='off'>\n"
 		);
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
-		if (support("scheme")) {
 		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-				echo "<br>" . lang('Schema') . ": " . html_select("ns", array("" => "") + $adminer->schemas(), $_GET["ns"]) . $db_events;
+			if (support("scheme")) {
+				echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$db_events";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
@@ -1107,10 +1038,7 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 		foreach ($tables as $table => $status) {
 			$name = $this->tableName($status);
 			if ($name != "") {
-				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"'
+				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table, "select") . ">" . lang('select') . "</a> ";
-					. bold($_GET["select"] == $table || $_GET["edit"] == $table, "select")
-					. " title='" . lang('Select data') . "'>" . lang('select') . "</a> "
-				;
 				echo (support("table") || support("indexes")
 					? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
 						. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "structure"))
@@ -1121,4 +1049,10 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 		}
 		echo "</ul>\n";
 	}
+
+}
+
+$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
+if ($adminer->operators === null) {
+	$adminer->operators = $operators;
 }

adminer/include/auth.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $connection = '';
 
 $has_token = $_SESSION["token"];
@@ -43,7 +41,7 @@ function add_invalid_login() {
 function check_invalid_login() {
 	global $adminer;
 	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
-	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
+	$invalid = $invalids[$adminer->bruteForceKey()];
 	$next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
 	if ($next_attempt > 0) { //! do the same with permanent login
 		auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));
@@ -66,8 +64,7 @@ if ($auth) {
 		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($password, $private) : "");
 		cookie("adminer_permanent", implode(" ", $permanent));
 	}
-	if (
+	if (count($_POST) == 1 // 1 - auth
-		count($_POST) == 1 // 1 - auth
 		|| DRIVER != $vendor
 		|| SERVER != $server
 		|| $_GET["username"] !== $username // "0" == "00"
@@ -76,12 +73,18 @@ if ($auth) {
 		redirect(auth_url($vendor, $server, $username, $db));
 	}
 	
-} elseif ($_POST["logout"] && (!$has_token || verify_token())) {
+} elseif ($_POST["logout"]) {
+	if ($has_token && !verify_token()) {
+		page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
+		page_footer("db");
+		exit;
+	} else {
 		foreach (array("pwds", "db", "dbs", "queries") as $key) {
 			set_session($key, null);
 		}
 		unset_permanent();
 		redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.') . ' ' . lang('Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.'));
+	}
 	
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
@@ -122,7 +125,7 @@ function auth_error($error) {
 			$password = get_password();
 			if ($password !== null) {
 				if ($password === false) {
-					$error .= ($error ? '<br>' : '') . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
+					$error .= '<br>' . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
 				}
 				set_password(DRIVER, SERVER, $_GET["username"], null);
 			}
@@ -133,7 +136,7 @@ function auth_error($error) {
 		$error = lang('Session support must be enabled.');
 	}
 	$params = session_get_cookie_params();
-	cookie("adminer_key", ($_COOKIE["adminer_key"] ?: rand_string()), $params["lifetime"]);
+	cookie("adminer_key", ($_COOKIE["adminer_key"] ? $_COOKIE["adminer_key"] : rand_string()), $params["lifetime"]);
 	page_header(lang('Login'), $error, null);
 	echo "<form action='' method='post'>\n";
 	echo "<div>";
@@ -147,10 +150,10 @@ function auth_error($error) {
 	exit;
 }
 
-if (isset($_GET["username"]) && !class_exists('Adminer\Db')) {
+if (isset($_GET["username"]) && !class_exists("Min_DB")) {
 	unset($_SESSION["pwds"][DRIVER]);
 	unset_permanent();
-	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", Driver::$possibleDrivers)), false);
+	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
 	page_footer("auth");
 	exit;
 }
@@ -159,31 +162,20 @@ stop_session(true);
 
 if (isset($_GET["username"]) && is_string(get_password())) {
 	list($host, $port) = explode(":", SERVER, 2);
-	if (preg_match('~^\s*([-+]?\d+)~', $port, $match) && ($match[1] < 1024 || $match[1] > 65535)) { // is_numeric('80#') would still connect to port 80
+	if (is_numeric($port) && ($port < 1024 || $port > 65535)) {
 		auth_error(lang('Connecting to privileged ports is not allowed.'));
 	}
 	check_invalid_login();
-	$connection = connect($adminer->credentials());
+	$connection = connect();
-	if (is_object($connection)) {
+	$driver = new Min_Driver($connection);
-		$driver = new Driver($connection);
-		if ($adminer->operators === null) {
-			$adminer->operators = $driver->operators;
-		}
-	}
 }
 
 $login = null;
 if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
-	$error = (is_string($connection) ? nl_br(h($connection)) : (is_string($login) ? $login : lang('Invalid credentials.')));
+	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.')));
 	auth_error($error . (preg_match('~^ | $~', get_password()) ? '<br>' . lang('There is a space in the input password which might be the cause.') : ''));
 }
 
-if ($_POST["logout"] && $has_token && !verify_token()) {
-	page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
-	page_footer("db");
-	exit;
-}
-
 if ($auth && $_POST["token"]) {
 	$_POST["token"] = $token; // reset token after explicit login
 }

adminer/include/bootstrap.inc.php

@@ -1,8 +1,6 @@
 <?php
-namespace Adminer;
+error_reporting(6135); // errors and warnings
 
-include "../adminer/include/version.inc.php";
-include "../adminer/include/errors.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
@@ -35,7 +33,7 @@ if ($_GET["script"] == "version") {
 	exit;
 }
 
-global $adminer, $connection, $driver, $drivers, $error, $HTTPS, $LANG, $langs, $permanent, $has_token, $token, $translations, $VERSION; // allows including Adminer inside a function
+global $adminer, $connection, $driver, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $structured_types, $has_token, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
 
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];
@@ -52,13 +50,17 @@ $HTTPS = ($_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off")) || ini_bool
 if (!defined("SID")) {
 	session_cache_limiter(""); // to allow restarting session
 	session_name("adminer_sid"); // use specific session name to get own namespace
-	session_set_cookie_params(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS, true); // ini_set() may be disabled
+	$params = array(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
+	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+		$params[] = true; // HttpOnly
+	}
+	call_user_func_array('session_set_cookie_params', $params); // ini_set() may be disabled
 	session_start();
 }
 
 // disable magic quotes to be able to use database escaping function
 remove_slashes(array(&$_GET, &$_POST, &$_COOKIE), $filter);
-if (function_exists("get_magic_quotes_runtime") && get_magic_quotes_runtime()) {
+if (get_magic_quotes_runtime()) {
 	set_magic_quotes_runtime(false);
 }
 @set_time_limit(0); // @ - can be disabled
@@ -73,25 +75,28 @@ include "../adminer/drivers/sqlite.inc.php";
 include "../adminer/drivers/pgsql.inc.php";
 include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
+include "../adminer/drivers/firebird.inc.php";
+include "../adminer/drivers/simpledb.inc.php";
 include "../adminer/drivers/mongo.inc.php";
-include "./include/adminer.inc.php";
+include "../adminer/drivers/elastic.inc.php";
-$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
+include "../adminer/drivers/clickhouse.inc.php";
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
-define('Adminer\JUSH', Driver::$jush);
+define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
-define('Adminer\SERVER', $_GET[DRIVER]); // read from pgsql=localhost
+define("DB", $_GET["db"]); // for the sake of speed and size
-define('Adminer\DB', $_GET["db"]); // for the sake of speed and size
+define("ME", str_replace(":", "%3a", preg_replace('~^[^?]*/([^?]*).*~', '\1', $_SERVER["REQUEST_URI"])) . '?'
-define(
-	'Adminer\ME',
-	preg_replace('~\?.*~', '', relative_uri()) . '?'
 	. (sid() ? SID . '&' : '')
 	. (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
 	. (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')
 	. (DB != "" ? 'db=' . urlencode(DB) . '&' . (isset($_GET["ns"]) ? "ns=" . urlencode($_GET["ns"]) . "&" : "") : '')
 );
 
+include "../adminer/include/version.inc.php";
+include "./include/adminer.inc.php";
 include "../adminer/include/design.inc.php";
 include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
 include "./include/editing.inc.php";
 include "./include/connect.inc.php";
+
+$on_actions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()

adminer/include/connect.inc.php

@@ -1,18 +1,6 @@
 <?php
-namespace Adminer;
+function connect_error() {
-
+	global $adminer, $connection, $token, $error, $drivers;
-if (isset($_GET["status"])) {
-	$_GET["variables"] = $_GET["status"];
-}
-if (isset($_GET["import"])) {
-	$_GET["sql"] = $_GET["import"];
-}
-
-if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
-	if (DB != "" || $_GET["refresh"]) {
-		restart_session();
-		set_session("dbs", null);
-	}
 	if (DB != "") {
 		header("HTTP/1.1 404 Not Found");
 		page_header(lang('Database') . ": " . h(DB), lang('Invalid database.'), true);
@@ -23,15 +11,13 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 		
 		page_header(lang('Select database'), $error, false);
 		echo "<p class='links'>\n";
-		foreach (
+		foreach (array(
-			array(
 			'database' => lang('Create database'),
 			'privileges' => lang('Privileges'),
 			'processlist' => lang('Process list'),
 			'variables' => lang('Variables'),
 			'status' => lang('Status'),
-			) as $key => $val
+		) as $key => $val) {
-		) {
 			if (support($key)) {
 				echo "<a href='" . h(ME) . "$key='>$val</a>\n";
 			}
@@ -43,11 +29,11 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
-			echo "<table class='checkable odds'>\n";
+			echo "<table cellspacing='0' class='checkable'>\n";
 			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo "<thead><tr>"
 				. (support("database") ? "<td>" : "")
-				. "<th>" . lang('Database') . (get_session("dbs") !== null ? " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>" : "")
+				. "<th>" . lang('Database') . " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>"
 				. "<td>" . lang('Collation')
 				. "<td>" . lang('Tables')
 				. "<td>" . lang('Size') . " - <a href='" . h(ME) . "dbsize=1'>" . lang('Compute') . "</a>" . script("qsl('a').onclick = partial(ajaxSetHtml, '" . js_escape(ME) . "script=connect');", "")
@@ -59,7 +45,7 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
 				$id = h("Db-" . $db);
-				echo "<tr>" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
+				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
 				echo "<th><a href='$root' id='$id'>" . h($db) . "</a>";
 				$collation = h(db_collation($db, $collations));
 				echo "<td>" . (support("database") ? "<a href='$root" . ($scheme ? "&amp;ns=" : "") . "&amp;database=' title='" . lang('Alter database') . "'>$collation</a>" : $collation);
@@ -85,11 +71,25 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 	}
 	
 	page_footer("db");
+}
+
+if (isset($_GET["status"])) {
+	$_GET["variables"] = $_GET["status"];
+}
+if (isset($_GET["import"])) {
+	$_GET["sql"] = $_GET["import"];
+}
+
+if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
+	if (DB != "" || $_GET["refresh"]) {
+		restart_session();
+		set_session("dbs", null);
+	}
+	connect_error(); // separate function to catch SQLite error
 	exit;
 }
 
-if (support("scheme")) {
+if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
-	if (DB != "" && $_GET["ns"] !== "") {
 	if (!isset($_GET["ns"])) {
 		redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
 	}
@@ -99,5 +99,4 @@ if (support("scheme")) {
 		page_footer("ns");
 		exit;
 	}
-	}
 }

adminer/include/coverage.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 // coverage is used in tests and removed in compilation
 if (extension_loaded("xdebug") && file_exists(sys_get_temp_dir() . "/adminer_coverage.ser")) {
 	function save_coverage() {
@@ -16,5 +14,5 @@ if (extension_loaded("xdebug") && file_exists(sys_get_temp_dir() . "/adminer_cov
 		}
 	}
 	xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
-	register_shutdown_function('Adminer\save_coverage');
+	register_shutdown_function('save_coverage');
 }

adminer/include/design.inc.php

@@ -1,19 +1,13 @@
 <?php
-namespace Adminer;
-
-if (!ob_get_level()) {
-	ob_start(null, 4096);
-}
-
 /** Print HTML header
 * @param string used in title, breadcrumb and heading, should be HTML escaped
 * @param string
-* @param mixed ["key" => "link", "key2" => ["link", "desc"]], null for nothing, false for driver only, true for driver and server
+* @param mixed array("key" => "link", "key2" => array("link", "desc")), null for nothing, false for driver only, true for driver and server
 * @param string used after colon in title and heading, should be HTML escaped
 * @return null
 */
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-	global $LANG, $VERSION, $adminer, $drivers;
+	global $LANG, $VERSION, $adminer, $drivers, $jush;
 	page_headers();
 	if (is_ajax() && $error) {
 		page_messages($error);
@@ -26,7 +20,6 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex">
-<meta name="viewport" content="width=device-width">
 <title><?php echo $title_page; ?></title>
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
 <?php echo script_src("../adminer/static/functions.js"); ?>
@@ -68,32 +61,32 @@ var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 </script>
 
-<div id="help" class="jush-<?php echo JUSH; ?> jsonly hidden"></div>
+<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden"></div>
 <?php echo script("mixin(qs('#help'), {onmouseover: function () { helpOpen = 1; }, onmouseout: helpMouseout});"); ?>
 
 <div id="content">
 <?php
 	if ($breadcrumb !== null) {
 		$link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1);
-		echo '<p id="breadcrumb"><a href="' . h($link ?: ".") . '">' . $drivers[DRIVER] . '</a> » ';
+		echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
 		$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
 		$server = $adminer->serverName(SERVER);
 		$server = ($server != "" ? $server : lang('Server'));
 		if ($breadcrumb === false) {
 			echo "$server\n";
 		} else {
-			echo "<a href='" . h($link) . "' accesskey='1' title='Alt+Shift+1'>$server</a> » ";
+			echo "<a href='" . ($link ? h($link) : ".") . "' accesskey='1' title='Alt+Shift+1'>$server</a> &raquo; ";
 			if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
-				echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> » ';
+				echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> &raquo; ';
 			}
 			if (is_array($breadcrumb)) {
 				if ($_GET["ns"] != "") {
-					echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> » ';
+					echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> &raquo; ';
 				}
 				foreach ($breadcrumb as $key => $val) {
 					$desc = (is_array($val) ? $val[1] : h($val));
 					if ($desc != "") {
-						echo "<a href='" . h(ME . "$key=") . urlencode(is_array($val) ? $val[0] : $val) . "'>$desc</a> » ";
+						echo "<a href='" . h(ME . "$key=") . urlencode(is_array($val) ? $val[0] : $val) . "'>$desc</a> &raquo; ";
 					}
 				}
 			}
@@ -109,7 +102,7 @@ var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 		$databases = null;
 	}
 	stop_session();
-	define('Adminer\PAGE_HEADER', 1);
+	define("PAGE_HEADER", 1);
 }
 
 /** Send HTTP headers
@@ -185,19 +178,18 @@ function page_footer($missing = "") {
 	?>
 </div>
 
-<div id="menu">
+<?php switch_lang(); ?>
-<?php $adminer->navigation($missing); ?>
-</div>
-
 <?php if ($missing != "auth") { ?>
 <form action="" method="post">
 <p class="logout">
-<span><?php echo h($_GET["username"]) . "\n"; ?></span>
 <input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </p>
 </form>
 <?php } ?>
+<div id="menu">
+<?php $adminer->navigation($missing); ?>
+</div>
 <?php
 	echo script("setupSubmitHighlight(document);");
 }

adminer/include/driver.inc.php

@@ -1,69 +1,13 @@
 <?php
-namespace Adminer;
 
-$drivers = array();
+/*abstract*/ class Min_SQL {
-
+	var $_conn;
-/** Add a driver
-* @param string
-* @param string
-* @return null
-*/
-function add_driver($id, $name) {
-	global $drivers;
-	$drivers[$id] = $name;
-}
-
-/** Get driver name
-* @param string
-* @return string
-*/
-function get_driver($id) {
-	global $drivers;
-	return $drivers[$id];
-}
-
-abstract class SqlDriver {
-	static $possibleDrivers = array();
-	static $jush; ///< @var string JUSH identifier
-
-	protected $conn;
-	protected $types = array(); ///< @var array [$description => [$type => $maximum_unsigned_length, ...], ...]
-	public $editFunctions = array(); ///< @var array of ["$type|$type2" => "$function/$function2"] functions used in editing, [0] - edit and insert, [1] - edit only
-	public $unsigned = array(); ///< @var array number variants
-	public $operators = array(); ///< @var array operators used in select
-	public $functions = array(); ///< @var array functions used in select
-	public $grouping = array(); ///< @var array grouping functions used in select
-	public $onActions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()
-	public $inout = "IN|OUT|INOUT"; ///< @var string used in routines
-	public $enumLength = "'(?:''|[^'\\\\]|\\\\.)*'"; ///< @var string regular expression for parsing enum lengths
-	public $generated = array(); ///< @var array allowed types of generated columns
 	
 	/** Create object for performing database operations
-	* @param Db
+	* @param Min_DB
 	*/
 	function __construct($connection) {
-		$this->conn = $connection;
+		$this->_conn = $connection;
-	}
-
-	/** Get all types
-	* @return array [$type => $maximum_unsigned_length, ...]
-	*/
-	function types() {
-		return call_user_func_array('array_merge', array_values($this->types));
-	}
-
-	/** Get structured types
-	* @return array [$description => [$type, ...], ...]
-	*/
-	function structuredTypes() {
-		return array_map('array_keys', $this->types);
-	}
-
-	/** Get enum values
-	* @param array
-	* @return string or null
-	*/
-	function enumLength($field) {
 	}
 	
 	/** Select data from table
@@ -75,15 +19,15 @@ abstract class SqlDriver {
 	* @param int result of $adminer->selectLimitProcess()
 	* @param int index of page starting at zero
 	* @param bool whether to print the query
-	* @return Result
+	* @return Min_Result
 	*/
 	function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-		global $adminer;
+		global $adminer, $jush;
 		$is_group = (count($group) < count($select));
 		$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
 		if (!$query) {
 			$query = "SELECT" . limit(
-				($_GET["page"] != "last" && $limit != "" && $group && $is_group && JUSH == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
+				($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
 				($where ? "\nWHERE " . implode(" AND ", $where) : "") . ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : ""),
 				($limit != "" ? +$limit : null),
 				($page ? $limit * $page : 0),
@@ -91,7 +35,7 @@ abstract class SqlDriver {
 			);
 		}
 		$start = microtime(true);
-		$return = $this->conn->query($query);
+		$return = $this->_conn->query($query);
 		if ($print) {
 			echo $adminer->selectQuery($query, $start, !$return);
 		}
@@ -144,7 +88,7 @@ abstract class SqlDriver {
 	* @param array of arrays with escaped columns in keys and quoted data in values
 	* @return bool
 	*/
-	function insertUpdate($table, $rows, $primary) {
+	/*abstract*/ function insertUpdate($table, $rows, $primary) {
 		return false;
 	}
 	
@@ -179,7 +123,7 @@ abstract class SqlDriver {
 	
 	/** Convert column to be searchable
 	* @param string escaped column name
-	* @param array ["op" => , "val" => ]
+	* @param array array("op" => , "val" => )
 	* @param array
 	* @return string
 	*/
@@ -187,22 +131,14 @@ abstract class SqlDriver {
 		return $idf;
 	}
 
-	/** Convert operator so it can be used in search
-	* @param string $operator
-	* @return string
-	*/
-	function convertOperator($operator) {
-		return $operator;
-	}
-
 	/** Convert value returned by database to actual value
 	* @param string
 	* @param array
 	* @return string
 	*/
 	function value($val, $field) {
-		return (method_exists($this->conn, 'value')
+		return (method_exists($this->_conn, 'value')
-			? $this->conn->value($val, $field)
+			? $this->_conn->value($val, $field)
 			: (is_resource($val) ? stream_get_contents($val) : $val)
 		);
 	}
@@ -224,38 +160,9 @@ abstract class SqlDriver {
 	
 	/** Get help link for table
 	* @param string
-	* @param bool
 	* @return string relative URL or null
 	*/
-	function tableHelp($name, $is_view = false) {
+	function tableHelp($name) {
 	}
 	
-	/** Check if C-style escapes are supported
-	* @return bool
-	*/
-	function hasCStyleEscapes() {
-		return false;
-	}
-
-	/** Check whether table supports indexes
-	* @param array result of table_status()
-	* @return bool
-	*/
-	function supportsIndex($table_status) {
-		return !is_view($table_status);
-	}
-
-	/** Get defined check constraints
-	* @param string
-	* @return array [$name => $clause]
-	*/
-	function checkConstraints($table) {
-		// MariaDB contains CHECK_CONSTRAINTS.TABLE_NAME, MySQL and PostrgreSQL not
-		return get_key_vals("SELECT c.CONSTRAINT_NAME, CHECK_CLAUSE
-FROM INFORMATION_SCHEMA.CHECK_CONSTRAINTS c
-JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS t ON c.CONSTRAINT_SCHEMA = t.CONSTRAINT_SCHEMA AND c.CONSTRAINT_NAME = t.CONSTRAINT_NAME
-WHERE c.CONSTRAINT_SCHEMA = " . q($_GET["ns"] != "" ? $_GET["ns"] : DB) . "
-AND t.TABLE_NAME = " . q($table) . "
-AND CHECK_CLAUSE NOT LIKE '% IS NOT NULL'"); // ignore default IS NOT NULL checks in PostrgreSQL
-	}
 }

adminer/include/editing.inc.php

@@ -1,26 +1,24 @@
 <?php
-namespace Adminer;
-
-// This file is not used in Adminer Editor.
-
 /** Print select result
-* @param Result
+* @param Min_Result
-* @param Db connection to examine indexes
+* @param Min_DB connection to examine indexes
 * @param array
 * @param int
 * @return array $orgtables
 */
 function select($result, $connection2 = null, $orgtables = array(), $limit = 0) {
+	global $jush;
 	$links = array(); // colno => orgtable - create links from these columns
 	$indexes = array(); // orgtable => array(column => colno) - primary keys
 	$columns = array(); // orgtable => array(column => ) - not selected columns in primary key
 	$blobs = array(); // colno => bool - display bytes for blobs
 	$types = array(); // colno => type - display char in <code>
 	$return = array(); // table => orgtable - mapping to use in EXPLAIN
+	odd(''); // reset odd for each result
 	for ($i=0; (!$limit || $i < $limit) && ($row = $result->fetch_row()); $i++) {
 		if (!$i) {
 			echo "<div class='scrollable'>\n";
-			echo "<table class='nowrap odds'>\n";
+			echo "<table cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
 				$field = $result->fetch_field();
@@ -28,7 +26,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 				$orgtable = $field->orgtable;
 				$orgname = $field->orgname;
 				$return[$field->table] = $orgtable;
-				if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
 					if (!isset($indexes[$orgtable])) {
@@ -61,22 +59,8 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 			}
 			echo "</thead>\n";
 		}
-		echo "<tr>";
+		echo "<tr" . odd() . ">";
 		foreach ($row as $key => $val) {
-			$link = "";
-			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
-					$table = $row[array_search("table=", $links)];
-					$link = ME . $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
-				} else {
-					$link = ME . "edit=" . urlencode($links[$key]);
-					foreach ($indexes[$links[$key]] as $col => $j) {
-						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
-					}
-				}
-			} elseif (is_url($val)) {
-				$link = $val;
-			}
 			if ($val === null) {
 				$val = "<i>NULL</i>";
 			} elseif ($blobs[$key] && !is_utf8($val)) {
@@ -87,8 +71,17 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 					$val = "<code>$val</code>";
 				}
 			}
-			if ($link) {
+			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				$val = "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : '') . ">$val</a>";
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
+					$table = $row[array_search("table=", $links)];
+					$link = $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
+				} else {
+					$link = "edit=" . urlencode($links[$key]);
+					foreach ($indexes[$links[$key]] as $col => $j) {
+						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
+					}
+				}
+				$val = "<a href='" . h(ME . $link) . "'>$val</a>";
 			}
 			echo "<td>$val";
 		}
@@ -99,7 +92,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 
 /** Get referencable tables with single column primary key except self
 * @param string
-* @return array [$table_name => $field]
+* @return array ($table_name => $field)
 */
 function referencable_primary($self) {
 	$return = array(); // table_name => field
@@ -152,7 +145,8 @@ function set_adminer_settings($settings) {
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
-	echo "<textarea name='" . h($name) . "' rows='$rows' cols='$cols' class='sqlarea jush-" . JUSH . "' spellcheck='false' wrap='off'>";
+	global $jush;
+	echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea jush-$jush' spellcheck='false' wrap='off'>";
 	if (is_array($value)) {
 		foreach ($value as $val) { // not implode() to save memory
 			echo h($val[0]) . "\n\n\n"; // $val == array($query, $time, $elapsed)
@@ -163,41 +157,6 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 	echo "</textarea>";
 }
 
-/** Generate HTML <select> or <input> if $options are empty
-* @param string
-* @param array
-* @param string
-* @param string
-* @param string
-* @return string
-*/
-function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
-	$tag = ($options ? "select" : "input");
-	return "<$tag$attrs" . ($options
-		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
-		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
-	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
-}
-
-/** Print one row in JSON object
-* @param string or "" to close the object
-* @param string
-* @return null
-*/
-function json_row($key, $val = null) {
-	static $first = true;
-	if ($first) {
-		echo "{";
-	}
-	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
-		$first = false;
-	} else {
-		echo "\n}\n";
-		$first = true;
-	}
-}
-
 /** Print table columns for type edit
 * @param string
 * @param array
@@ -207,46 +166,22 @@ function json_row($key, $val = null) {
 * @return null
 */
 function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) {
-	global $driver;
+	global $structured_types, $types, $unsigned, $on_actions;
 	$type = $field["type"];
-	?><td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
+	?>
-	if ($type && !array_key_exists($type, $driver->types()) && !isset($foreign_keys[$type]) && !in_array($type, $extra_types)) {
+<td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
+if ($type && !isset($types[$type]) && !isset($foreign_keys[$type]) && !in_array($type, $extra_types)) {
 	$extra_types[] = $type;
-	}
-	$structured_types = $driver->structuredTypes();
-	if ($foreign_keys) {
-		$structured_types[lang('Foreign keys')] = $foreign_keys;
-	}
-	echo optionlist(array_merge($extra_types, $structured_types), $type);
-	?></select><td><input
-	name="<?php echo h($key); ?>[length]"
-	value="<?php echo h($field["length"]); ?>"
-	size="3"
-	<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); //! type="number" with enabled JavaScript ?>
-	aria-labelledby="label-length"><td class="options"><?php
-	echo ($collations ? "<input list='collations' name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . " value='" . h($field["collation"]) . "' placeholder='(" . lang('collation') . ")'>" : '');
-	echo ($driver->unsigned ? "<select name='" . h($key) . "[unsigned]'" . (!$type || preg_match(number_type(), $type) ? "" : " class='hidden'") . '><option>' . optionlist($driver->unsigned, $field["unsigned"]) . '</select>' : '');
-	echo (isset($field['on_update']) ? "<select name='" . h($key) . "[on_update]'" . (preg_match('~timestamp|datetime~', $type) ? "" : " class='hidden'") . '>'
-		. optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), (preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"]) ? "CURRENT_TIMESTAMP" : $field["on_update"]))
-		. '</select>' : ''
-	);
-	echo ($foreign_keys ? "<select name='" . h($key) . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $driver->onActions), $field["on_delete"]) . "</select> " : " "); // space for IE
 }
-
+if ($foreign_keys) {
-/** Get partition info
+	$structured_types[lang('Foreign keys')] = $foreign_keys;
-* @param string
+}
-* @return array
+echo optionlist(array_merge($extra_types, $structured_types), $type);
-*/
+?></select><td><input name="<?php echo h($key); ?>[length]" value="<?php echo h($field["length"]); ?>" size="3"<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); //! type="number" with enabled JavaScript ?> aria-labelledby="label-length"><td class="options"><?php
-function get_partitions_info($table) {
+	echo "<select name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
-	global $connection;
+	echo ($unsigned ? "<select name='" . h($key) . "[unsigned]'" . (!$type || preg_match(number_type(), $type) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
-	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
+	echo (isset($field['on_update']) ? "<select name='" . h($key) . "[on_update]'" . (preg_match('~timestamp|datetime~', $type) ? "" : " class='hidden'") . '>' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), (preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"]) ? "CURRENT_TIMESTAMP" : $field["on_update"])) . '</select>' : '');
-	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+	echo ($foreign_keys ? "<select name='" . h($key) . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
-	$return = array();
-	list($return["partition_by"], $return["partition"], $return["partitions"]) = $result->fetch_row();
-	$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
-	$return["partition_names"] = array_keys($partitions);
-	$return["partition_values"] = array_values($partitions);
-	return $return;
 }
 
 /** Filter length value including enums
@@ -254,8 +189,7 @@ function get_partitions_info($table) {
 * @return string
 */
 function process_length($length) {
-	global $driver;
+	global $enum_length;
-	$enum_length = $driver->enumLength;
 	return (preg_match("~^\\s*\\(?\\s*$enum_length(?:\\s*,\\s*$enum_length)*+\\s*\\)?\\s*\$~", $length) && preg_match_all("~$enum_length~", $length, $matches)
 		? "(" . implode(",", $matches[0]) . ")"
 		: preg_replace('~^[0-9].*~', '(\0)', preg_replace('~[^-0-9,+()[\]]~', '', $length))
@@ -268,24 +202,20 @@ function process_length($length) {
 * @return string
 */
 function process_type($field, $collate = "COLLATE") {
-	global $driver;
+	global $unsigned;
 	return " $field[type]"
 		. process_length($field["length"])
-		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $driver->unsigned) ? " $field[unsigned]" : "")
+		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
-		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . (JUSH == "mssql" ? $field["collation"] : q($field["collation"])) : "")
+		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
 	;
 }
 
 /** Create SQL string from field
 * @param array basic field information
 * @param array information about field type
-* @return array ["field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT"]
+* @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
-	// MariaDB exports CURRENT_TIMESTAMP as a function.
-	if ($field["on_update"]) {
-		$field["on_update"] = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $field["on_update"]);
-	}
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
@@ -302,16 +232,8 @@ function process_field($field, $type_field) {
 * @return string
 */
 function default_value($field) {
-	global $driver;
 	$default = $field["default"];
-	$generated = $field["generated"];
+	return ($default === null ? "" : " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default));
-	return ($default === null ? "" : (in_array($generated, $driver->generated)
-		? (JUSH == "mssql" ? " AS ($default)" . ($generated == "VIRTUAL" ? "" : " $generated") . "" : " GENERATED ALWAYS AS ($default) $generated")
-		: " DEFAULT " . (!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default))
-			? (JUSH == "sql" && preg_match('~text~', $field["type"]) ? "(" . q($default) . ")" : q($default)) // MySQL requires () around default value of text column
-			: str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", (JUSH == "sqlite" ? "($default)" : $default))
-		)
-	));
 }
 
 /** Get type class to use in CSS
@@ -319,14 +241,12 @@ function default_value($field) {
 * @return string class=''
 */
 function type_class($type) {
-	foreach (
+	foreach (array(
-		array(
 		'char' => 'text',
 		'date' => 'time|year',
 		'binary' => 'blob',
 		'enum' => 'set',
-		) as $key => $val
+	) as $key => $val) {
-	) {
 		if (preg_match("~$key|$val~", $type)) {
 			return " class='$key'";
 		}
@@ -341,25 +261,25 @@ function type_class($type) {
 * @return null
 */
 function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array()) {
-	global $driver;
+	global $inout;
 	$fields = array_values($fields);
 	$default_class = (($_POST ? $_POST["defaults"] : adminer_setting("defaults")) ? "" : " class='hidden'");
 	$comment_class = (($_POST ? $_POST["comments"] : adminer_setting("comments")) ? "" : " class='hidden'");
 	?>
 <thead><tr>
-<?php echo ($type == "PROCEDURE" ? "<td>" : ""); ?>
+<?php if ($type == "PROCEDURE") { ?><td><?php } ?>
 <th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
 <td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("qs('#enum-edit').onblur = editingLengthBlur;"); ?>
 <td id="label-length"><?php echo lang('Length'); ?>
 <td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
 <?php if ($type == "TABLE") { ?>
 <td id="label-null">NULL
-<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link(array(
+<td><input type="radio" name="auto_increment_col" value=""><acronym id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
 	'sql' => "example-auto-increment.html",
 	'mariadb' => "auto_increment/",
 	'sqlite' => "autoinc.html",
-	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
+	'pgsql' => "datatype.html#DATATYPE-SERIAL",
-	'mssql' => "t-sql/statements/create-table-transact-sql-identity-property",
+	'mssql' => "ms186775.aspx",
 )); ?>
 <td id="label-default"<?php echo $default_class; ?>><?php echo lang('Default value'); ?>
 <?php echo (support("comment") ? "<td id='label-comment'$comment_class>" . lang('Comment') : ""); ?>
@@ -375,22 +295,13 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 		$display = (isset($_POST["add"][$i-1]) || (isset($field["field"]) && !$_POST["drop_col"][$i])) && (support("drop_col") || $orig == "");
 		?>
 <tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
-<?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $driver->inout), $field["inout"]) : "") . "<th>"; ?>
+<?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?>
-<?php if ($display) { ?>
+<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" data-maxlength="64" autocapitalize="off" aria-labelledby="label-name"><?php } ?>
-<input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" data-maxlength="64" autocapitalize="off" aria-labelledby="label-name">
-<?php } ?>
 <input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>"><?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
-<?php
+<?php if ($type == "TABLE") { ?>
-		if ($type == "TABLE") {
-			?>
 <td><?php echo checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"); ?>
-<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php echo ($field["auto_increment"] ? " checked" : ""); ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
+<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
-			echo ($driver->generated
+			echo checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "label-default"); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" aria-labelledby="label-default"><?php
-				? html_select("fields[$i][generated]", array_merge(array("", "DEFAULT"), $driver->generated), $field["generated"]) . " "
-				: checkbox("fields[$i][generated]", 1, $field["generated"], "", "", "", "label-default")
-			);
-			?>
-<input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" aria-labelledby="label-default"><?php
 			echo (support("comment") ? "<td$comment_class><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' data-maxlength='" . (min_version(5.5) ? 1024 : 255) . "' aria-labelledby='label-comment'>" : "");
 		}
 		echo "<td>";
@@ -513,10 +424,11 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 * @return string
 */
 function create_trigger($on, $row) {
-	$timing_event = " $row[Timing] $row[Event]" . (preg_match('~ OF~', $row["Event"]) ? " $row[Of]" : ""); // SQL injection
+	global $jush;
+	$timing_event = " $row[Timing] $row[Event]" . ($row["Event"] == "UPDATE OF" ? " " . idf_escape($row["Of"]) : "");
 	return "CREATE TRIGGER "
 		. idf_escape($row["Trigger"])
-		. (JUSH == "mssql" ? $on . $timing_event : $timing_event . $on)
+		. ($jush == "mssql" ? $on . $timing_event : $timing_event . $on)
 		. rtrim(" $row[Type]\n$row[Statement]", ";")
 		. ";"
 	;
@@ -528,22 +440,22 @@ function create_trigger($on, $row) {
 * @return string
 */
 function create_routine($routine, $row) {
-	global $driver;
+	global $inout, $jush;
 	$set = array();
 	$fields = (array) $row["fields"];
 	ksort($fields); // enforce fields order
 	foreach ($fields as $field) {
 		if ($field["field"] != "") {
-			$set[] = (preg_match("~^($driver->inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
+			$set[] = (preg_match("~^($inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
 	}
-	$definition = rtrim($row["definition"], ";");
+	$definition = rtrim("\n$row[definition]", ";");
 	return "CREATE $routine "
 		. idf_escape(trim($row["name"]))
 		. " (" . implode(", ", $set) . ")"
-		. ($routine == "FUNCTION" ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
+		. (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
 		. ($row["language"] ? " LANGUAGE $row[language]" : "")
-		. (JUSH == "pgsql" ? " AS " . q($definition) : "\n$definition;")
+		. ($jush == "pgsql" ? " AS " . q($definition) : "$definition;")
 	;
 }
 
@@ -556,20 +468,20 @@ function remove_definer($query) {
 }
 
 /** Format foreign key to use in SQL query
-* @param array ["db" => string, "ns" => string, "table" => string, "source" => array, "target" => array, "on_delete" => one of $on_actions, "on_update" => one of $on_actions]
+* @param array ("db" => string, "ns" => string, "table" => string, "source" => array, "target" => array, "on_delete" => one of $on_actions, "on_update" => one of $on_actions)
 * @return string
 */
 function format_foreign_key($foreign_key) {
-	global $driver;
+	global $on_actions;
 	$db = $foreign_key["db"];
 	$ns = $foreign_key["ns"];
-	return " FOREIGN KEY (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["source"])) . ") REFERENCES "
+	return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES "
 		. ($db != "" && $db != $_GET["db"] ? idf_escape($db) . "." : "")
 		. ($ns != "" && $ns != $_GET["ns"] ? idf_escape($ns) . "." : "")
-		. idf_escape($foreign_key["table"])
+		. table($foreign_key["table"])
-		. " (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
+		. " (" . implode(", ", array_map('idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
-		. (preg_match("~^($driver->onActions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
+		. (preg_match("~^($on_actions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
-		. (preg_match("~^($driver->onActions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
+		. (preg_match("~^($on_actions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
 	;
 }
 
@@ -598,37 +510,43 @@ function tar_file($filename, $tmp_file) {
 function ini_bytes($ini) {
 	$val = ini_get($ini);
 	switch (strtolower(substr($val, -1))) {
-		case 'g':
+		case 'g': $val *= 1024; // no break
-			$val = (int) $val * 1024; // no break
+		case 'm': $val *= 1024; // no break
-		case 'm':
+		case 'k': $val *= 1024;
-			$val = (int) $val * 1024; // no break
-		case 'k':
-			$val = (int) $val * 1024;
 	}
 	return $val;
 }
 
 /** Create link to database documentation
-* @param array JUSH => $path
+* @param array $jush => $path
 * @param string HTML code
 * @return string HTML code
 */
 function doc_link($paths, $text = "<sup>?</sup>") {
-	global $connection;
+	global $jush, $connection;
 	$server_info = $connection->server_info;
 	$version = preg_replace('~^(\d\.?\d).*~s', '\1', $server_info); // two most significant digits
 	$urls = array(
 		'sql' => "https://dev.mysql.com/doc/refman/$version/en/",
 		'sqlite' => "https://www.sqlite.org/",
 		'pgsql' => "https://www.postgresql.org/docs/$version/",
-		'mssql' => "https://learn.microsoft.com/en-us/sql/",
+		'mssql' => "https://msdn.microsoft.com/library/",
 		'oracle' => "https://www.oracle.com/pls/topic/lookup?ctx=db" . preg_replace('~^.* (\d+)\.(\d+)\.\d+\.\d+\.\d+.*~s', '\1\2', $server_info) . "&id=",
 	);
 	if (preg_match('~MariaDB~', $server_info)) {
-		$urls['sql'] = "https://mariadb.com/kb/en/";
+		$urls['sql'] = "https://mariadb.com/kb/en/library/";
 		$paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
 	}
-	return ($paths[JUSH] ? "<a href='" . h($urls[JUSH] . $paths[JUSH] . (JUSH == 'mssql' ? "?view=sql-server-ver$version" : "")) . "'" . target_blank() . ">$text</a>" : "");
+	return ($paths[$jush] ? "<a href='$urls[$jush]$paths[$jush]'" . target_blank() . ">$text</a>" : "");
+}
+
+/** Wrap gzencode() for usage in ob_start()
+* @param string
+* @return string
+*/
+function ob_gzencode($string) {
+	// ob_start() callback recieves an optional parameter $phase but gzencode() accepts optional parameter $level
+	return gzencode($string);
 }
 
 /** Compute size of database

adminer/include/errors.inc.php

@@ -1,7 +0,0 @@
-<?php
-namespace Adminer;
-
-error_reporting(6135); // errors and warnings
-set_error_handler(function ($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on( value of type)? null|Undefined (array key|property))~', $errstr);
-}, E_WARNING);

adminer/include/functions.inc.php

@@ -1,10 +1,6 @@
 <?php
-namespace Adminer;
-
-// This file is used both in Adminer and Adminer Editor.
-
 /** Get database connection
-* @return Db
+* @return Min_DB
 */
 function connection() {
 	// can be used in customization, $connection is minified
@@ -33,9 +29,6 @@ function version() {
 * @return string
 */
 function idf_unescape($idf) {
-	if (!preg_match('~^[`\'"[]~', $idf)) {
-		return $idf;
-	}
 	$last = substr($idf, -1);
 	return str_replace($last . $last, $last, substr($idf, 1, -1));
 }
@@ -69,7 +62,7 @@ function number_type() {
 * @return null modified in place
 */
 function remove_slashes($process, $filter = false) {
-	if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
+	if (get_magic_quotes_gpc()) {
 		while (list($key, $val) = each($process)) {
 			foreach ($val as $k => $v) {
 				unset($process[$key][$k]);
@@ -98,7 +91,7 @@ function bracket_escape($idf, $back = false) {
 /** Check if connection has at least the given version
 * @param string required version
 * @param string required MariaDB version
-* @param Db defaults to $connection
+* @param Min_DB defaults to $connection
 * @return bool
 */
 function min_version($version, $maria_db = "", $connection2 = null) {
@@ -111,11 +104,11 @@ function min_version($version, $maria_db = "", $connection2 = null) {
 		$server_info = $match[1];
 		$version = $maria_db;
 	}
-	return $version && version_compare($server_info, $version) >= 0;
+	return (version_compare($server_info, $version) >= 0);
 }
 
 /** Get connection charset
-* @param Db
+* @param Min_DB
 * @return string
 */
 function charset($connection) {
@@ -204,11 +197,7 @@ function optionlist($options, $selected = null, $use_keys = false) {
 			$opts = $v;
 		}
 		foreach ($opts as $key => $val) {
-			$return .= '<option'
+			$return .= '<option' . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '') . (($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '') . '>' . h($val);
-				. ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '')
-				. ($selected !== null && ($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '')
-				. '>' . h($val)
-			;
 		}
 		if (is_array($v)) {
 			$return .= '</optgroup>';
@@ -217,29 +206,22 @@ function optionlist($options, $selected = null, $use_keys = false) {
 	return $return;
 }
 
-/** Generate HTML <select>
-* @param string
-* @param array
-* @param string
-* @param string
-* @param string
-* @return string
-*/
-function html_select($name, $options, $value = "", $onchange = "", $labelled_by = "") {
-	return "<select name='" . h($name) . "'"
-		. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
-		. ">" . optionlist($options, $value) . "</select>"
-		. ($onchange ? script("qsl('select').onchange = function () { $onchange };", "") : "")
-	;
-}
-
 /** Generate HTML radio list
 * @param string
 * @param array
 * @param string
+* @param string true for no onchange, false for radio
+* @param string
 * @return string
 */
-function html_radios($name, $options, $value = "") {
+function html_select($name, $options, $value = "", $onchange = true, $labelled_by = "") {
+	if ($onchange) {
+		return "<select name='" . h($name) . "'"
+			. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
+			. ">" . optionlist($options, $value) . "</select>"
+			. (is_string($onchange) ? script("qsl('select').onchange = function () { $onchange };", "") : "")
+		;
+	}
 	$return = "";
 	foreach ($options as $key => $val) {
 		$return .= "<label><input type='radio' name='" . h($name) . "' value='" . h($key) . "'" . ($key == $value ? " checked" : "") . ">" . h($val) . "</label>";
@@ -247,6 +229,22 @@ function html_radios($name, $options, $value = "") {
 	return $return;
 }
 
+/** Generate HTML <select> or <input> if $options are empty
+* @param string
+* @param array
+* @param string
+* @param string
+* @param string
+* @return string
+*/
+function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
+	$tag = ($options ? "select" : "input");
+	return "<$tag$attrs" . ($options
+		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
+		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
+	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
+}
+
 /** Get onclick confirmation
 * @param string
 * @param string
@@ -279,6 +277,18 @@ function bold($bold, $class = "") {
 	return ($bold ? " class='active $class'" : ($class ? " class='$class'" : ""));
 }
 
+/** Generate class for odd rows
+* @param string return this for odd rows, empty to reset counter
+* @return string
+*/
+function odd($return = ' class="odd"') {
+	static $i = 0;
+	if (!$return) { // reset counter
+		$i = -1;
+	}
+	return ($i++ % 2 ? $return : '');
+}
+
 /** Escape string for JavaScript apostrophes
 * @param string
 * @return string
@@ -287,6 +297,25 @@ function js_escape($string) {
 	return addcslashes($string, "\r\n'\\/"); // slash for <script>
 }
 
+/** Print one row in JSON object
+* @param string or "" to close the object
+* @param string
+* @return null
+*/
+function json_row($key, $val = null) {
+	static $first = true;
+	if ($first) {
+		echo "{";
+	}
+	if ($key != "") {
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
+		$first = false;
+	} else {
+		echo "\n}\n";
+		$first = true;
+	}
+}
+
 /** Get INI boolean value
 * @param string
 * @return bool
@@ -296,7 +325,7 @@ function ini_bool($ini) {
 	return (preg_match('~^(on|true|yes)$~i', $val) || (int) $val); // boolean values set by php_value are strings
 }
 
-/** Check if SID is necessary
+/** Check if SID is neccessary
 * @return bool
 */
 function sid() {
@@ -344,16 +373,6 @@ function q($string) {
 	return $connection->quote($string);
 }
 
-/** Get single value from database
-* @param string
-* @param int
-* @return string or false if error
-*/
-function get_val($query, $field = 0) {
-	global $connection;
-	return $connection->result($query, $field);
-}
-
 /** Get list of values from database
 * @param string
 * @param mixed
@@ -373,7 +392,7 @@ function get_vals($query, $column = 0) {
 
 /** Get keys from first column and values from second
 * @param string
-* @param Db
+* @param Min_DB
 * @param bool
 * @return array
 */
@@ -398,7 +417,7 @@ function get_key_vals($query, $connection2 = null, $set_keys = true) {
 
 /** Get all rows of result
 * @param string
-* @param Db
+* @param Min_DB
 * @param string
 * @return array of associative arrays
 */
@@ -411,7 +430,7 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 		while ($row = $result->fetch_assoc()) {
 			$return[] = $row;
 		}
-	} elseif (!$result && !is_object($connection2) && $error && (defined('Adminer\PAGE_HEADER') || $error == "-- ")) {
+	} elseif (!$result && !is_object($connection2) && $error && defined("PAGE_HEADER")) {
 		echo $error . error() . "\n";
 	}
 	return $return;
@@ -454,19 +473,18 @@ function escape_key($key) {
 * @return string
 */
 function where($where, $fields = array()) {
-	global $connection;
+	global $connection, $jush;
 	$return = array();
 	foreach ((array) $where["where"] as $key => $val) {
 		$key = bracket_escape($key, 1); // 1 - back
 		$column = escape_key($key);
 		$return[] = $column
-			. (JUSH == "sql" && $fields[$key]["type"] == "json" ? " = CAST(" . q($val) . " AS JSON)"
+			. ($jush == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
-				: (JUSH == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
+				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
-				: (JUSH == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
 				: " = " . unconvert_field($fields[$key], q($val))
-			)))
+			))
 		; //! enum and set
-		if (JUSH == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
+		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
 			$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
 		}
 	}
@@ -521,19 +539,17 @@ function convert_fields($columns, $fields, $select = array()) {
 /** Set cookie valid on current path
 * @param string
 * @param string
-* @param int number of seconds, 0 for session cookie, 2592000 - 30 days
+* @param int number of seconds, 0 for session cookie
 * @return bool
 */
-function cookie($name, $value, $lifetime = 2592000) {
+function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
 	global $HTTPS;
-	return header(
+	return header("Set-Cookie: $name=" . urlencode($value)
-		"Set-Cookie: $name=" . urlencode($value)
 		. ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
 		. "; path=" . preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"])
 		. ($HTTPS ? "; secure" : "")
 		. "; HttpOnly; SameSite=lax",
-		false
+		false);
-	);
 }
 
 /** Restart stopped session
@@ -654,7 +670,7 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 
 /** Execute and remember query
 * @param string or null to return remembered queries, end with ';' to use DELIMITER
-* @return Result or [$queries, $time] if $query = null
+* @return Min_Result or array($queries, $time) if $query = null
 */
 function queries($query) {
 	global $connection;
@@ -677,7 +693,7 @@ function queries($query) {
 * @param callback
 * @return bool
 */
-function apply_queries($query, $tables, $escape = 'Adminer\table') {
+function apply_queries($query, $tables, $escape = 'table') {
 	foreach ($tables as $table) {
 		if (!queries("$query " . $escape($table))) {
 			return false;
@@ -705,19 +721,12 @@ function format_time($start) {
 	return lang('%.3f s', max(0, microtime(true) - $start));
 }
 
-/** Get relative REQUEST_URI
-* @return string
-*/
-function relative_uri() {
-	return str_replace(":", "%3a", preg_replace('~^[^?]*/([^?]*)~', '\1', $_SERVER["REQUEST_URI"]));
-}
-
 /** Remove parameter from query string
 * @param string
 * @return string
 */
 function remove_from_uri($param = "") {
-	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', relative_uri() . "&"), 0, -1);
+	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', "$_SERVER[REQUEST_URI]&"), 0, -1);
 }
 
 /** Generate page number for pagination
@@ -735,10 +744,9 @@ function pagination($page, $current) {
 /** Get file contents from $_FILES
 * @param string
 * @param bool
-* @param string
 * @return mixed int for error, string otherwise
 */
-function get_file($key, $decompress = false, $delimiter = "") {
+function get_file($key, $decompress = false) {
 	$file = $_FILES[$key];
 	if (!$file) {
 		return null;
@@ -753,24 +761,23 @@ function get_file($key, $decompress = false, $delimiter = "") {
 		}
 		$name = $file["name"][$key];
 		$tmp_name = $file["tmp_name"][$key];
-		$content = file_get_contents(
+		$content = file_get_contents($decompress && preg_match('~\.gz$~', $name)
-			$decompress && preg_match('~\.gz$~', $name)
 			? "compress.zlib://$tmp_name"
 			: $tmp_name
 		); //! may not be reachable because of open_basedir
 		if ($decompress) {
 			$start = substr($content, 0, 3);
-			if (function_exists("iconv") && preg_match("~^\xFE\xFF|^\xFF\xFE~", $start)) { // not ternary operator to save memory
+			if (function_exists("iconv") && preg_match("~^\xFE\xFF|^\xFF\xFE~", $start, $regs)) { // not ternary operator to save memory
 				$content = iconv("utf-16", "utf-8", $content);
 			} elseif ($start == "\xEF\xBB\xBF") { // UTF-8 BOM
 				$content = substr($content, 3);
 			}
-		}
+			$return .= $content . "\n\n";
+		} else {
 			$return .= $content;
-		if ($delimiter) {
-			$return .= (preg_match("($delimiter\\s*\$)", $content) ? "" : $delimiter) . "\n\n";
 		}
 	}
+	//! support SQL files not ending with semicolon
 	return $return;
 }
 
@@ -829,24 +836,25 @@ function format_number($val) {
 */
 function friendly_url($val) {
 	// used for blobs and export
-	return preg_replace('~\W~i', '-', $val);
+	return preg_replace('~[^a-z0-9_]~i', '-', $val);
 }
 
 /** Print hidden fields
 * @param array
 * @param array
-* @param string
 * @return bool
 */
-function hidden_fields($process, $ignore = array(), $prefix = '') {
+function hidden_fields($process, $ignore = array()) {
 	$return = false;
-	foreach ($process as $key => $val) {
+	while (list($key, $val) = each($process)) {
 		if (!in_array($key, $ignore)) {
 			if (is_array($val)) {
-				hidden_fields($val, array(), $key);
+				foreach ($val as $k => $v) {
+					$process[$key . "[$k]"] = $v;
+				}
 			} else {
 				$return = true;
-				echo '<input type="hidden" name="' . h($prefix ? $prefix . "[$key]" : $key) . '" value="' . h($val) . '">';
+				echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
 			}
 		}
 	}
@@ -869,12 +877,12 @@ function hidden_fields_get() {
 */
 function table_status1($table, $fast = false) {
 	$return = table_status($table, $fast);
-	return ($return ?: array("Name" => $table));
+	return ($return ? $return : array("Name" => $table));
 }
 
 /** Find out foreign keys for each column
 * @param string
-* @return array [$col => []]
+* @return array array($col => array())
 */
 function column_foreign_keys($table) {
 	global $adminer;
@@ -891,18 +899,18 @@ function column_foreign_keys($table) {
 * @param string "radio"|"checkbox"
 * @param string
 * @param array
-* @param mixed string|array
+* @param mixed int|string|array
 * @param string
 * @return null
 */
 function enum_input($type, $attrs, $field, $value, $empty = null) {
 	global $adminer;
 	preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
-	$return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === $empty) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
+	$return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
 	foreach ($matches[1] as $i => $val) {
 		$val = stripcslashes(str_replace("''", "'", $val));
-		$checked = (is_array($value) ? in_array($val, $value) : $value === $val);
+		$checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
-		$return .= " <label><input type='$type'$attrs value='" . h($val) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
+		$return .= " <label><input type='$type'$attrs value='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
 	}
 	return $return;
 }
@@ -914,31 +922,29 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-	global $driver, $adminer;
+	global $types, $adminer, $jush;
 	$name = h(bracket_escape($field["field"]));
 	echo "<td class='function'>";
 	if (is_array($value) && !$function) {
-		$value = json_encode($value, 128); // 128 - JSON_PRETTY_PRINT available since PHP 5.4
+		$args = array($value);
+		if (version_compare(PHP_VERSION, 5.4) >= 0) {
+			$args[] = JSON_PRETTY_PRINT;
+		}
+		$value = call_user_func_array('json_encode', $args); //! requires PHP 5.2
 		$function = "json";
 	}
-	$reset = (JUSH == "mssql" && $field["auto_increment"]);
+	$reset = ($jush == "mssql" && $field["auto_increment"]);
 	if ($reset && !$_POST["save"]) {
 		$function = null;
 	}
 	$functions = (isset($_GET["select"]) || $reset ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
-	$disabled = stripos($field["default"], "GENERATED ALWAYS AS ") === 0 ? " disabled=''" : "";
+	$attrs = " name='fields[$name]'";
-	$attrs = " name='fields[$name]'$disabled";
-	$enums = $driver->enumLength($field);
-	if ($enums) {
-		$field["type"] = "enum";
-		$field["length"] = $enums;
-	}
 	if ($field["type"] == "enum") {
 		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
 		$has_function = (in_array($function, $functions) || isset($functions[$function]));
 		echo (count($functions) > 1
-			? "<select name='function[$name]'$disabled>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+			? "<select name='function[$name]'>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
 				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
 				. script("qsl('select').onchange = functionChange;", "")
 			: h(reset($functions))
@@ -947,19 +953,19 @@ function input($field, $value, $function) {
 		if ($input != "") {
 			echo $input;
 		} elseif (preg_match('~bool~', $field["type"])) {
-			echo "<input type='hidden'$attrs value='0'>"
+			echo "<input type='hidden'$attrs value='0'>" .
-				. "<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
+				"<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
-		} elseif ($field["type"] == "set") {
+		} elseif ($field["type"] == "set") { //! 64 bits
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
 				$val = stripcslashes(str_replace("''", "'", $val));
-				$checked = in_array($val, explode(",", $value), true);
+				$checked = (is_int($value) ? ($value >> $i) & 1 : in_array($val, explode(",", $value), true));
-				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . h($val) . "'" . ($checked ? ' checked' : '') . ">" . h($adminer->editVal($val, $field)) . '</label>';
+				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . ">" . h($adminer->editVal($val, $field)) . '</label>';
 			}
 		} elseif (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
 			echo "<input type='file' name='fields-$name'>";
 		} elseif (($text = preg_match('~text|lob|memo~i', $field["type"])) || preg_match("~\n~", $value)) {
-			if ($text && JUSH != "sqlite") {
+			if ($text && $jush != "sqlite") {
 				$attrs .= " cols='50' rows='12'";
 			} else {
 				$rows = min(12, substr_count($value, "\n") + 1);
@@ -970,12 +976,8 @@ function input($field, $value, $function) {
 			echo "<textarea$attrs cols='50' rows='12' class='jush-js'>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
-			$types = $driver->types();
+			$maxlength = (!preg_match('~int~', $field["type"]) && preg_match('~^(\d+)(,(\d+))?$~', $field["length"], $match) ? ((preg_match("~binary~", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
-			$maxlength = (!preg_match('~int~', $field["type"]) && preg_match('~^(\d+)(,(\d+))?$~', $field["length"], $match)
+			if ($jush == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
-				? ((preg_match("~binary~", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0))
-				: ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0)
-			);
-			if (JUSH == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
 				$maxlength += 7; // microtime
 			}
 			// type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
@@ -1007,21 +1009,17 @@ function input($field, $value, $function) {
 */
 function process_input($field) {
 	global $adminer, $driver;
-
-	if (stripos($field["default"], "GENERATED ALWAYS AS ") === 0) {
-		return null;
-	}
-
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
-	if ($field["type"] == "enum" || $driver->enumLength($field)) {
+	if ($field["type"] == "enum") {
 		if ($value == -1) {
 			return false;
 		}
 		if ($value == "") {
 			return "NULL";
 		}
+		return +$value;
 	}
 	if ($field["auto_increment"] && $value == "") {
 		return null;
@@ -1033,7 +1031,7 @@ function process_input($field) {
 		return "NULL";
 	}
 	if ($field["type"] == "set") {
-		$value = implode(",", (array) $value);
+		return array_sum((array) $value);
 	}
 	if ($function == "json") {
 		$function = "";
@@ -1070,7 +1068,7 @@ function fields_from_edit() {
 		$name = bracket_escape($key, 1); // 1 - back
 		$return[$name] = array(
 			"field" => $name,
-			"privileges" => array("insert" => 1, "update" => 1, "where" => 1, "order" => 1),
+			"privileges" => array("insert" => 1, "update" => 1),
 			"null" => 1,
 			"auto_increment" => ($key == $driver->primary),
 		);
@@ -1111,7 +1109,7 @@ function dump_headers($identifier, $multi_table = false) {
 	$return = $adminer->dumpHeaders($identifier, $multi_table);
 	$output = $_POST["output"];
 	if ($output != "text") {
-		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && preg_match('~^[0-9a-z]+$~', $output) ? ".$output" : ""));
+		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && !preg_match('~[^0-9a-z]~', $output) ? ".$output" : ""));
 	}
 	session_write_close();
 	ob_flush();
@@ -1125,7 +1123,7 @@ function dump_headers($identifier, $multi_table = false) {
 */
 function dump_csv($row) {
 	foreach ($row as $key => $val) {
-		if (preg_match('~["\n,;\t]|^0|\.\d*0$~', $val) || $val === "") {
+		if (preg_match("~[\"\n,;\t]~", $val) || $val === "") {
 			$row[$key] = '"' . str_replace('"', '""', $val) . '"';
 		}
 	}
@@ -1234,7 +1232,7 @@ function select_value($val, $link, $field, $text_length) {
 				. "<td>" . select_value($v, $link, $field, $text_length)
 			;
 		}
-		return "<table>$return</table>";
+		return "<table cellspacing='0'>$return</table>";
 	}
 	if (!$link) {
 		$link = $adminer->selectLink($val, $field);
@@ -1296,8 +1294,9 @@ function is_shortable($field) {
 * @return string
 */
 function count_rows($table, $where, $is_group, $group) {
+	global $jush;
 	$query = " FROM " . table($table) . ($where ? " WHERE " . implode(" AND ", $where) : "");
-	return ($is_group && (JUSH == "sql" || count($group) == 1)
+	return ($is_group && ($jush == "sql" || count($group) == 1)
 		? "SELECT COUNT(DISTINCT " . implode(", ", $group) . ")$query"
 		: "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query GROUP BY " . implode(", ", $group) . ") x" : $query)
 	);
@@ -1312,8 +1311,7 @@ function slow_query($query) {
 	$db = $adminer->database();
 	$timeout = $adminer->queryTimeout();
 	$slow_query = $driver->slowQuery($query, $timeout);
-	$connection2 = null;
+	if (!$slow_query && support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
-	if (!$slow_query && support("kill") && is_object($connection2 = connect($adminer->credentials())) && ($db == "" || $connection2->select_db($db))) {
 		$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
 <script<?php echo nonce(); ?>>
@@ -1323,10 +1321,12 @@ var timeout = setTimeout(function () {
 }, <?php echo 1000 * $timeout; ?>);
 </script>
 <?php
+	} else {
+		$connection2 = null;
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals(($slow_query ?: $query), $connection2, false); // @ - may be killed
+	$return = @get_key_vals(($slow_query ? $slow_query : $query), $connection2, false); // @ - may be killed
 	if ($connection2) {
 		echo script("clearTimeout(timeout);");
 		ob_flush();
@@ -1405,28 +1405,26 @@ function on_help($command, $side = 0) {
 * @param bool
 * @return null
 */
-function edit_form($table, $fields, $row, $update) {
+function edit_form($TABLE, $fields, $row, $update) {
-	global $adminer, $token, $error;
+	global $adminer, $jush, $token, $error;
-	$table_name = $adminer->tableName(table_status1($table, true));
+	$table_name = $adminer->tableName(table_status1($TABLE, true));
 	page_header(
 		($update ? lang('Edit') : lang('Insert')),
 		$error,
-		array("select" => array($table, $table_name)),
+		array("select" => array($TABLE, $table_name)),
 		$table_name
 	);
-	$adminer->editRowPrint($table, $fields, $row, $update);
 	if ($row === false) {
 		echo "<p class='error'>" . lang('No rows.') . "\n";
-		return;
 	}
 	?>
 <form action="" method="post" enctype="multipart/form-data" id="form">
 <?php
-	$first = 0;
 	if (!$fields) {
 		echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
 	} else {
-		echo "<table class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
+		echo "<table cellspacing='0' class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
+
 		foreach ($fields as $name => $field) {
 			echo "<tr><th>" . $adminer->fieldName($field);
 			$default = $_GET["set"][bracket_escape($name)];
@@ -1437,9 +1435,9 @@ function edit_form($table, $fields, $row, $update) {
 				}
 			}
 			$value = ($row !== null
-				? ($row[$name] != "" && JUSH == "sql" && preg_match("~enum|set~", $field["type"]) && is_array($row[$name])
+				? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
-					? implode(",", $row[$name])
+					? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
-					: (is_bool($row[$name]) ? +$row[$name] : $row[$name])
+					: $row[$name]
 				)
 				: (!$update && $field["auto_increment"]
 					? ""
@@ -1456,20 +1454,10 @@ function edit_form($table, $fields, $row, $update) {
 					: ($value === false ? null : ($value !== null ? '' : 'NULL'))
 				)
 			);
-			if (!$_POST && !$update && $value == $field["default"] && preg_match('~^[\w.]+\(~', $value)) {
-				$function = "SQL";
-			}
 			if (preg_match("~time~", $field["type"]) && preg_match('~^CURRENT_TIMESTAMP~i', $value)) {
 				$value = "";
 				$function = "now";
 			}
-			if ($field["type"] == "uuid" && $value == "uuid()") {
-				$value = "";
-				$function = "uuid";
-			}
-			if ($field["auto_increment"] || $function == "now" || $function == "uuid") {
-				$first++;
-			}
 			input($field, $value, $function);
 			echo "\n";
 		}
@@ -1496,7 +1484,7 @@ function edit_form($table, $fields, $row, $update) {
 		}
 	}
 	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'>" . confirm() . "\n"
-		: ($_POST || !$fields ? "" : script("focus(qsa('td', qs('#form'))[2*$first+1].firstChild);"))
+		: ($_POST || !$fields ? "" : script("focus(qsa('td', qs('#form'))[1].firstChild);"))
 	);
 	if (isset($_GET["select"])) {
 		hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));

adminer/include/lang.inc.php

@@ -1,13 +1,11 @@
 <?php
-namespace Adminer;
-
 // not used in a single language version
 
 $langs = array(
 	'en' => 'English', // Jakub Vrána - https://www.vrana.cz
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'bg' => 'Български', // Deyan Delchev
-	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com, Hossain Ahmed Saiman - hossain.ahmed@altscope.com
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
 	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
 	'cs' => 'Čeština', // Jakub Vrána - https://www.vrana.cz
@@ -28,7 +26,6 @@ $langs = array(
 	'ka' => 'ქართული', // Saba Khmaladze skhmaladze@uglt.org
 	'ko' => '한국어', // dalli - skcha67@gmail.com
 	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
-	'lv' => 'Latviešu', // Kristaps Lediņš - https://krysits.com
 	'ms' => 'Bahasa Melayu', // Pisyek
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
@@ -65,7 +62,7 @@ function get_lang() {
 */
 function lang($idf, $number = null) {
 	global $LANG, $translations;
-	$translation = ($translations[$idf] ?: $idf);
+	$translation = ($translations[$idf] ? $translations[$idf] : $idf);
 	if (is_array($translation)) {
 		$pos = ($number == 1 ? 0
 			: ($LANG == 'cs' || $LANG == 'sk' ? ($number && $number < 5 ? 1 : 2) // different forms for 1, 2-4, other
@@ -73,10 +70,9 @@ function lang($idf, $number = null) {
 			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4 except 12-14, other
 			: ($LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
 			: ($LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
-			: ($LANG == 'lv' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number ? 1 : 2)) // different forms for 1 except 11, other, 0
 			: ($LANG == 'bs' || $LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1 except 11, 2-4 except 12-14, other
 			: 1 // different forms for 1, other
-		)))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
+		))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
 		$translation = $translation[$pos];
 	}
 	$args = func_get_args();

adminer/include/pdo.inc.php

@@ -1,35 +1,34 @@
 <?php
-namespace Adminer;
-
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
-	abstract class PdoDb {
+	/*abstract*/ class Min_PDO extends PDO {
-		public $server_info, $affected_rows, $errno, $error;
+		var $_result, $server_info, $affected_rows, $errno, $error;
-		protected $pdo;
+		
-		private $result;
+		function __construct() {
+			global $adminer;
+			$pos = array_search("SQL", $adminer->operators);
+			if ($pos !== false) {
+				unset($adminer->operators[$pos]);
+			}
+		}
 		
 		function dsn($dsn, $username, $password, $options = array()) {
-			$options[\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
-			$options[\PDO::ATTR_STATEMENT_CLASS] = array('Adminer\PdoDbStatement');
 			try {
-				$this->pdo = new \PDO($dsn, $username, $password, $options);
+				parent::__construct($dsn, $username, $password, $options);
 			} catch (Exception $ex) {
 				auth_error(h($ex->getMessage()));
 			}
-			$this->server_info = @$this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION);
+			$this->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
+			$this->server_info = @$this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
 		}
 		
-		abstract function select_db($database);
+		/*abstract function select_db($database);*/
-
-		function quote($string) {
-			return $this->pdo->quote($string);
-		}
 		
 		function query($query, $unbuffered = false) {
-			$result = $this->pdo->query($query);
+			$result = parent::query($query);
 			$this->error = "";
 			if (!$result) {
-				list(, $this->errno, $this->error) = $this->pdo->errorInfo();
+				list(, $this->errno, $this->error) = $this->errorInfo();
 				if (!$this->error) {
 					$this->error = lang('Unknown error.');
 				}
@@ -40,12 +39,12 @@ if (extension_loaded('pdo')) {
 		}
 		
 		function multi_query($query) {
-			return $this->result = $this->query($query);
+			return $this->_result = $this->query($query);
 		}
 		
 		function store_result($result = null) {
 			if (!$result) {
-				$result = $this->result;
+				$result = $this->_result;
 				if (!$result) {
 					return false;
 				}
@@ -59,11 +58,11 @@ if (extension_loaded('pdo')) {
 		}
 		
 		function next_result() {
-			if (!$this->result) {
+			if (!$this->_result) {
 				return false;
 			}
-			$this->result->_offset = 0;
+			$this->_result->_offset = 0;
-			return @$this->result->nextRowset(); // @ - PDO_PgSQL doesn't support it
+			return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it
 		}
 		
 		function result($query, $field = 0) {
@@ -76,15 +75,15 @@ if (extension_loaded('pdo')) {
 		}
 	}
 	
-	class PdoDbStatement extends \PDOStatement {
+	class Min_PDOStatement extends PDOStatement {
-		public $_offset = 0, $num_rows;
+		var $_offset = 0, $num_rows;
 		
 		function fetch_assoc() {
-			return $this->fetch(\PDO::FETCH_ASSOC);
+			return $this->fetch(2); // PDO::FETCH_ASSOC
 		}
 		
 		function fetch_row() {
-			return $this->fetch(\PDO::FETCH_NUM);
+			return $this->fetch(3); // PDO::FETCH_NUM
 		}
 		
 		function fetch_field() {
@@ -94,11 +93,7 @@ if (extension_loaded('pdo')) {
 			$row->charsetnr = (in_array("blob", (array) $row->flags) ? 63 : 0);
 			return $row;
 		}
-
-		function seek($offset) {
-			for ($i=0; $i < $offset; $i++) {
-				$this->fetch();
-			}
-		}
 	}
 }
+
+$drivers = array();

adminer/include/tmpfile.inc.php

@@ -1,8 +1,8 @@
 <?php
-namespace Adminer;
 
 class TmpFile {
-	private $handler, $size;
+	var $handler;
+	var $size;
 	
 	function __construct() {
 		$this->handler = tmpfile();
@@ -18,4 +18,5 @@ class TmpFile {
 		fpassthru($this->handler);
 		fclose($this->handler);
 	}
+	
 }

adminer/include/version.inc.php

@@ -1,4 +1,2 @@
 <?php
-namespace Adminer;
+$VERSION = "4.7.6";
-
-$VERSION = "5.0.4";

adminer/include/xxtea.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 /** PHP implementation of XXTEA encryption algorithm
 * @author Ma Bingyao <andot@ujn.edu.cn>
 * @link http://www.coolcode.cn/?action=show&id=128

adminer/index.php

@@ -7,11 +7,12 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
-namespace Adminer;
-
 include "./include/bootstrap.inc.php";
 include "./include/tmpfile.inc.php";
 
+$enum_length = "'(?:''|[^'\\\\]|\\\\.)*'";
+$inout = "IN|OUT|INOUT";
+
 if (isset($_GET["select"]) && ($_POST["edit"] || $_POST["clone"]) && !$_POST["save"]) {
 	$_GET["edit"] = $_GET["select"];
 }
@@ -58,8 +59,6 @@ if (isset($_GET["download"])) {
 	include "./sequence.inc.php";
 } elseif (isset($_GET["type"])) {
 	include "./type.inc.php";
-} elseif (isset($_GET["check"])) {
-	include "./check.inc.php";
 } elseif (isset($_GET["trigger"])) {
 	include "./trigger.inc.php";
 } elseif (isset($_GET["user"])) {

adminer/indexes.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE, true);
@@ -12,15 +10,13 @@ if (preg_match('~MyISAM|M?aria' . (min_version(5.7, '10.2.2') ? '|InnoDB' : '')
 }
 $indexes = indexes($TABLE);
 $primary = array();
-if (JUSH == "mongo") { // doesn't support primary key
+if ($jush == "mongo") { // doesn't support primary key
 	$primary = $indexes["_id_"];
 	unset($index_types[0]);
 	unset($indexes["_id_"]);
 }
 $row = $_POST;
-if ($row) {
+
-	set_adminer_settings(array("index_options" => $row["options"]));
-}
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 	$alter = array();
 	foreach ($row["indexes"] as $index) {
@@ -37,18 +33,18 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 					$desc = $index["descs"][$key];
 					$set[] = idf_escape($column) . ($length ? "(" . (+$length) . ")" : "") . ($desc ? " DESC" : "");
 					$columns[] = $column;
-					$lengths[] = ($length ?: null);
+					$lengths[] = ($length ? $length : null);
 					$descs[] = $desc;
 				}
 			}
 
+			if ($columns) {
 				$existing = $indexes[$name];
 				if ($existing) {
 					ksort($existing["columns"]);
 					ksort($existing["lengths"]);
 					ksort($existing["descs"]);
-				if (
+					if ($index["type"] == $existing["type"]
-					$index["type"] == $existing["type"]
 						&& array_values($existing["columns"]) === $columns
 						&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
 						&& array_values($existing["descs"]) === $descs
@@ -58,7 +54,6 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 						continue;
 					}
 				}
-			if ($columns) {
 				$alter[] = array($index["type"], $name, $set);
 			}
 		}
@@ -96,21 +91,14 @@ if (!$row) {
 	$indexes[] = array("columns" => array(1 => ""));
 	$row["indexes"] = $indexes;
 }
-$lengths = (JUSH == "sql" || JUSH == "mssql");
-$show_options = ($_POST ? $_POST["options"] : adminer_setting("index_options"));
 ?>
 
 <form action="" method="post">
 <div class="scrollable">
-<table class="nowrap">
+<table cellspacing="0" class="nowrap">
 <thead><tr>
 <th id="label-type"><?php echo lang('Index Type'); ?>
-<th><input type="submit" class="wayoff"><?php
+<th><input type="submit" class="wayoff"><?php echo lang('Column (length)'); ?>
-echo lang('Column') . ($lengths ? "<span class='idxopts" . ($show_options ? "" : " hidden") . "'> (" . lang('length') . ")</span>" : "");
-if ($lengths || support("descidx")) {
-	echo checkbox("options", 1, $show_options, lang('Options'), "indexOptionsShow(this.checked)", "jsonly") . "\n";
-}
-?>
 <th id="label-name"><?php echo lang('Name'); ?>
 <th><noscript><?php echo "<input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?></noscript>
 </thead>
@@ -126,7 +114,7 @@ if ($primary) {
 $j = 1;
 foreach ($row["indexes"] as $index) {
 	if (!$_POST["drop_col"] || $j != key($_POST["drop_col"])) {
-		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(this);" : ""), "label-type");
+		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(this);" : 1), "label-type");
 
 		echo "<td>";
 		ksort($index["columns"]);
@@ -136,12 +124,11 @@ foreach ($row["indexes"] as $index) {
 				" name='indexes[$j][columns][$i]' title='" . lang('Column') . "'",
 				($fields ? array_combine($fields, $fields) : $fields),
 				$column,
-				"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape(JUSH == "sql" ? "" : $_GET["indexes"] . "_") . "')"
+				"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "')"
 			);
-			echo "<span class='idxopts" . ($show_options ? "" : " hidden") . "'>";
+			echo ($jush == "sql" || $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
-			echo ($lengths ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
 			echo (support("descidx") ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
-			echo "</span> </span>";
+			echo " </span>";
 			$i++;
 		}
 

adminer/lang/ar.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
@@ -32,6 +30,7 @@ $translations = array(
 	'Create database' => 'إنشاء قاعدة بيانات',
 	'SQL command' => 'استعلام SQL',
 	'Logout' => 'تسجيل الخروج',
+	'database' => 'قاعدة بيانات',
 	'Use' => 'استعمال',
 	'No tables.' => 'لا توجد جداول.',
 	'select' => 'تحديد',
@@ -77,7 +76,7 @@ $translations = array(
 	'Routine has been called, %d row(s) affected.' => 'تم استدعاء الروتين, عدد الأسطر المعدلة %d.',
 	'Call' => 'استدعاء',
 	'No extension' => 'امتداد غير موجود',
-	'None of the supported PHP extensions (%s) are available.' => 'إمتدادات php (%s) المدعومة غير موجودة.',
+	'None of the supported PHP extensions (%s) are available.' => 'إمتدادات php المدعومة غير موجودة.',
 	'Session support must be enabled.' => 'عليك تفعيل نظام الجلسات.',
 	'Session expired, please login again.' => 'إنتهت الجلسة، من فضلك أعد تسجيل الدخول.',
 	'Text length' => 'طول النص',
@@ -95,7 +94,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'نوع المؤشر',
-	'length' => 'الطول',
+	'Column (length)' => 'العمود (الطول)',
 	'View has been dropped.' => 'تم مسح العرض.',
 	'View has been altered.' => 'تم تعديل العرض.',
 	'View has been created.' => 'تم إنشاء العرض.',
@@ -171,8 +170,8 @@ $translations = array(
 	'Tables and views' => 'الجداول و العروض',
 	'Engine' => 'المحرك',
 	'Collation' => 'ترتيب',
-	'Data Length' => 'طول المعطيات',
+	'Data Length' => 'طول المعطيات.',
-	'Index Length' => 'طول المؤشر',
+	'Index Length' => 'طول المؤشر.',
 	'Data Free' => 'المساحة الحرة',
 	'Rows' => 'الأسطر',
 	',' => ',',
@@ -192,7 +191,7 @@ $translations = array(
 	'Partitions' => 'التقسيمات',
 	'Partition name' => 'اسم التقسيم',
 	'Values' => 'القيم',
-	'%d row(s) have been imported.' => 'تم استيراد %d سطرا.',
+	'%d row(s) have been imported.' => 'تم استيراد %d سطرا',
 	'anywhere' => 'في اي مكان',
 	'Import' => 'استيراد',
 	'Stop on error' => 'أوقف في حالة حدوث خطأ',
@@ -251,8 +250,8 @@ $translations = array(
 	'Network' => 'شبكة',
 	'Geometry' => 'هندسة',
 	'File exists.' => 'الملف موجود.',
-	'Attachments' => 'ملفات مرفقة',
+	'Attachments' => 'ملفات مرفقة.',
-	'Item%s has been inserted.' => '%sتم إدراج العنصر.',
+	'Item%s has been inserted.' => 'تم إدراج العنصر.',
 	'now' => 'الآن',
 	'%d query(s) executed OK.' => array('تم تنفيذ الاستعلام %d بنجاح.', 'تم تنفيذ الاستعلامات %d بنجاح.'),
 	'Show only errors' => 'إظهار الأخطاء فقط',

adminer/lang/bg.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Система',
@@ -80,6 +78,7 @@ $translations = array(
 	'Data' => 'Данни',
 	
 	'Database' => 'База данни',
+	'database' => 'база данни',
 	'Use' => 'Избор',
 	'Select database' => 'Избор на база данни',
 	'Invalid database.' => 'Невалидна база данни.',
@@ -194,7 +193,7 @@ $translations = array(
 	'Alter indexes' => 'Промяна на индекси',
 	'Add next' => 'Добавяне на следващ',
 	'Index Type' => 'Вид на индекса',
-	'length' => 'дължина',
+	'Column (length)' => 'Колона (дължина)',
 	
 	'Foreign keys' => 'Препратки',
 	'Foreign key' => 'Препратка',

adminer/lang/bn.inc.php

@@ -1,54 +1,53 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'লগইন',
-	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
+	'Logout successful.' => 'লগআউট সম্পন্ন হয়েছে।',
 	'Invalid credentials.' => 'ভুল পাসওয়ার্ড।',
 	'Server' => 'সার্ভার',
 	'Username' => 'ইউজারের নাম',
 	'Password' => 'পাসওয়ার্ড',
-	'Select database' => 'ডাটাবেজ নির্বাচন করুন',
+	'Select database' => 'ডাটাবেজ নির্বাচন করো',
-	'Invalid database.' => 'অকার্যকর ডাটাবেজ।',
+	'Invalid database.' => 'ভুল ডাটাবেজ।',
 	'Table has been dropped.' => 'টেবিল মুছে ফেলা হয়েছে।',
-	'Table has been altered.' => 'টেবিল পরিবর্তন করা হয়েছে।',
+	'Table has been altered.' => 'টেবিল সম্পাদনা করা হয়েছে।',
 	'Table has been created.' => 'টেবিল তৈরী করা হয়েছে।',
-	'Alter table' => 'টেবিল পরিবর্তন করুন',
+	'Alter table' => 'টেবিল সম্পাদনা',
-	'Create table' => 'টেবিল তৈরী করুন',
+	'Create table' => 'টেবিল তৈরী করো',
 	'Table name' => 'টেবিলের নাম',
 	'engine' => 'ইন্জিন',
-	'collation' => 'সমষ্টি',
+	'collation' => 'কলোকেশন',
 	'Column name' => 'কলামের নাম',
-	'Type' => 'ধরণ',
+	'Type' => 'টাইপ',
 	'Length' => 'দৈর্ঘ্য',
 	'Auto Increment' => 'স্বয়ংক্রিয় বৃদ্ধি',
-	'Options' => 'বিকল্পসমূহ',
+	'Options' => 'অপশন',
-	'Save' => 'সংরক্ষণ করুন',
+	'Save' => 'সংরক্ষণ',
 	'Drop' => 'মুছে ফেলো',
 	'Database has been dropped.' => 'ডাটাবেজ মুছে ফেলা হয়েছে।',
 	'Database has been created.' => 'ডাটাবেজ তৈরী করা হয়েছে।',
 	'Database has been renamed.' => 'ডাটাবেজের নতুন নামকরণ করা হয়েছে।',
-	'Database has been altered.' => 'ডাটাবেজ পরিবর্তন করা হয়েছে।',
+	'Database has been altered.' => 'ডাটাবেজ সম্পাদনা করা হয়েছে।',
-	'Alter database' => 'ডাটাবেজ পরিবর্তন করুন',
+	'Alter database' => 'ডাটাবেজ সম্পাদনা',
-	'Create database' => 'ডাটাবেজ তৈরী করুন',
+	'Create database' => 'ডাটাবেজ তৈরী',
-	'SQL command' => 'SQL-কমান্ড',
+	'SQL command' => 'SQL-কোয়্যারী',
 	'Logout' => 'লগআউট',
+	'database' => 'ডাটাবেজ',
 	'Use' => 'ব্যবহার',
 	'No tables.' => 'কোন টেবিল নাই।',
 	'select' => 'নির্বাচন',
 	'Item has been deleted.' => 'বিষয়বস্তু মুছে ফেলা হয়েছে।',
-	'Item has been updated.' => 'বিষয়বস্তু হালনাগাদ করা হয়েছে।',
+	'Item has been updated.' => 'বিষয়বস্তু আপডেট করা হয়েছে।',
-	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ%s সংযোজন করা হয়েছে।',
+	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ সংযোজন করা হয়েছে।',
 	'Edit' => 'সম্পাদনা',
 	'Insert' => 'সংযোজন',
-	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন করুন',
+	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন',
-	'Delete' => 'মুছে ফেলুন',
+	'Delete' => 'মুছে ফেলো',
 	'Database' => 'ডাটাবেজ',
 	'Routines' => 'রুটিনসমূহ',
 	'Indexes have been altered.' => 'সূচীসমূহ সম্পাদনা করা হয়েছে।',
 	'Indexes' => 'সূচীসমূহ',
-	'Alter indexes' => 'সূচীসমূহ পরিবর্তন করুন',
+	'Alter indexes' => 'সূচীসমূহ সম্পাদনা',
-	'Add next' => 'পরবর্তী সংযোজন করুন',
+	'Add next' => 'সংযোজন',
 	'Language' => 'ভাষা',
 	'Select' => 'নির্বাচন',
 	'New item' => 'নতুন বিষয়বস্তু',
@@ -61,90 +60,90 @@ $translations = array(
 	'edit' => 'সম্পাদনা',
 	'Page' => 'পৃষ্ঠা',
 	'Query executed OK, %d row(s) affected.' => array('কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।', 'কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।'),
-	'Error in query' => 'অনুসন্ধানে ভুল আছে',
+	'Error in query' => 'কোয়্যারীতে ভুল আছে।',
 	'Execute' => 'সম্পাদন করো',
 	'Table' => 'টেবিল',
 	'Foreign keys' => 'ফরেন কী',
 	'Triggers' => 'ট্রিগার',
 	'View' => 'ভিউ',
 	'Unable to select the table' => 'টেবিল নির্বাচন করতে অক্ষম',
-	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্মটি আবার পাঠান।',
+	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্ম আবার পাঠাও।',
 	'Comment' => 'মন্তব্য',
 	'Default values' => 'ডিফল্ট মান',
 	'%d byte(s)' => array('%d বাইট', '%d বাইটসমূহ'),
-	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নেই।',
+	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নাই।',
 	'Unable to upload a file.' => 'ফাইল আপলোড করা সম্ভব হচ্ছে না।',
 	'File upload' => 'ফাইল আপলোড',
 	'File uploads are disabled.' => 'ফাইল আপলোড নিষ্ক্রিয় করা আছে।',
-	'Routine has been called, %d row(s) affected.' => array('রুটিন কল করা হয়েছে, %d টি সারি(সমূহ) প্রভাবিত হয়েছে।', 'রুটিন কল করা হয়েছে, %d টি সারি(সমূহ) প্রভাবিত হয়েছে।'),
+	'Routine has been called, %d row(s) affected.' => array('রুটিন কল করা হয়েছে, %d টি সারি (সমূহ) প্রভাবিত হয়েছে।', 'রুটিন কল করা হয়েছে, %d টি সারি (সমূহ) প্রভাবিত হয়েছে।'),
 	'Call' => 'কল',
 	'No extension' => 'কোন এক্সটেনশান নাই',
 	'None of the supported PHP extensions (%s) are available.' => 'কোন PHP সমর্থিত এক্সটেনশন (%s) পাওয়া যায় নাই।',
 	'Session support must be enabled.' => 'সেশন সমর্থন সক্রিয় করা আবশ্যক।',
-	'Session expired, please login again.' => 'সেশনের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
+	'Session expired, please login again.' => 'সেশানের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
 	'Text length' => 'টেক্সট দৈর্ঘ্য',
 	'Foreign key has been dropped.' => 'ফরেন কী মুছে ফেলা হয়েছে।',
-	'Foreign key has been altered.' => 'ফরেন কী পরিবর্তন করা হয়েছে।',
+	'Foreign key has been altered.' => 'ফরেন কী সম্পাদনা করা হয়েছে।',
 	'Foreign key has been created.' => 'ফরেন কী তৈরী করা হয়েছে।',
 	'Foreign key' => 'ফরেন কী ',
 	'Target table' => 'টার্গেট টেবিল',
 	'Change' => 'পরিবর্তন',
 	'Source' => 'উৎস',
 	'Target' => 'লক্ষ্য',
-	'Add column' => 'কলাম সংযোজন করুন',
+	'Add column' => 'কলাম সংযোজন',
-	'Alter' => 'পরিবর্তন',
+	'Alter' => 'সম্পাদনা',
-	'Add foreign key' => 'ফরেন কী সংযোজন করুন',
+	'Add foreign key' => 'ফরেন কী সংযোজন করো',
 	'ON DELETE' => 'অন ডিলিট',
 	'ON UPDATE' => 'অন আপডেট',
 	'Index Type' => 'সূচী-ধরণ',
-	'length' => 'দৈর্ঘ্য',
+	'Column (length)' => 'কলাম (দৈর্ঘ্য)',
 	'View has been dropped.' => 'ভিউ মুছে ফেলা হয়েছে।',
-	'View has been altered.' => 'ভিউ পরিবর্তন করা হয়েছে।',
+	'View has been altered.' => 'ভিউ সম্পাদনা করা হয়েছে।',
 	'View has been created.' => 'ভিউ তৈরী করা হয়েছে।',
-	'Alter view' => 'ভিউ পরিবর্তন করুন',
+	'Alter view' => 'ভিউ সম্পাদনা করো',
-	'Create view' => 'ভিউ তৈরী করুন',
+	'Create view' => 'ভিউ তৈরী করো',
 	'Name' => 'নাম',
 	'Process list' => 'প্রসেস তালিকা',
-	'%d process(es) have been killed.' => array('%d টি প্রসেস(সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস(সমূহ) বিনষ্ট করা হয়েছে।'),
+	'%d process(es) have been killed.' => array('%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।'),
 	'Kill' => 'বিনষ্ট করো',
 	'Parameter name' => 'প্যারামিটারের নাম',
 	'Database schema' => 'ডাটাবেজ স্কিমা',
-	'Create procedure' => 'কার্যপ্রণালী তৈরী করুন',
+	'Create procedure' => 'প্রসিডিওর তৈরী করো',
-	'Create function' => 'ফাংশন তৈরী করুন',
+	'Create function' => 'ফাংশন তৈরী করো',
 	'Routine has been dropped.' => 'রুটিন মুছে ফেলা হয়েছে।',
-	'Routine has been altered.' => 'রুটিন পরিবর্তন করা হয়েছে।',
+	'Routine has been altered.' => 'রুটিন সম্পাদনা করা হয়েছে।',
 	'Routine has been created.' => 'রুটিন তৈরী করা হয়েছে।',
-	'Alter function' => 'ফাংশন পরিবর্তন করুন',
+	'Alter function' => 'ফাংশন সম্পাদনা করো',
-	'Alter procedure' => 'কার্যপ্রণালী পরিবর্তন করুন',
+	'Alter procedure' => 'প্রসিডিওর সম্পাদনা করো',
 	'Return type' => 'রিটার্ন টাইপ',
-	'Add trigger' => 'ট্রিগার সংযোজন করুন',
+	'Add trigger' => 'ট্রিগার সংযোজন করো',
 	'Trigger has been dropped.' => 'ট্রিগার মুছে ফেলা হয়েছে।',
-	'Trigger has been altered.' => 'ট্রিগার পরিবর্তন করা হয়েছে।',
+	'Trigger has been altered.' => 'ট্রিগার সম্পাদনা করা হয়েছে।',
 	'Trigger has been created.' => 'ট্রিগার তৈরী করা হয়েছে।',
-	'Alter trigger' => 'ট্রিগার পরিবর্তন করুন',
+	'Alter trigger' => 'ট্রিগার সম্পাদনা করো',
-	'Create trigger' => 'ট্রিগার তৈরী করুন',
+	'Create trigger' => 'ট্রিগার তৈরী করো',
 	'Time' => 'সময়',
 	'Event' => 'ইভেন্ট',
 	'%s version: %s through PHP extension %s' => 'ভার্সন %s: %s, %s PHP এক্সটেনশনের মধ্য দিয়ে',
 	'%d row(s)' => array('%d সারি', '%d সারি সমূহ'),
-	'Remove' => 'মুছে ফেলুন',
+	'Remove' => 'অপসারণ',
-	'Are you sure?' => 'আপনি কি নিশ্চিত?',
+	'Are you sure?' => 'তুমি কি নিশ্চিত?',
 	'Privileges' => 'প্রিভিলেজেস',
-	'Create user' => 'ব্যবহারকারি তৈরী করুন',
+	'Create user' => 'ইউজার তৈরী করো',
-	'User has been dropped.' => 'ব্যবহারকারি মুছে ফেলা হয়েছে।',
+	'User has been dropped.' => 'ইউজার মুছে ফেলা হয়েছে।',
-	'User has been altered.' => 'ব্যবহারকারি সম্পাদনা করা হয়েছে।',
+	'User has been altered.' => 'ইউজার সম্পাদনা করা হয়েছে।',
-	'User has been created.' => 'ব্যবহারকারি তৈরী করা হয়েছে।',
+	'User has been created.' => 'ইউজার তৈরী করা হয়েছে।',
-	'Hashed' => 'হ্যাশড',
+	'Hashed' => 'হ্যাসড',
 	'Column' => 'কলাম',
 	'Routine' => 'রুটিন',
-	'Grant' => 'অনুমতি',
+	'Grant' => 'গ্র্যান্ট',
-	'Revoke' => 'প্রত্যাহার',
+	'Revoke' => 'রিভোক',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো।',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো',
 	'Logged as: %s' => '%s হিসাবে লগড',
 	'Move up' => 'উপরে স্থানান্তর',
 	'Move down' => 'নীচে স্থানান্তর',
 	'Functions' => 'ফাংশন সমূহ',
-	'Aggregation' => 'সমষ্টি',
+	'Aggregation' => 'মোট পরিমাণ',
 	'Export' => 'এক্সপোর্ট',
 	'Output' => 'আউটপুট',
 	'open' => 'খোলা',
@@ -163,8 +162,8 @@ $translations = array(
 	'Schedule' => 'সময়সূচি',
 	'Start' => 'শুরু',
 	'End' => 'সমাপ্তি',
-	'Status' => 'অবস্থা',
+	'Status' => 'স্ট্যাটাস',
-	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করুন',
+	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করো',
 	'Tables and views' => 'টেবিল এবং ভিউ সমূহ',
 	'Data Length' => 'ডাটার দৈর্ঘ্য',
 	'Index Length' => 'ইনডেক্স এর দৈর্ঘ্য',
@@ -175,18 +174,18 @@ $translations = array(
 	'Check' => 'পরীক্ষা',
 	'Repair' => 'মেরামত',
 	'Truncate' => 'ছাঁটাই',
-	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে।',
+	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
-	'Rows' => 'সারিসমূহ',
+	'Rows' => 'সারি',
 	',' => ',',
 	'0123456789' => '০১২৩৪৫৬৭৮৯',
 	'Tables have been moved.' => 'টেবিল স্থানান্তর করা হয়েছে।',
-	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করুন',
+	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করো',
-	'Move' => 'স্থানান্তর করুন',
+	'Move' => 'স্থানান্তর করো',
 	'Engine' => 'ইঞ্জিন',
-	'Save and continue edit' => 'সংরক্ষণ করুন এবং সম্পাদনা চালিয়ে যান',
+	'Save and continue edit' => 'সংরক্ষণ করো এবং সম্পাদনা চালিয়ে যাও',
 	'original' => 'প্রকৃত',
 	'Tables have been dropped.' => 'টেবিলসমূহ মুছে ফেলা হয়েছে।',
-	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে।',
+	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
 	'Whole result' => 'সম্পূর্ণ ফলাফল',
 	'Clone' => 'ক্লোন',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s বৃদ্ধি করুন।',
@@ -194,10 +193,10 @@ $translations = array(
 	'Partitions' => 'পার্টিশন',
 	'Partition name' => 'পার্টিশনের নাম',
 	'Values' => 'মানসমূহ',
-	'%d row(s) have been imported.' => array('%d টি সারি(সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি(সমূহ) ইমপোর্ট করা হয়েছে।'),
+	'%d row(s) have been imported.' => array('%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।'),
 	'anywhere' => 'যে কোন স্থানে',
 	'Import' => 'ইমপোর্ট',
-	'Stop on error' => 'ত্রুটি পেলে থেমে যান',
+	'Stop on error' => 'ত্রুটি পেলে থেমে যাও',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
 	'[yyyy]-mm-dd' => 't.m.[jjjj]',
@@ -207,7 +206,7 @@ $translations = array(
 	'Relations' => 'সম্পর্ক',
 	'Run file' => 'ফাইল চালাও',
 	'Clear' => 'সাফ করো',
-	'Maximum allowed file size is %sB.' => 'সর্বাধিক অনুমোদিত ফাইল সাইজ %sB।',
+	'Maximum allowed file size is %sB.' => 'সর্বাধিক অনুমোদিত ফাইল সাইজ %sB.',
 	'Numbers' => 'সংখ্যা',
 	'Date and time' => 'তারিখ এবং সময়',
 	'Strings' => 'স্ট্রিং',
@@ -217,14 +216,14 @@ $translations = array(
 	'E-mail' => '​​ই-মেইল',
 	'From' => 'থেকে',
 	'Subject' => 'বিষয়',
-	'Send' => 'পাঠান',
+	'Send' => 'পাঠাও',
-	'%d e-mail(s) have been sent.' => array('%d ইমেইল(গুলি) পাঠানো হয়েছে।', '%d ইমেইল(গুলি) পাঠানো হয়েছে।'),
+	'%d e-mail(s) have been sent.' => array('%d ইমেইল (গুলি) পাঠানো হয়েছে।', '%d ইমেইল (গুলি) পাঠানো হয়েছে।'),
 	'Webserver file %s' => 'ওয়েবসার্ভার ফাইল %s',
-	'File does not exist.' => 'ফাইলটির কোন অস্তিত্ব নেই।',
+	'File does not exist.' => 'ফাইলের কোন অস্তিত্ব নেই।',
 	'%d in total' => 'সর্বমোটঃ %d টি',
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
-	'Search data in tables' => 'টেবিলে তথ্য খুঁজুন',
+	'Search data in tables' => 'টেবিলে খোঁজ করো',
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',
@@ -237,32 +236,32 @@ $translations = array(
 	'Sequence has been dropped.' => 'অনুক্রম মুছে ফেলা হয়েছে।',
 	'Sequence has been created.' => 'অনুক্রম তৈরি করা হয়েছে।',
 	'Sequence has been altered.' => 'অনুক্রম সম্পাদনা করা হয়েছে।',
-	'User types' => 'ব্যবহারকারির ধরণ',
+	'User types' => 'ইউজারের টাইপ',
-	'Create type' => 'ধরণ তৈরী করুন',
+	'Create type' => 'টাইপ তৈরী করো',
-	'Alter type' => 'ধরণ পরিবর্তন করুন',
+	'Alter type' => 'টাইপ পরিবর্তন করো',
-	'Type has been dropped.' => 'ধরণ মুছে ফেলা হয়েছে।',
+	'Type has been dropped.' => 'টাইপ মুছে ফেলা হয়েছে।',
-	'Type has been created.' => 'ধরণ তৈরি করা হয়েছে।',
+	'Type has been created.' => 'টাইপ তৈরি করা হয়েছে।',
-	'Use edit link to modify this value.' => 'এই মানটি পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করুন।',
+	'Use edit link to modify this value.' => 'এই মান পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করো।',
 	'last' => 'সর্বশেষ',
 	'From server' => 'সার্ভার থেকে',
 	'System' => 'সিস্টেম',
 	'Select data' => 'তথ্য নির্বাচন করো',
-	'Show structure' => 'গঠন দেখান',
+	'Show structure' => 'গঠন দেখাও',
 	'empty' => 'খালি',
 	'Network' => 'নেটওয়ার্ক',
 	'Geometry' => 'জ্যামিতি',
 	'File exists.' => 'ফাইল রয়েছে।',
-	'Attachments' => 'সংযুক্তিগুলো',
+	'Attachments' => 'সংযুক্তি',
-	'%d query(s) executed OK.' => array('SQL-অনুসন্ধান সফলভাবে সম্পন্ন হয়েছে।', '%d SQL-অনুসন্ধানসমূহ সফলভাবে সম্পন্ন হয়েছে।'),
+	'%d query(s) executed OK.' => array('SQL-কোয়্যারী সফলভাবে সম্পন্ন হয়েছে', '%d SQL-কোয়্যারীসমূহ সফলভাবে সম্পন্ন হয়েছে'),
-	'Show only errors' => 'শুধুমাত্র ত্রুটিগুলো দেখান',
+	'Show only errors' => 'শুধুমাত্র ত্রুটি দেখাও',
 	'Refresh' => 'রিফ্রেশ',
 	'Invalid schema.' => 'অবৈধ স্কিমা।',
-	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করুন।',
+	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করো।',
 	'now' => 'এখন',
 	'ltr' => 'ltr',
-	'Tables have been copied.' => 'টেবিলগুলো কপি করা হয়েছে।',
+	'Tables have been copied.' => 'টেবিল কপি করা হয়েছে।',
 	'Copy' => 'কপি',
 	'Permanent link' => 'স্থায়ী লিংক',
-	'Edit all' => 'সবগুলো সম্পাদনা করুন',
+	'Edit all' => 'সকল সম্পাদনা করো',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/bs.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -16,7 +14,7 @@ $translations = array(
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Nevažeći CSRF kod. Proslijedite ponovo formu.',
 	'No extension' => 'Bez dodataka',
-	'None of the supported PHP extensions (%s) are available.' => 'Nijedan od podržanih PHP dodataka (%s) nije dostupan.',
+	'None of the supported PHP extensions (%s) are available.' => 'Nijedan od podržanih PHP dodataka nije dostupan.',
 	'Session support must be enabled.' => 'Morate omogućiti podršku za sesije.',
 	'Session expired, please login again.' => 'Vaša sesija je istekla, prijavite se ponovo.',
 	'%s version: %s through PHP extension %s' => '%s verzija: %s pomoću PHP dodatka je %s',
@@ -75,6 +73,7 @@ $translations = array(
 	'Data' => 'Podaci',
 
 	'Database' => 'Baza podataka',
+	'database' => 'baza podataka',
 	'Use' => 'Koristi',
 	'Select database' => 'Izaberite bazu',
 	'Invalid database.' => 'Neispravna baza podataka.',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Ažuriraj indekse',
 	'Add next' => 'Dodaj slijedeći',
 	'Index Type' => 'Tip indeksa',
-	'length' => 'dužina',
+	'Column (length)' => 'kolumna (dužina)',
 
 	'Foreign keys' => 'Strani ključevi',
 	'Foreign key' => 'Strani ključ',

adminer/lang/ca.inc.php

@@ -1,10 +1,8 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid credentials.' => 'Credencials invàlides.',
+	'Invalid credentials.' => 'Credencials invàlids.',
 	'Server' => 'Servidor',
 	'Username' => 'Nom d\'usuari',
 	'Password' => 'Contrasenya',
@@ -33,10 +31,11 @@ $translations = array(
 	'Create database' => 'Crea una base de dades',
 	'SQL command' => 'Ordre SQL',
 	'Logout' => 'Desconnecta',
+	'database' => 'base de dades',
 	'Use' => 'Utilitza',
 	'No tables.' => 'No hi ha cap taula.',
 	'select' => 'registres',
-	'Item has been deleted.' => 'S\'ha suprimit l\'element.',
+	'Item has been deleted.' => 'S\'ha suprmit l\'element.',
 	'Item has been updated.' => 'S\'ha actualitzat l\'element.',
 	'Item%s has been inserted.' => 'S\'ha insertat l\'element%s.',
 	'Edit' => 'Edita',
@@ -45,9 +44,9 @@ $translations = array(
 	'Delete' => 'Suprimeix',
 	'Database' => 'Base de dades',
 	'Routines' => 'Rutines',
-	'Indexes have been altered.' => 'S\'han modificat els índex.',
+	'Indexes have been altered.' => 'S\'han modificat els índexs.',
 	'Indexes' => 'Índexs',
-	'Alter indexes' => 'Modifica els índex',
+	'Alter indexes' => 'Modifica els índexs',
 	'Add next' => 'Afegeix el següent',
 	'Language' => 'Idioma',
 	'Select' => 'Selecciona',
@@ -75,11 +74,11 @@ $translations = array(
 	'No commands to execute.' => 'Cap comanda per executar.',
 	'Unable to upload a file.' => 'Impossible adjuntar el fitxer.',
 	'File upload' => 'Adjunta un fitxer',
-	'File uploads are disabled.' => 'La pujada de fitxers està desactivada.',
+	'File uploads are disabled.' => 'L\'ddjunció de fitxers està desactivada.',
 	'Routine has been called, %d row(s) affected.' => array('S\'ha cridat la rutina, %d registre modificat.', 'S\'ha cridat la rutina, %d registres modificats.'),
 	'Call' => 'Crida',
 	'No extension' => 'Cap extensió',
-	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP suportades (%s) disponible.',
+	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP soporatades (%s) disponible.',
 	'Session support must be enabled.' => 'Cal que estigui permès l\'us de sessions.',
 	'Session expired, please login again.' => 'La sessió ha expirat, torna a iniciar-ne una.',
 	'Text length' => 'Longitud del text',
@@ -87,7 +86,7 @@ $translations = array(
 	'Foreign key has been altered.' => 'S\'ha modificat la clau forana.',
 	'Foreign key has been created.' => 'S\'ha creat la clau forana.',
 	'Foreign key' => 'Clau forana',
-	'Target table' => 'Taula de destinació',
+	'Target table' => 'Taula de destí',
 	'Change' => 'Canvi',
 	'Source' => 'Font',
 	'Target' => 'Destí',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipus d\'índex',
-	'length' => 'longitud',
+	'Column (length)' => 'Columna (longitud)',
 	'View has been dropped.' => 'S\'ha suprimit la vista.',
 	'View has been altered.' => 'S\'ha modificat la vista.',
 	'View has been created.' => 'S\'ha creat la vista.',
@@ -140,7 +139,7 @@ $translations = array(
 	'Grant' => 'Grant',
 	'Revoke' => 'Revoke',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Les dades POST són massa grans. Redueix les dades o incrementa la directiva de configuració %s.',
-	'Logged as: %s' => 'Connectat com a: %s',
+	'Logged as: %s' => 'Connectat com: %s',
 	'Move up' => 'Mou a dalt',
 	'Move down' => 'Mou a baix',
 	'Functions' => 'Funcions',
@@ -205,7 +204,7 @@ $translations = array(
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
 	'History' => 'Història',
 	'Variables' => 'Variables',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les columnes d\'origen i de destinació han de ser del mateix tipus, la columna de destinació ha d\'estar indexada i les dades referenciades han d\'existir.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les columnes origen i destí han de ser del mateix tipus, la columna destí ha d\'estar indexada i les dades referenciades han d\'existir.',
 	'E-mail' => 'Correu electrònic',
 	'From' => 'De',
 	'Subject' => 'Assumpte',

adminer/lang/cs.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Systém',
@@ -25,7 +23,7 @@ $translations = array(
 	'No extension' => 'Žádné rozšíření',
 	'None of the supported PHP extensions (%s) are available.' => 'Není dostupné žádné z podporovaných PHP rozšíření (%s).',
 	'Connecting to privileged ports is not allowed.' => 'Připojování k privilegovaným portům není povoleno.',
-	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte rozšíření %s nebo %s.',
+	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte extenze %s nebo %s.',
 	'Session support must be enabled.' => 'Session proměnné musí být povolené.',
 	'Session expired, please login again.' => 'Session vypršela, přihlašte se prosím znovu.',
 	'The action will be performed after successful login with the same credentials.' => 'Akce bude provedena po úspěšném přihlášení se stejnými přihlašovacími údaji.',
@@ -90,6 +88,7 @@ $translations = array(
 	'Data' => 'Data',
 	
 	'Database' => 'Databáze',
+	'database' => 'databáze',
 	'DB' => 'DB',
 	'Use' => 'Vybrat',
 	'Select database' => 'Vybrat databázi',
@@ -207,7 +206,7 @@ $translations = array(
 	'Alter indexes' => 'Pozměnit indexy',
 	'Add next' => 'Přidat další',
 	'Index Type' => 'Typ indexu',
-	'length' => 'délka',
+	'Column (length)' => 'Sloupec (délka)',
 	
 	'Foreign keys' => 'Cizí klíče',
 	'Foreign key' => 'Cizí klíč',
@@ -257,8 +256,8 @@ $translations = array(
 	'%d row(s)' => array('%d řádek', '%d řádky', '%d řádků'),
 	'Page' => 'Stránka',
 	'last' => 'poslední',
-	'Load more data' => 'Načíst další data',
+	'Load more data' => 'Nahrát další data',
-	'Loading' => 'Načítá se',
+	'Loading' => 'Nahrává se',
 	'Whole result' => 'Celý výsledek',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
 	
@@ -347,12 +346,4 @@ $translations = array(
 	'Type has been dropped.' => 'Typ byl odstraněn.',
 	'Type has been created.' => 'Typ byl vytvořen.',
 	'Alter type' => 'Pozměnit typ',
-
-	// Table check constraints
-	'Checks' => 'Kontroly',
-	'Create check' => 'Vytvořit kontrolu',
-	'Alter check' => 'Změnit kontrolu',
-	'Check has been created.' => 'Kontrola byla vytvořena.',
-	'Check has been altered.' => 'Kontrola byla změněna.',
-	'Check has been dropped.' => 'Kontrola byla odstraněna.',
 );

adminer/lang/da.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'System' => 'System',
 	'Server' => 'Server',
@@ -66,6 +64,7 @@ $translations = array(
 	'Format' => 'Format',
 	'Data' => 'Data',
 	'Database' => 'Database',
+	'database' => 'database',
 	'Use' => 'Brug',
 	'Select database' => 'Vælg database',
 	'Invalid database.' => 'Ugyldig database.',
@@ -166,7 +165,7 @@ $translations = array(
 	'Alter indexes' => 'Ændre indekser',
 	'Add next' => 'Læg til næste',
 	'Index Type' => 'Indekstype',
-	'length' => 'længde',
+	'Column (length)' => 'Kolonne (længde)',
 	'Foreign keys' => 'Fremmednøgler',
 	'Foreign key' => 'Fremmednøgle',
 	'Foreign key has been dropped.' => 'Fremmednøglen er slettet.',

adminer/lang/de.inc.php

@@ -1,10 +1,8 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>',
 	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
@@ -34,7 +32,8 @@ $translations = array(
 	'Create database' => 'Datenbank erstellen',
 	'SQL command' => 'SQL-Kommando',
 	'Logout' => 'Abmelden',
-	'Use' => 'Auswählen',
+	'database' => 'Datenbank',
+	'Use' => 'Benutzung',
 	'No tables.' => 'Keine Tabellen.',
 	'select' => 'zeigen',
 	'Item has been deleted.' => 'Datensatz wurde gelöscht.',
@@ -98,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index-Typ',
-	'length' => 'Länge',
+	'Column (length)' => 'Spalte (Länge)',
 	'View has been dropped.' => 'View wurde entfernt.',
 	'View has been altered.' => 'View wurde geändert.',
 	'View has been created.' => 'View wurde erstellt.',
@@ -281,25 +280,10 @@ $translations = array(
 	'If you did not send this request from Adminer then close this page.' => 'Wenn Sie diese Anfrage nicht von Adminer gesendet haben, schließen Sie diese Seite.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Sie können eine große SQL-Datei per FTP hochladen und dann vom Server importieren.',
 	'You are offline.' => 'Sie sind offline.',
-	'You have no privileges to update this table.' => 'Sie haben keine Rechte, diese Tabelle zu aktualisieren.',
+	'You have no privileges to update this table.' => 'Sie haben keine Rechte, um diese Tabelle zu aktualisieren.' ,
 	'Saving' => 'Speichere',
 	'yes' => 'ja',
 	'no' => 'nein',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/"%s>Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
 	'%d / ' => '%d / ',
-	'Drop %s?' => '%s entfernen?',
-	'Materialized view' => 'Strukturierte Ansicht',
-	'Vacuum' => 'Vacuum',
-	'overwrite' => 'überschreiben',
-	'DB' => 'DB',
-	'ATTACH queries are not supported.' => 'ATTACH Abfragen werden nicht unterstützt.',
-	'Warnings' => 'Warnungen',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer unterstützt den Zugriff auf eine Datenbank ohne Passwort nicht, <a href="https://www.adminer.org/en/password/"%s>mehr Informationen</a>.',
-	'Full table scan' => 'Vollständige Überprüfung der Tabelle',
-	'The action will be performed after successful login with the same credentials.' => 'Die Aktion wird nach erfolgreicher Anmeldung mit denselben Anmeldedaten ausgeführt.',
-	'Connecting to privileged ports is not allowed.' => 'Die Verbindung zu privilegierten Ports ist nicht erlaubt.',
-	'There is a space in the input password which might be the cause.' => 'Es gibt ein Leerzeichen im Eingabepasswort, das die Ursache sein könnte.',
-	'Unknown error.' => 'Unbekannter Fehler.',
-	'Database does not support password.' => 'Die Datenbank unterstützt kein Passwort.',
-	'Disable %s or enable %s or %s extensions.' => 'Deaktivieren Sie %s oder aktivieren Sie die Erweiterungen %s oder %s.',
 );

adminer/lang/el.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Σύστημα',
@@ -13,12 +11,12 @@ $translations = array(
 	'Logged as: %s' => 'Συνδεθήκατε ως %s',
 	'Logout successful.' => 'Αποσυνδεθήκατε με επιτυχία.',
 	'Invalid credentials.' => 'Εσφαλμένα Διαπιστευτήρια.',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανηλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανηλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Έληξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/"%s>Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Έλειξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/"%s>Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
 	'Language' => 'Γλώσσα',
 	'Invalid CSRF token. Send the form again.' => 'Άκυρο κουπόνι CSRF. Στείλτε τη φόρμα ξανά.',
 	'If you did not send this request from Adminer then close this page.' => 'Αν δε στείλατε αυτό το αίτημα από το Adminer, τότε κλείστε αυτή τη σελίδα.',
-	'No extension' => 'Καμία Επέκταση',
+	'No extension' => 'Χωρίς Επεκτάσεις',
 	'None of the supported PHP extensions (%s) are available.' => 'Καμία από τις υποστηριζόμενες επεκτάσεις PHP (%s) δεν είναι διαθέσιμη.',
 	'Session support must be enabled.' => 'Πρέπει να είναι ενεργοποιημένη η υποστήριξη συνεδριών.',
 	'Session expired, please login again.' => 'Η συνεδρία έληξε, παρακαλώ συνδεθείτε ξανά.',
@@ -28,7 +26,7 @@ $translations = array(
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
 	
-	'Privileges' => 'Δικαιώματα',
+	'Privileges' => 'Προνόμια',
 	'Create user' => 'Δημιουργία Χρήστη',
 	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
 	'User has been altered.' => 'Ο Χρήστης τροποποιήθηκε.',
@@ -40,7 +38,7 @@ $translations = array(
 	'Revoke' => 'Ανάκληση',
 	
 	'Process list' => 'Λίστα διεργασιών',
-	'%d process(es) have been killed.' => array('Τερματίστηκε %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
+	'%d process(es) have been killed.' => array('Τερματίστηκαν %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
 	'Kill' => 'Τερματισμός',
 	
 	'Variables' => 'Μεταβλητές',
@@ -48,8 +46,8 @@ $translations = array(
 	
 	'SQL command' => 'Εντολή SQL',
 	'%d query(s) executed OK.' => array('Το ερώτημα %d εκτελέστηκε ΟΚ.', 'Τα ερώτηματα %d εκτελέστηκαν ΟΚ.'),
-	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκαν %d σειρές.'),
+	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επιρρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επιρρεάστηκαν %d σειρές.'),
-	'No commands to execute.' => 'Δεν υπάρχουν εντολές να εκτελεστούν.',
+	'No commands to execute.' => 'Δεν υπάρχει εντολή να εκτελεστεί.',
 	'Error in query' => 'Σφάλμα στο ερώτημα',
 	'Execute' => 'Εκτέλεση',
 	'Stop on error' => 'Διακοπή όταν υπάρχει σφάλμα',
@@ -60,16 +58,16 @@ $translations = array(
 	'Clear' => 'Καθαρισμός',
 	'Edit all' => 'Επεξεργασία όλων',
 	
-	'File upload' => 'Μεταφόρτωση αρχείου',
+	'File upload' => 'Ανέβασμα αρχείου',
 	'From server' => 'Από διακομιστή',
 	'Webserver file %s' => 'Αρχείο %s από διακομιστή web',
 	'Run file' => 'Εκτέλεση αρχείου',
 	'File does not exist.' => 'Το αρχείο δεν υπάρχει.',
-	'File uploads are disabled.' => 'Έχει απενεργοποιηθεί η μεταφόρτωση αρχείων.',
+	'File uploads are disabled.' => 'Έχει απενεργοποιηθεί το ανέβασμα αρχείων.',
-	'Unable to upload a file.' => 'Αδυναμία μεταφόρτωσης αρχείου.',
+	'Unable to upload a file.' => 'Δεν είναι δυνατόν να ανεβεί το αρχείο.',
-	'Maximum allowed file size is %sB.' => 'Το μέγιστο επιτρεπόμενο μέγεθος αρχείου είναι %sB.',
+	'Maximum allowed file size is %sB.' => 'Το μέγιστο επιτρεπόμενο μέγεθος αρχείο για ανέβασμα είναι %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Πολλά δεδομένα POST. Μείωστε τα περιεχόμενα ή αυξήστε την σχετική ρύθμιση %s.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να μεταφορτώσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να ανεβάσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
 	'You are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
 	
 	'Export' => 'Εξαγωγή',
@@ -81,9 +79,10 @@ $translations = array(
 	'Data' => 'Δεδομένα',
 	
 	'Database' => 'Β. Δεδομένων',
+	'database' => 'β. δεδομένων',
 	'Use' => 'χρήση',
 	'Select database' => 'Επιλέξτε Β.Δ.',
-	'Invalid database.' => 'Λανθασμένη Β.Δ.',
+	'Invalid database.' => 'Άκυρη Β.Δ.',
 	'Database has been dropped.' => 'Η Β.Δ. διαγράφηκε.',
 	'Databases have been dropped.' => 'Οι Β.Δ. διαγράφηκαν.',
 	'Database has been created.' => 'Η Β.Δ. δημιουργήθηκε.',
@@ -112,7 +111,7 @@ $translations = array(
 	'Check' => 'Έλεγχος',
 	'Repair' => 'Επιδιόρθωση',
 	'Truncate' => 'Περικοπή',
-	'Tables have been truncated.' => 'Οι πίνακες περικόπηκαν.',
+	'Tables have been truncated.' => 'Οι πίνακες περικόπτηκαν.',
 	'Move to other database' => 'Μεταφορά σε άλλη Β.Δ.',
 	'Move' => 'Μεταφορά',
 	'Tables have been moved.' => 'Οι πίνακες μεταφέρθηκαν.',
@@ -120,11 +119,11 @@ $translations = array(
 	'Tables have been copied.' => 'Οι πίνακες αντιγράφηκαν.',
 	
 	'Routines' => 'Ρουτίνες',
-	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επηρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επηρεάστηκαν %d σειρές.'),
+	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επιρρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επιρρεάστηκαν %d σειρές.'),
 	'Call' => 'Εκτέλεση',
 	'Parameter name' => 'Όνομα παραμέτρου',
 	'Create procedure' => 'Δημιουργία διαδικασίας',
-	'Create function' => 'Δημιουργία Συνάρτησης',
+	'Create function' => 'Δημιουργία Λειτουργίας',
 	'Routine has been dropped.' => 'Η ρουτίνα διαγράφηκε.',
 	'Routine has been altered.' => 'Η ρουτίνα τροποποιήθηκε.',
 	'Routine has been created.' => 'Η ρουτίνα δημιουργήθηκε.',
@@ -152,7 +151,7 @@ $translations = array(
 	'Alter table' => 'Τροποποίηση πίνακα',
 	'Create table' => 'Δημιουργία πίνακα',
 	'Table has been dropped.' => 'Ο πίνακας διαγράφηκε.',
-	'Tables have been dropped.' => 'Οι πίνακες διαγράφηκαν.',
+	'Tables have been dropped.' => 'Οι πινακες διαγράφηκαν.',
 	'Tables have been optimized.' => 'Οι πίνακες βελτιστοποιήθηκαν.',
 	'Table has been altered.' => 'Ο πίνακας τροποποιήθηκε.',
 	'Table has been created.' => 'Ο πίνακας δημιουργήθηκε.',
@@ -195,7 +194,7 @@ $translations = array(
 	'Alter indexes' => 'Τροποποίηση δεικτών',
 	'Add next' => 'Προσθήκη επόμενου',
 	'Index Type' => 'Τύπος δείκτη',
-	'length' => 'μήκος',
+	'Column (length)' => 'Στήλη (μήκος)',
 	
 	'Foreign keys' => 'Εξαρτημένα κλειδιά',
 	'Foreign key' => 'Εξαρτημένο κλειδί',
@@ -211,7 +210,7 @@ $translations = array(
 	'Add foreign key' => 'Προσθήκη εξαρτημένου κλειδιού',
 	'ON DELETE' => 'ΚΑΤΑ ΤΗ ΔΙΑΓΡΑΦΗ',
 	'ON UPDATE' => 'ΚΑΤΑ ΤΗΝ ΑΛΛΑΓΗ',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στην πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στη πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
 	
 	'Triggers' => 'Εναύσματα',
 	'Add trigger' => 'Προσθήκη εναύσματος',
@@ -235,7 +234,7 @@ $translations = array(
 	'Sort' => 'Ταξινόμηση',
 	'descending' => 'Φθίνουσα',
 	'Limit' => 'Όριο',
-	'Limit rows' => 'Περιορισμός σειρών',
+	'Limit rows' => 'Περιοριμός σειρών',
 	'Text length' => 'Μήκος κειμένου',
 	'Action' => 'Ενέργεια',
 	'Full table scan' => 'Πλήρης σάρωση πινάκων',
@@ -263,7 +262,7 @@ $translations = array(
 	'Item%s has been inserted.' => 'Η εγγραφή%s εισήχθη.',
 	'Item has been deleted.' => 'Η εγγραφή διαγράφηκε.',
 	'Item has been updated.' => 'Η εγγραφή ενημερώθηκε.',
-	'%d item(s) have been affected.' => array('Επηρεάστηκε %d εγγραφή.', 'Επηρεάστηκαν %d εγγραφές.'),
+	'%d item(s) have been affected.' => array('Επιρρεάστηκε %d εγγραφή.', 'Επιρρεάστηκαν %d εγγραφές.'),
 	'New item' => 'Νέα εγγραφή',
 	'original' => 'πρωτότυπο',
 	// label for value '' in enum data type
@@ -275,7 +274,7 @@ $translations = array(
 	'Save and continue edit' => 'Αποθήκευση και συνέχεια επεξεργασίας',
 	'Save and insert next' => 'Αποθήκευση και εισαγωγή επόμενου',
 	'Selected' => 'Επιλεγμένα',
-	'Clone' => 'Κλωνοποίηση',
+	'Clone' => 'Κλονοποίηση',
 	'Delete' => 'Διαγραφή',
 	'You have no privileges to update this table.' => 'Δεν έχετε δικαίωμα να τροποποιήσετε αυτό τον πίνακα.',
 	
@@ -284,7 +283,7 @@ $translations = array(
 	'Subject' => 'Θέμα',
 	'Attachments' => 'Συνημμένα',
 	'Send' => 'Αποστολή',
-	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλη.', '%d e-mail απεστάλησαν.'),
+	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλλει.', '%d e-mail απεστάλλησαν.'),
 	
 	// data type descriptions
 	'Numbers' => 'Αριθμοί',

adminer/lang/en.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Too many unsuccessful logins, try again in %d minute.', 'Too many unsuccessful logins, try again in %d minutes.'),
 	'Query executed OK, %d row(s) affected.' => array('Query executed OK, %d row affected.', 'Query executed OK, %d rows affected.'),

adminer/lang/es.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Crear Base de datos',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Cerrar sesión',
+	'database' => 'base de datos',
 	'Use' => 'Usar',
 	'No tables.' => 'No existen tablas.',
 	'select' => 'registros',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'AL BORRAR',
 	'ON UPDATE' => 'AL ACTUALIZAR',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'longitud',
+	'Column (length)' => 'Columna (longitud)',
 	'View has been dropped.' => 'Vista eliminada.',
 	'View has been altered.' => 'Vista modificada.',
 	'View has been created.' => 'Vista creada.',

adminer/lang/et.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Loo uus andmebaas',
 	'SQL command' => 'SQL-Päring',
 	'Logout' => 'Logi välja',
+	'database' => 'andmebaas',
 	'Use' => 'Kasuta',
 	'No tables.' => 'Tabeleid ei leitud.',
 	'select' => 'kuva',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Indeksi tüüp',
-	'length' => 'pikkus',
+	'Column (length)' => 'Veerg (pikkus)',
 	'View has been dropped.' => 'Vaade (VIEW) on edukalt kustutatud.',
 	'View has been altered.' => 'Vaade (VIEW) on edukalt muudetud.',
 	'View has been created.' => 'Vaade (VIEW) on edukalt loodud.',

adminer/lang/fa.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'سیستم',
@@ -79,6 +77,7 @@ $translations = array(
 	'Data' => 'داده',
 	
 	'Database' => 'پایگاه داده',
+	'database' => 'پایگاه داده',
 	'Use' => 'استفاده',
 	'Select database' => 'انتخاب پایگاه داده',
 	'Invalid database.' => 'پایگاه داده نامعتبر.',
@@ -146,7 +145,7 @@ $translations = array(
 	'Tables' => 'جدولها',
 	'Tables and views' => 'جدولها و نمایه ها',
 	'Table' => 'جدول',
-	'No tables.' => 'جدولی وجود ندارد.',
+	'No tables.' => 'جدولی وجود ندارد',
 	'Alter table' => 'ویرایش جدول',
 	'Create table' => 'ایجاد جدول',
 	'Table has been dropped.' => 'جدول حذف شد.',
@@ -193,7 +192,7 @@ $translations = array(
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
-	'length' => 'طول',
+	'Column (length)' => 'ستون (طول)',
 	
 	'Foreign keys' => 'کلیدهای خارجی',
 	'Foreign key' => 'کلید خارجی',
@@ -238,7 +237,7 @@ $translations = array(
 	'Action' => 'عملیات',
 	'Full table scan' => 'اسکن کامل جدول',
 	'Unable to select the table' => 'قادر به انتخاب جدول نیستید',
-	'No rows.' => 'سطری وجود ندارد.',
+	'No rows.' => 'سطری وجود ندارد',
 	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d سطر', '%d سطر'),
 	'Page' => 'صفحه',

adminer/lang/fi.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Järjestelmä',
@@ -81,6 +79,7 @@ $translations = array(
 	'Data' => 'Data',
 	
 	'Database' => 'Tietokanta',
+	'database' => 'tietokanta',
 	'Use' => 'Käytä',
 	'Select database' => 'Valitse tietokanta',
 	'Invalid database.' => 'Tietokanta ei kelpaa.',
@@ -195,7 +194,7 @@ $translations = array(
 	'Alter indexes' => 'Muuta indeksejä',
 	'Add next' => 'Lisää seuraava',
 	'Index Type' => 'Indeksityyppi',
-	'length' => 'pituus',
+	'Column (length)' => 'Sarake (pituus)',
 	
 	'Foreign keys' => 'Vieraat avaimet',
 	'Foreign key' => 'Vieras avain',
@@ -334,18 +333,4 @@ $translations = array(
 	'Type has been dropped.' => 'Tyyppi poistettiin.',
 	'Type has been created.' => 'Tyyppi luotiin.',
 	'Alter type' => 'Muuta tyyppiä',
-
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Kiitos, kun käytät Admineriä, voit <a href="https://www.adminer.org/en/donation/">tehdä lahjoituksen tästä</a>.',
-	'Drop %s?' => 'Poistetaanko %s?',
-	'overwrite' => 'kirjoittaen päälle',
-	'DB' => 'TK',
-	'ATTACH queries are not supported.' => 'ATTACH-komennolla tehtyjä kyselyjä ei tueta.',
-	'Warnings' => 'Varoitukset',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ei tue pääsyä tietokantaan ilman salasanaa, katso tarkemmin <a href="https://www.adminer.org/en/password/"%s>täältä</a>.',
-	'The action will be performed after successful login with the same credentials.' => 'Toiminto suoritetaan sen jälkeen, kun on onnistuttu kirjautumaan samoilla käyttäjätunnuksilla uudestaan.',
-	'Connecting to privileged ports is not allowed.' => 'Yhteydet etuoikeutettuihin portteihin eivät ole sallittuja.',
-	'There is a space in the input password which might be the cause.' => 'Syynä voi olla syötetyssä salasanassa oleva välilyönti.',
-	'Unknown error.' => 'Tuntematon virhe.',
-	'Database does not support password.' => 'Tietokanta ei tue salasanaa.',
-	'Disable %s or enable %s or %s extensions.' => 'Poista käytöstä %s tai ota käyttöön laajennus %s tai %s.',
 );

adminer/lang/fr.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
@@ -32,6 +30,7 @@ $translations = array(
 	'Create database' => 'Créer une base de données',
 	'SQL command' => 'Requête SQL',
 	'Logout' => 'Déconnexion',
+	'database' => 'base de données',
 	'Use' => 'Utiliser',
 	'No tables.' => 'Aucune table.',
 	'select' => 'select',
@@ -95,7 +94,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Type d\'index',
-	'length' => 'longueur',
+	'Column (length)' => 'Colonne (longueur)',
 	'View has been dropped.' => 'La vue a été effacée.',
 	'View has been altered.' => 'La vue a été modifiée.',
 	'View has been created.' => 'La vue a été créée.',
@@ -289,16 +288,4 @@ $translations = array(
 	'Default value' => 'Valeur par défaut',
 	'If you did not send this request from Adminer then close this page.' => 'Si vous n\'avez pas envoyé cette requête depuis Adminer, alors fermez cette page.',
 	'You are offline.' => 'Vous êtes hors ligne.',
-	'Drop %s?' => 'Supprimer %s?',
-	'overwrite' => 'écraser',
-	'DB' => 'BD',
-	'ATTACH queries are not supported.' => 'Requêtes ATTACH ne sont pas supportées.',
-	'Warnings' => 'Avertissements',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ne supporte pas l\'accès aux bases de données sans mot de passe, <a href="https://www.adminer.org/en/password/"%s>plus d\'information</a>.',
-	'The action will be performed after successful login with the same credentials.' => 'Cette action sera exécutée après s\'être connecté avec les mêmes données de connexion.',
-	'Connecting to privileged ports is not allowed.' => 'La connexion aux ports privilégiés n\'est pas autorisée.',
-	'There is a space in the input password which might be the cause.' => 'Il y a un espace dans le mot de passe entré qui pourrait en être la cause.',
-	'Unknown error.' => 'Erreur inconnue.',
-	'Database does not support password.' => 'La base de données ne support pas les mots de passe.',
-	'Disable %s or enable %s or %s extensions.' => 'Désactiver %s ou activer %s or %s extensions.',
 );

adminer/lang/gl.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Conectar',
 	'Logout successful.' => 'Pechouse a sesión con éxito.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Crear Base de datos',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Pechar sesión',
+	'database' => 'base de datos',
 	'Use' => 'Usar',
 	'No tables.' => 'Nengunha táboa.',
 	'select' => 'selecciona',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'AO BORRAR (ON DELETE)',
 	'ON UPDATE' => 'AO ACTUALIZAR (ON UPDATE)',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'lonxitude',
+	'Column (length)' => 'Columna (lonxitude)',
 	'View has been dropped.' => 'Eliminouse a vista.',
 	'View has been altered.' => 'Modificouse a vista.',
 	'View has been created.' => 'Creouse a vista.',
@@ -266,11 +265,11 @@ $translations = array(
 	'Permanent link' => 'Ligazón permanente',
 	'Edit all' => 'Editar todo',
 	'HH:MM:SS' => 'HH:MM:SS',
-	'Tables have been optimized.' => 'Optimizáronse as táboas.',
+	'Tables have been optimized.' => 'Optimizáronse as táboas',
 	'Materialized view' => 'Vista materializada',
 	'Vacuum' => 'Baleirar',
 	'Selected' => 'Selección',
-	'File must be in UTF-8 encoding.' => 'O ficheiro ten que estar codificado con UTF-8.',
+	'File must be in UTF-8 encoding.' => 'O ficheiro ten que estar codificado con UTF-8',
 	'Modify' => 'Modificar',
 	'Loading' => 'Cargando',
 	'Load more data' => 'Cargar máis datos',
@@ -278,14 +277,14 @@ $translations = array(
 	'Limit rows' => 'Limitar filas',
 	'Default value' => 'Valor por defecto',
 	'Full table scan' => 'Escaneo completo da táboa',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos de conexión, intentao de novo en %d minuto.', 'Demasiados intentos de conexión, intentao de novo en %d minutos.'),
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos de conexión, intentao de novo en %d minuto', 'Demasiados intentos de conexión, intentao de novo en %d minutos'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'O contrasinal principal caducou. <a href="https://www.adminer.org/en/extension/"%s>Implementa</a> o método %s para facelo permanente.',
-	'If you did not send this request from Adminer then close this page.' => 'Se non enviaches esta petición dende o Adminer entón pecha esta páxina.',
+	'If you did not send this request from Adminer then close this page.' => 'Se non enviaches esta petición dende o Adminer entón pecha esta páxina',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Podes subir un ficheiro SQL de gran tamaño vía FTP e importalo dende o servidor.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Podes subir un ficheiro SQL de gran tamaño vía FTP e importalo dende o servidor',
 	'Size' => 'Tamaño',
 	'Compute' => 'Calcular',
-	'You are offline.' => 'Non tes conexión.',
+	'You are offline.' => 'Non tes conexión',
-	'You have no privileges to update this table.' => 'Non tes privilexios para actualizar esta táboa.',
+	'You have no privileges to update this table.' => 'Non tes privilexios para actualizar esta táboa',
 	'Saving' => 'Gardando',
 	'yes' => 'si',
 	'no' => 'non',

adminer/lang/he.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
@@ -32,6 +30,7 @@ $translations = array(
 	'Create database' => 'צור מסד נתונים',
 	'SQL command' => 'שאילתת SQL',
 	'Logout' => 'התנתק',
+	'database' => 'מסד נתונים',
 	'Use' => 'השתמש',
 	'No tables.' => 'אין טבלאות',
 	'select' => 'בחר',
@@ -95,7 +94,7 @@ $translations = array(
 	'ON DELETE' => 'בעת מחיקה',
 	'ON UPDATE' => 'בעת עידכון',
 	'Index Type' => 'סוג אינדקס',
-	'length' => 'אורך',
+	'Column (length)' => 'עמודה (אורך)',
 	'View has been dropped.' => 'התצוגה הושלכה',
 	'View has been altered.' => 'התצוגה שונתה',
 	'View has been created.' => 'התצוגה נוצרה',
@@ -280,7 +279,7 @@ $translations = array(
 	'Default value' => 'ערך ברירת מחדל',
 	'Full table scan' => 'סריקה טבלה מלאה',
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'יותר מידי נסיונות כניסה נכשלו, אנא נסה עוד %d דקות',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="https://www.adminer.org/en/donation/">לתרום</a>',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="https://www.adminer.org/en/donation/">לתרום</a>.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'סיסמת המאסטר פגה <a href="https://www.adminer.org/en/extension/"%s>התקן תוסף</a> על מנת להפוך את זה לתמידי',
 	'If you did not send this request from Adminer then close this page.' => 'אם לא אתה שלחת בקשה ל-Adminer הינך יכול לסגור חלון זה',
 	'You can upload a big SQL file via FTP and import it from server.' => 'ניתן לעלות קבצים ב-FTP ואז למשוך אותם מהשרת',

adminer/lang/hu.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Belépés',
 	'Logout successful.' => 'Sikeres kilépés.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Adatbázis létrehozása',
 	'SQL command' => 'SQL parancs',
 	'Logout' => 'Kilépés',
+	'database' => 'adatbázis',
 	'Use' => 'Használ',
 	'No tables.' => 'Nincs tábla.',
 	'select' => 'kiválasztás',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'törléskor',
 	'ON UPDATE' => 'frissítéskor',
 	'Index Type' => 'Index típusa',
-	'length' => 'méret',
+	'Column (length)' => 'Oszop (méret)',
 	'View has been dropped.' => 'A nézet eldobva.',
 	'View has been altered.' => 'A nézet módosult.',
 	'View has been created.' => 'A nézet létrejött.',
@@ -176,7 +175,7 @@ $translations = array(
 	'Repair' => 'Javít',
 	'Truncate' => 'Felszabadít',
 	'Tables have been truncated.' => 'A tábla felszabadítva.',
-	'Rows' => 'Sorok',
+	'Rows' => 'Oszlop',
 	',' => ' ',
 	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Táblák áthelyezve.',

adminer/lang/id.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -75,6 +73,7 @@ $translations = array(
 	'Data' => 'Data',
 
 	'Database' => 'Basis data',
+	'database' => 'basis data',
 	'Use' => 'Gunakan',
 	'Select database' => 'Pilih basis data',
 	'Invalid database.' => 'Basis data tidak sah.',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Ubah indeks',
 	'Add next' => 'Tambah setelahnya',
 	'Index Type' => 'Jenis Indeks',
-	'length' => 'panjang',
+	'Column (length)' => 'Kolom (panjang)',
 
 	'Foreign keys' => 'Kunci asing',
 	'Foreign key' => 'Kunci asing',

adminer/lang/it.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Autenticazione',
 	'Logout successful.' => 'Uscita effettuata con successo.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Crea database',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Esci',
+	'database' => 'database',
 	'Use' => 'Usa',
 	'No tables.' => 'No tabelle.',
 	'select' => 'seleziona',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo indice',
-	'length' => 'lunghezza',
+	'Column (length)' => 'Colonna (lunghezza)',
 	'View has been dropped.' => 'Vista eliminata.',
 	'View has been altered.' => 'Vista modificata.',
 	'View has been created.' => 'Vista creata.',
@@ -266,39 +265,4 @@ $translations = array(
 	'Permanent link' => 'Link permanente',
 	'Edit all' => 'Modifica tutto',
 	'HH:MM:SS' => 'HH:MM:SS',
-	'Drop %s?' => 'Scartare %s?',
-	'Tables have been optimized.' => 'Le tabelle sono state ottimizzate.',
-	'Materialized view' => 'Vista materializzata',
-	'Vacuum' => 'Aspira',
-	'Selected' => 'Selezionato',
-	'overwrite' => 'sovrascrivi',
-	'DB' => 'DB',
-	'File must be in UTF-8 encoding.' => 'Il file deve avere codifica UTF-8.',
-	'Modify' => 'Modifica',
-	'Load more data' => 'Carica piú dati',
-	'Loading' => 'Caricamento',
-	'ATTACH queries are not supported.' => 'ATTACH queries non sono supportate.',
-	'Warnings' => 'Attenzione',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Limite righe',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer non supporta accesso a databse senza password, <a href="https://www.adminer.org/it/password/"%s>piú informazioni</a>.',
-	'Default value' => 'Valore predefinito',
-	'Full table scan' => 'Analizza intera tabella',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Troppi tentativi infruttuosi di login, si prega di riprovare in %d minuto.', 'Troppi tentativi infruttuosi di login, si prega di riprovare in %d minuti.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'La password principale é scaduta. <a href="https://www.adminer.org/it/extension/"%s>Implementare</a> %s come metodo per renderla permanente.',
-	'The action will be performed after successful login with the same credentials.' => 'La azione verrá eseguita dopo un login valido con le stesse credenziali.',
-	'Connecting to privileged ports is not allowed.' => 'LA connessione a porte privilegiate non é permessa.',
-	'There is a space in the input password which might be the cause.' => 'Esiste uno spazio nella passoword inserita che potrebbe essere la causa.',
-	'If you did not send this request from Adminer then close this page.' => 'Se non hai inviato tu la richiesta tramite Adminer puoi chiudere la pagina.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Puoi caricare un grande file SQL tramite FTP ed impirtarlo dal server.',
-	'Size' => 'Taglia',
-	'Compute' => 'Elabora',
-	'You are offline.' => 'Sei disconnesso.',
-	'You have no privileges to update this table.' => 'Non hai i privilegi per aggiornare questa tabella.',
-	'Saving' => 'Salvataggio',
-	'Unknown error.' => 'Errore sconosciuto.',
-	'Database does not support password.' => 'Il database non supporta password.',
-	'Disable %s or enable %s or %s extensions.' => 'Disabilita %s o abilita %s oppure %s estensioni.',
-	'yes' => 'si',
-	'no' => 'no',
 );

adminer/lang/ja.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'データベースを作成',
 	'SQL command' => 'SQLコマンド',
 	'Logout' => 'ログアウト',
+	'database' => 'データベース',
 	'Use' => '使用',
 	'No tables.' => 'テーブルがありません。',
 	'select' => '選択',
@@ -96,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => '索引の型',
-	'length' => '長さ',
+	'Column (length)' => '列（長さ）',
 	'View has been dropped.' => 'ビューを削除しました',
 	'View has been altered.' => 'ビューを変更しました',
 	'View has been created.' => 'ビューを作成しました',

adminer/lang/ka.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'შესვლა',
 	'Logout successful.' => 'გამოხვედით სისტემიდან.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'ბაზის შექმნა',
 	'SQL command' => 'SQL-ბრძანება',
 	'Logout' => 'გასვლა',
+	'database' => 'ბაზა',
 	'Use' => 'არჩევა',
 	'No tables.' => 'ბაზაში ცხრილი არაა.',
 	'select' => 'არჩევა',
@@ -95,7 +94,7 @@ $translations = array(
 	'ON DELETE' => 'წაშლისას',
 	'ON UPDATE' => 'განახლებისას',
 	'Index Type' => 'ინდექსის სახეობა',
-	'length' => 'სიგრძე',
+	'Column (length)' => 'ველი (სიგრძე)',
 	'View has been dropped.' => 'წარმოდგენა წაიშალა.',
 	'View has been altered.' => 'წარმოდგენა შეიცვალა.',
 	'View has been created.' => 'წარმოდგენა შეიქმნა.',

adminer/lang/ko.inc.php

@@ -1,281 +1,267 @@
 <?php
-namespace Adminer;
-
 $translations = array(
-	'$1-$3-$5' => '$1-$3-$5',
-	'%.3f s' => '%.3f 초',
-	'%d byte(s)' => '%d 바이트',
-	'%d e-mail(s) have been sent.' => '%d개 메일을 보냈습니다.',
-	'%d in total' => '총 %d개',
-	'%d item(s) have been affected.' => '%d개 항목을 갱신했습니다.',
-	'%d process(es) have been killed.' => '%d개 프로세스를 강제 종료하였습니다.',
-	'%d query(s) executed OK.' => '%d개 쿼리를 잘 실행했습니다.',
-	'%d row(s) have been imported.' => '%d개 행을 가져 왔습니다.',
-	'%d row(s)' => '%d개 행',
-	'%s version: %s through PHP extension %s' => '%s 버전 %s, PHP 확장 %s',
-	',' => ',',
-	'0123456789' => '0123456789',
-	'[yyyy]-mm-dd' => '[yyyy]-mm-dd',
-	'Action' => '실행',
-	'Add column' => '열 추가',
-	'Add foreign key' => '외부 키를 추가',
-	'Add next' => '다음 추가',
-	'Add trigger' => '트리거 추가',
-	'Aggregation' => '집합',
-	'Alter database' => '데이터베이스 변경',
-	'Alter event' => '이벤트 변경',
-	'Alter function' => '함수 변경',
-	'Alter indexes' => '색인 변경',
-	'Alter procedure' => '시저 변경',
-	'Alter schema' => '스키마 변경',
-	'Alter sequence' => '순서 변경',
-	'Alter table' => '테이블 변경',
-	'Alter trigger' => '트리거 변경',
-	'Alter type' => '형 변경',
-	'Alter view' => '보기 변경',
-	'Alter' => '변경',
-	'Analyze' => '분석',
-	'anywhere' => '모든',
-	'Are you sure?' => '실행 하시겠습니까?',
-	'At given time' => '지정 시간',
-	'Attachments' => '첨부 파일',
-	'Auto Increment' => '자동 증가',
-	'Binary' => '이진',
-	'Call' => '호출',
-	'Change' => '변경',
-	'Check' => '확인',
-	'Clear' => '삭제',
-	'Clone' => '복제',
-	'collation' => '정렬',
-	'Collation' => '정렬',
-	'length' => '길이',
-	'Column name' => '열 이름',
-	'Column' => '열',
-	'Comment' => '주석',
-	'Compute' => '계산하기',
-	'Copy' => '복사',
-	'Create database' => '데이터베이스 만들기',
-	'Create event' => '만들기',
-	'Create function' => '함수 만들기',
-	'Create procedure' => '시저 만들기',
-	'Create schema' => '스키마 추가',
-	'Create sequence' => '시퀀스 만들기',
-	'Create table' => '테이블 만들기',
-	'Create trigger' => '트리거 만들기',
-	'Create type' => '사용자 정의 형식 만들기',
-	'Create user' => '사용자 만들기',
-	'Create view' => '뷰 만들기',
-	'Data Free' => '데이터 여유',
-	'Data Length' => '데이터 길이',
-	'Data' => '데이터',
-	'Database has been altered.' => '데이터베이스를 변경했습니다.',
-	'Database has been created.' => '데이터베이스를 만들었습니다.',
-	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
-	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
-	'Database schema' => '데이터베이스 구조',
-	'Database' => '데이터베이스',
-	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
-	'Date and time' => '시간',
-	'Default values' => '기본값',
-	'Delete' => '삭제',
-	'descending' => '역순',
-	'Drop' => '삭제',
-	'E-mail' => '메일',
-	'Edit all' => '모두 편집',
-	'Edit' => '편집',
-	'edit' => '편집',
-	'Editor' => '에디터',
-	'empty' => '비어있음',
-	'End' => '종료',
-	'engine' => '엔진',
-	'Engine' => '엔진',
-	'Error in query' => '쿼리의 오류',
-	'Event has been altered.' => '변경했습니다.',
-	'Event has been created.' => '만들었습니다.',
-	'Event has been dropped.' => '삭제했습니다.',
-	'Event' => '이벤트',
-	'Events' => '이벤트',
-	'Every' => '매 번',
-	'Execute' => '실행',
-	'Export' => '내보내기',
-	'File does not exist.' => '파일이 존재하지 않습니다.',
-	'File exists.' => '파일이 이미 있습니다.',
-	'File upload' => '파일 올리기',
-	'File uploads are disabled.' => '파일 업로드가 잘못되었습니다.',
-	'Foreign key has been altered.' => '외부 키를 변경했습니다.',
-	'Foreign key has been created.' => '외부 키를 만들었습니다.',
-	'Foreign key has been dropped.' => '외부 키를 제거했습니다.',
-	'Foreign key' => '외부 키',
-	'Foreign keys' => '외부 키',
-	'Format' => '형식',
-	'From server' => '서버에서 실행',
-	'From' => '보낸 사람',
-	'Functions' => '함수',
-	'Geometry' => '기하 형',
-	'Grant' => '권한 부여',
-	'Hashed' => 'Hashed',
-	'HH:MM:SS' => '시:분:초',
-	'History' => '이력',
-	'Import' => '가져 오기',
-	'Index Length' => '색인 길이',
-	'Index Type' => '색인 형',
-	'Indexes have been altered.' => '색인을 변경했습니다.',
-	'Indexes' => '색인',
-	'Insert' => '삽입',
-	'Invalid credentials.' => '잘못된 로그인.',
-	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰입니다. 다시 보내주십시오.',
-	'Invalid database.' => '잘못된 데이터베이스입니다.',
-	'Invalid schema.' => '잘못된 스키마입니다.',
-	'Item has been deleted.' => '항목을 삭제했습니다.',
-	'Item has been updated.' => '항목을 갱신했습니다.',
-	'Item%s has been inserted.' => '%s 항목을 삽입했습니다.',
-	'Kill' => '강제 종료',
-	'Language' => '언어',
-	'last' => '마지막',
-	'Length' => '길이',
-	'Limit rows' => '행 제약',
-	'Limit' => '제약',
-	'Lists' => '목록',
-	'Load more data' => '더 많은 데이터 부르기',
-	'Loading' => '부르는 중',
-	'Logged as: %s' => '다음으로 로그인했습니다: %s',
 	'Login' => '로그인',
-	'Logout successful.' => '로그아웃을 성공했습니다.',
+	'Logout successful.' => '로그아웃',
-	'Logout' => '로그아웃',
+	'Invalid credentials.' => '잘못된 로그인',
-	'ltr' => 'ltr',
-	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB.',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s(을)를 늘리십시오.',
-	'Modify' => '수정',
-	'Move down' => '아래로',
-	'Move to other database' => '다른 데이터베이스로 이동',
-	'Move up' => '위로',
-	'Move' => '이동',
-	'Name' => '이름',
-	'Network' => '네트워크 형',
-	'New item' => '항목 만들기',
-	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
-	'No extension' => '확장이 없습니다',
-	'No rows.' => '행이 없습니다.',
-	'No tables.' => '테이블이 없습니다.',
-	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장(%s)이 설치되어 있지 않습니다.',
-	'now' => '현재 시간',
-	'Numbers' => '숫자',
-	'On completion preserve' => '완성 후 저장',
-	'ON DELETE' => '지울 때',
-	'ON UPDATE' => '업데이트할 때',
-	'open' => '열',
-	'Optimize' => '최적화',
-	'Options' => '설정',
-	'original' => '원본',
-	'Output' => '출력',
-	'overwrite' => '덮어쓰기',
-	'Page' => '페이지',
-	'Parameter name' => '매개변수 이름',
-	'Partition by' => '파티션',
-	'Partition name' => '파티션 이름',
-	'Partitions' => '파티션',
-	'Password' => '비밀번호',
-	'Permanent link' => '영구적으로 링크',
-	'Permanent login' => '영구적으로 로그인',
-	'Please use one of the extensions %s.' => '확장 %s 중 하나를 사용하십시오.',
-	'Privileges' => '권한',
-	'Process list' => '프로세스 목록',
-	'Query executed OK, %d row(s) affected.' => '쿼리를 잘 실행했습니다. %d행을 변경했습니다.',
-	'Refresh' => '새로 고침',
-	'Relations' => '관계',
-	'Remove' => '제거',
-	'Repair' => '복구',
-	'Return type' => '반환 형식',
-	'Revoke' => '권한 취소',
-	'Routine has been altered.' => '루틴을 변경했습니다.',
-	'Routine has been called, %d row(s) affected.' => '루틴을 호출했습니다. %d 행을 변경했습니다.',
-	'Routine has been created.' => '루틴을 추가했습니다.',
-	'Routine has been dropped.' => '루틴을 제거했습니다.',
-	'Routine' => '루틴',
-	'Routines' => '루틴',
-	'Rows' => '행',
-	'Run file' => '파일을 실행',
-	'Save and continue edit' => '저장하고 계속 편집하기',
-	'Save and insert next' => '저장하고 다음에 추가',
-	'Save' => '저장',
-	'save' => '저장',
-	'Schedule' => '예약',
-	'Schema has been altered.' => '스키마를 변경했습니다.',
-	'Schema has been created.' => '스키마를 추가했습니다.',
-	'Schema has been dropped.' => '스키마를 삭제했습니다.',
-	'Schema' => '스키마',
-	'Search data in tables' => '테이블 내 데이터 검색',
-	'Search' => '검색',
-	'Select data' => '데이터를 선택하십시오',
-	'Select database' => '데이터베이스를 선택하십시오',
-	'Select' => '선택',
-	'select' => '선택',
-	'Selected' => '선택됨',
-	'Send' => '보내기',
-	'Sequence has been altered.' => '시퀀스를 변경했습니다.',
-	'Sequence has been created.' => '시퀀스를 추가했습니다.',
-	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
-	'Sequences' => '시퀀스',
 	'Server' => '서버',
-	'Session expired, please login again.' => '세션이 만료되었습니다. 다시 로그인하십시오.',
+	'Username' => '사용자이름',
-	'Session support must be enabled.' => '세션 지원을 사용해야만 합니다.',
+	'Password' => '비밀번호',
-	'Show only errors' => '오류 만 표시',
+	'Select database' => '데이터베이스를 선택하십시오.',
-	'Show structure' => '구조 표시',
+	'Invalid database.' => '잘못된 데이터베이스입니다.',
-	'Size' => '크기',
+	'Table has been dropped.' => '테이블을 삭제했습니다.',
-	'Sort' => '정렬',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '원본과 대상 열은 동일한 데이터 형식이어야만 합니다. 목표 열에 색인과 데이터가 존재해야만 합니다.',
-	'Source' => '소스',
-	'SQL command' => 'SQL 명령',
-	'Start' => '시작',
-	'Status' => '상태',
-	'Stop on error' => '오류의 경우 중지',
-	'Strings' => '문자열',
-	'Subject' => '제목',
-	'System' => '데이터베이스 형식',
 	'Table has been altered.' => '테이블을 변경했습니다.',
 	'Table has been created.' => '테이블을 만들었습니다.',
-	'Table has been dropped.' => '테이블을 삭제했습니다.',
+	'Alter table' => '테이블 변경',
+	'Create table' => '테이블 만들기',
 	'Table name' => '테이블 이름',
-	'Table' => '테이블',
+	'engine' => '엔진',
-	'Tables and views' => '테이블과 뷰',
+	'collation' => '정렬',
-	'Tables have been copied.' => '테이블을 복사했습니다.',
+	'Column name' => '열 이름',
-	'Tables have been dropped.' => '테이블을 삭제했습니다.',
-	'Tables have been moved.' => '테이블을 옮겼습니다.',
-	'Tables have been truncated.' => '테이블의 데이터 내용만 지웠습니다.',
-	'Tables' => '테이블',
-	'Target table' => '테이블',
-	'Target' => '타겟',
-	'Text length' => '문자열의 길이',
-	'Time' => '시간',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 데이터가 너무 큽니다. 데이터 크기를 줄이거나 %s 설정을 늘리십시오.',
-	'Trigger has been altered.' => '트리거를 변경했습니다.',
-	'Trigger has been created.' => '트리거를 추가했습니다.',
-	'Trigger has been dropped.' => '트리거를 제거했습니다.',
-	'Triggers' => '트리거',
-	'Truncate' => '데이터 내용만 지우기',
-	'Type has been created.' => '유형을 추가했습니다.',
-	'Type has been dropped.' => '유형을 삭제했습니다.',
 	'Type' => '형',
-	'Unable to select the table' => '테이블을 선택할 수 없습니다',
+	'Length' => '길이',
-	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
+	'Auto Increment' => '자동증가',
-	'Use edit link to modify this value.' => '이 값을 수정하려면 편집 링크를 사용하십시오.',
+	'Options' => '설정',
+	'Save' => '저장',
+	'Drop' => '삭제',
+	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Database has been created.' => '데이터베이스를 만들었습니다.',
+	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
+	'Database has been altered.' => '데이터베이스를 변경했습니다.',
+	'Alter database' => '데이터베이스 변경',
+	'Create database' => '데이터베이스 만들기',
+	'SQL command' => 'SQL 명령',
+	'Logout' => '로그아웃',
+	'database' => '데이터베이스',
 	'Use' => '사용',
-	'User has been altered.' => '사용자를 변경했습니다.',
+	'No tables.' => '테이블이 없습니다.',
-	'User has been created.' => '사용자를 만들었습니다.',
+	'select' => '선택',
-	'User has been dropped.' => '사용자를 제거했습니다.',
+	'Item has been deleted.' => '항목을 삭제했습니다.',
-	'Username' => '사용자이름',
+	'Item has been updated.' => '항목을 갱신했습니다.',
-	'Vacuum' => '청소',
+	'Edit' => '편집',
-	'Values' => '값',
+	'Insert' => '삽입',
-	'Variables' => '변수',
+	'Save and insert next' => '저장하고 다음에 추가',
+	'Delete' => '삭제',
+	'Database' => '데이터베이스',
+	'Routines' => '루틴',
+	'Indexes have been altered.' => '인덱스를 변경했습니다.',
+	'Indexes' => '색인',
+	'Alter indexes' => '인덱스 변경',
+	'Add next' => '추가',
+	'Language' => '언어',
+	'Select' => '선택',
+	'New item' => '항목 만들기',
+	'Search' => '검색',
+	'Sort' => '정렬',
+	'descending' => '역순',
+	'Limit' => '제약',
+	'No rows.' => '행이 없습니다.',
+	'Action' => '실행',
+	'edit' => '편집',
+	'Page' => '페이지',
+	'Query executed OK, %d row(s) affected.' => '쿼리를 실행했습니다. %d 행을 변경했습니다.',
+	'Error in query' => '쿼리의 오류',
+	'Execute' => '실행',
+	'Table' => '테이블',
+	'Foreign keys' => '외부 키',
+	'Triggers' => '트리거',
+	'View' => '보기',
+	'Unable to select the table' => '테이블을 선택할 수 없습니다.',
+	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰. 다시 보내주십시오.',
+	'Comment' => '코멘트',
+	'Default values' => '기본값',
+	'%d byte(s)' => '%d 바이트',
+	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
+	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
+	'File upload' => '파일 올리기',
+	'File uploads are disabled.' => '파일 업로드가 잘못되었습니다.',
+	'Routine has been called, %d row(s) affected.' => '루틴을 호출했습니다. %d 행을 변경했습니다.',
+	'Call' => '외침',
+	'No extension' => '확장 기능이 없습니다.',
+	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장 (%s)가 설치되어 있지 않습니다.',
+	'Session support must be enabled.' => '세션을 사용하십시오.',
+	'Session expired, please login again.' => '세션 만료. 다시 로그인하십시오.',
+	'Text length' => '문자열의 길이',
+	'Foreign key has been dropped.' => '외부 키를 제거했습니다.',
+	'Foreign key has been altered.' => '외부 키를 변경했습니다.',
+	'Foreign key has been created.' => '외부 키를 만들었습니다.',
+	'Foreign key' => '외부 키',
+	'Target table' => '테이블',
+	'Change' => '변경',
+	'Source' => '소스',
+	'Target' => '타겟',
+	'Add column' => '열 추가',
+	'Alter' => '변경',
+	'Add foreign key' => '외부 키를 추가',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Index Type' => '인덱스 형',
+	'Column (length)' => '열 (길이)',
+	'View has been dropped.' => '보기를 삭제했습니다.',
 	'View has been altered.' => '보기를 변경했습니다.',
 	'View has been created.' => '보기를 만들었습니다.',
-	'View has been dropped.' => '보기를 삭제했습니다.',
+	'Alter view' => '보기 변경',
-	'View' => '보기',
+	'Create view' => '뷰 만들기',
-	'Warnings' => '경고',
+	'Name' => '이름',
-	'Webserver file %s' => '웹서버 파일 %s',
+	'Process list' => '프로세스 목록',
+	'%d process(es) have been killed.' => '%d 프로세스를 강제 종료되었습니다.',
+	'Kill' => '강제 종료',
+	'Parameter name' => '참조 여명',
+	'Database schema' => '구조',
+	'Create procedure' => '시저 만들기',
+	'Create function' => '함수 만들기',
+	'Routine has been dropped.' => '루틴 만들기',
+	'Routine has been altered.' => '루틴 변경',
+	'Routine has been created.' => '루틴 만들기',
+	'Alter function' => '함수의 변경',
+	'Alter procedure' => '시저 변경',
+	'Return type' => '반환 형식',
+	'Add trigger' => '트리거 추가',
+	'Trigger has been dropped.' => '트리거를 제거했습니다.',
+	'Trigger has been altered.' => '트리거를 변경했습니다.',
+	'Trigger has been created.' => '트리거를 추가했습니다.',
+	'Alter trigger' => '트리거 변경',
+	'Create trigger' => '트리거 만들기',
+	'Time' => '시간',
+	'Event' => '이벤트',
+	'%s version: %s through PHP extension %s' => '%s 버전 %s, PHP 확장 %s',
+	'%d row(s)' => '%d 행',
+	'Remove' => '제외',
+	'Are you sure?' => '실행 하시겠습니까?',
+	'Privileges' => '권한',
+	'Create user' => '사용자 만들기',
+	'User has been dropped.' => '사용자 삭제',
+	'User has been altered.' => '사용자 변경',
+	'User has been created.' => '사용자 만들기',
+	'Hashed' => 'Hashed',
+	'Column' => '열',
+	'Routine' => '루틴',
+	'Grant' => '권한 부여',
+	'Revoke' => '권한 취소',
+	'Logged as: %s' => '로그 : %s',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 데이터가 너무 큽니다. 데이터 크기를 줄이거나 %s 설정을 늘리십시오.',
+	'Move up' => '상',
+	'Move down' => '아래',
+	'Export' => '내보내기',
+	'Tables' => '테이블',
+	'Data' => '데이터',
+	'Output' => '출력',
+	'open' => '열',
+	'save' => '저장',
+	'Format' => '형식',
+	'Functions' => '함수',
+	'Aggregation' => '집합',
+	'Event has been dropped.' => '삭제했습니다.',
+	'Event has been altered.' => '변경했습니다.',
+	'Event has been created.' => '만들었습니다.',
+	'Alter event' => '변경',
+	'Create event' => '만들기',
+	'Start' => '시작',
+	'End' => '종료',
+	'Every' => '매번',
+	'Status' => '상태',
+	'On completion preserve' => '완성 후 저장',
+	'Events' => '이벤트',
+	'Schedule' => '일정',
+	'At given time' => '지정 시간',
+	'Tables have been truncated.' => '테이블을 truncate했습니다.',
+	'Tables have been moved.' => '테이블을 옮겼습니다.',
+	'Tables and views' => '테이블과 뷰',
+	'Engine' => '엔진',
+	'Collation' => '정렬',
+	'Data Length' => '데이터 길이',
+	'Index Length' => '인덱스 길이',
+	'Data Free' => '여유',
+	'Rows' => '행',
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Analyze' => '분석',
+	'Optimize' => '최적화',
+	'Check' => '확인',
+	'Repair' => '복구',
+	'Truncate' => 'Truncate',
+	'Move to other database' => '다른 데이터베이스로 이동',
+	'Move' => '이동',
+	'Save and continue edit' => '저장하고 계속',
+	'original' => '원래',
+	'%d item(s) have been affected.' => '%d를 갱신했습니다.',
 	'Whole result' => '모든 결과',
-	'yes' => '네',
+	'Tables have been dropped.' => '테이블을 삭제했습니다.',
-	'You are offline.' => '오프라인입니다.',
+	'Clone' => '복제',
-	'You can upload a big SQL file via FTP and import it from server.' => '큰 SQL 파일은 FTP를 통하여 업로드하여 서버에서 가져올 수 있습니다.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s를 늘리십시오.',
-	'You have no privileges to update this table.' => '이 테이블을 업데이트할 권한이 없습니다.',
+	'Partition by' => '파티션',
+	'Partitions' => '파티션',
+	'Partition name' => '파티션 이름',
+	'Values' => '값',
+	'%d row(s) have been imported.' => '%d 행을 가져 왔습니다.',
+	'Show structure' => '구조',
+	'anywhere' => '모든',
+	'Import' => '가져 오기',
+	'Stop on error' => '오류의 경우 중지',
+	'Select data' => '데이터',
+	'%.3f s' => '%.3f 초',
+	'$1-$3-$5' => '$1-$3-$5',
+	'[yyyy]-mm-dd' => '[yyyy]-mm-dd',
+	'History' => '역사',
+	'Variables' => '변수',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '원본 및 대상 열은 동일한 데이터 형식이어야합니다. 목표 컬럼에 인덱스와 데이터가 존재해야합니다.',
+	'Relations' => '관계',
+	'Run file' => '파일을 실행',
+	'Clear' => '삭제',
+	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB',
+	'Numbers' => '숫자',
+	'Date and time' => '시간',
+	'Strings' => '문자열',
+	'Binary' => '이진',
+	'Lists' => '목록',
+	'Editor' => '에디터',
+	'E-mail' => '메일',
+	'From' => '보낸 사람',
+	'Subject' => '제목',
+	'Send' => '보내기',
+	'%d e-mail(s) have been sent.' => '%d 메일을 보냈습니다.',
+	'Webserver file %s' => 'Web 서버 파일 %s',
+	'File does not exist.' => '파일이 존재하지 않습니다.',
+	'%d in total' => '총 %d',
+	'Permanent login' => '영구적으로 로그인',
+	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Search data in tables' => '데이터 검색',
+	'Schema' => '스키마',
+	'Alter schema' => '스키마 변경',
+	'Create schema' => '스키마 추가',
+	'Schema has been dropped.' => '스키마를 삭제했습니다.',
+	'Schema has been created.' => '스키마를 추가했습니다.',
+	'Schema has been altered.' => '스키마를 변경했습니다.',
+	'Sequences' => '시퀀스',
+	'Create sequence' => '시퀀스 만들기',
+	'Alter sequence' => '순서 변경',
+	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
+	'Sequence has been created.' => '시퀀스를 추가했습니다.',
+	'Sequence has been altered.' => '순서를 변경했습니다.',
+	'User types' => '사용자 정의 형',
+	'Create type' => '사용자 정의 형식 만들기',
+	'Alter type' => '사용자 정의 형식 변경',
+	'Type has been dropped.' => '사용자 정의 형식을 삭제했습니다.',
+	'Type has been created.' => '사용자 정의 형식을 추가했습니다.',
+	'Use edit link to modify this value.' => '링크 편집',
+	'last' => '마지막',
+	'From server' => '서버에서 실행',
+	'System' => '데이터베이스 형식',
+	'empty' => '하늘',
+	'Network' => '네트워크 형',
+	'Geometry' => '기하 형',
+	'File exists.' => '파일이 이미 있습니다.',
+	'Attachments' => '첨부 파일',
+	'Item%s has been inserted.' => '%s 항목을 삽입했습니다.',
+	'now' => '현재 시간',
+	'%d query(s) executed OK.' => '%d 쿼리를 실행했습니다.',
+	'Show only errors' => '오류 만 표시',
+	'Refresh' => '새로 고침',
+	'Invalid schema.' => '잘못된 스키마',
+	'Please use one of the extensions %s.' => '하나의 확장 기능을 사용하십시오 %s',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => '테이블을 복사했습니다',
+	'Copy' => '복사',
+	'Permanent link' => '영구 링크',
+	'Edit all' => '모든 편집',
+	'HH:MM:SS' => '시:분:초',
 );

adminer/lang/lt.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistema',
@@ -75,6 +73,7 @@ $translations = array(
 	'Data' => 'Duomenys',
 	
 	'Database' => 'Duomenų bazė',
+	'database' => 'duomenų bazė',
 	'Use' => 'Naudoti',
 	'Select database' => 'Pasirinkti duomenų bazę',
 	'Invalid database.' => 'Neteisinga duomenų bazė.',
@@ -183,7 +182,7 @@ $translations = array(
 	'Alter indexes' => 'Redaguoti indeksus',
 	'Add next' => 'Pridėti kitą',
 	'Index Type' => 'Indekso tipas',
-	'length' => 'ilgis',
+	'Column (length)' => 'Stulpelis (ilgis)',
 	
 	'Foreign keys' => 'Išoriniai raktai',
 	'Foreign key' => 'Išorinis raktas',

adminer/lang/lv.inc.php

@@ -1,304 +0,0 @@
-<?php
-namespace Adminer;
-
-$translations = array(
-	'Login' => 'Ieiet',
-	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
-	'Invalid credentials.' => 'Nepareizs lietotāja vārds vai parole.',
-	'Server' => 'Serveris',
-	'Username' => 'Lietotājs',
-	'Password' => 'Parole',
-	'Select database' => 'Izvēlēties datubāzi',
-	'Invalid database.' => 'Nederīga datubāze.',
-	'Table has been dropped.' => 'Tabula dzēsta.',
-	'Table has been altered.' => 'Tabula mainīta.',
-	'Table has been created.' => 'Tabula izveidota.',
-	'Alter table' => 'Mainīt tabulu',
-	'Create table' => 'Izveidot tabulu',
-	'Table name' => 'Tabulas nosaukums',
-	'engine' => 'Tabulas tips',
-	'collation' => 'Kolācija',
-	'Column name' => 'Lauka nosaukums',
-	'Type' => 'Tips',
-	'Length' => 'Garums',
-	'Auto Increment' => 'Auto inkrements',
-	'Options' => 'Opcijas',
-	'Save' => 'Saglabāt',
-	'Drop' => 'Dzēst',
-	'Database has been dropped.' => 'Datubāze tika nodzēsta.',
-	'Database has been created.' => 'Datubāze tika izveidota.',
-	'Database has been renamed.' => 'Datubāze tika pārsaukta.',
-	'Database has been altered.' => 'Datubāze tika mainīta.',
-	'Alter database' => 'Mainīt datubāzi',
-	'Create database' => 'Izveidot datubāzi',
-	'SQL command' => 'SQL pieprasījums',
-	'Logout' => 'Iziet',
-	'Use' => 'Lietot',
-	'No tables.' => 'Datubāzē nav tabulu.',
-	'select' => 'izvēlēties',
-	'Item has been deleted.' => 'Ieraksts dzests.',
-	'Item has been updated.' => 'Ieraksts atjaunots.',
-	'Item%s has been inserted.' => 'Ieraksti%s tika ievietoti.',
-	'Edit' => 'Rediģēt',
-	'Insert' => 'Ievietot',
-	'Save and insert next' => 'Saglabāt un ievietot nākamo',
-	'Delete' => 'Dzēst',
-	'Database' => 'Datubāze',
-	'Routines' => 'Procedūras un funkcijas',
-	'Indexes have been altered.' => 'Indeksi mainīti.',
-	'Indexes' => 'Indeksi',
-	'Alter indexes' => 'Izmainīt indeksus',
-	'Add next' => 'Pievienot vēl',
-	'Language' => 'Valoda',
-	'Select' => 'Izvēlēties',
-	'New item' => 'Jauns ieraksts',
-	'Search' => 'Meklēšana',
-	'Sort' => 'Kārtošana',
-	'descending' => 'dilstoši',
-	'Limit' => 'Limits',
-	'No rows.' => 'Nav rindu.',
-	'Action' => 'Darbība',
-	'edit' => 'rediģēt',
-	'Page' => 'Lapa',
-	'Query executed OK, %d row(s) affected.' => array('Pieprasījums pabeigts, izmainīts %d ieraksts.', 'Pieprasījums pabeigts, izmainīti %d ieraksti.', 'Pieprasījums pabeigts, izmainīti %d ieraksti.'),
-	'Error in query' => 'Kļūda pieprasījumā',
-	'Execute' => 'Izpidīt',
-	'Table' => 'Tabula',
-	'Foreign keys' => 'Ārejā atslēgas',
-	'Triggers' => 'Trigeri',
-	'View' => 'Skats',
-	'Unable to select the table' => 'Tabula nav pieejama',
-	'Invalid CSRF token. Send the form again.' => 'Nederīgs CSRF žetons. Nosūtiet formu vēl vienu reizi.',
-	'Comment' => 'Komentārs',
-	'Default values' => 'Noklusētā vērtība',
-	'%d byte(s)' => array('%d baits', '%d baiti', '%d baiti'),
-	'No commands to execute.' => 'Nav izpildāmu komandu.',
-	'Unable to upload a file.' => 'Neizdevās ielādēt failu uz servera.',
-	'File upload' => 'Augšupielāde',
-	'File uploads are disabled.' => 'Augšupielādes aizliegtas.',
-	'Routine has been called, %d row(s) affected.' => array('Procedūra izsaukta, izmainīts %d ieraksts.', 'Procedūra izsaukta, izmainīti %d ieraksti.', 'Procedūra izsaukta, izmainīti %d ieraksti.'),
-	'Call' => 'Izsaukt',
-	'No extension' => 'Nav paplašinājuma',
-	'None of the supported PHP extensions (%s) are available.' => 'Neviens PHP no atbalstītajiem paplašinājumiem (%s) nav pieejams.',
-	'Session support must be enabled.' => 'Sesiju atbalstam jābūt ieslēgtam.',
-	'Session expired, please login again.' => 'Sesijas laiks ir beidzies, piesakies no jauna sistēmā.',
-	'Text length' => 'Teksta garums',
-	'Foreign key has been dropped.' => 'Ārejā atslēga dzēsta.',
-	'Foreign key has been altered.' => 'Ārejā atslēga izmainīta.',
-	'Foreign key has been created.' => 'Ārejā atslēga izveidota.',
-	'Foreign key' => 'Ārejā atslēga',
-	'Target table' => 'Mērķa tabula',
-	'Change' => 'Mainīt',
-	'Source' => 'Avots',
-	'Target' => 'Mērķis',
-	'Add column' => 'Pievienot lauku',
-	'Alter' => 'Izmainīt',
-	'Add foreign key' => 'Pievienot ārējo atslēgu',
-	'ON DELETE' => 'Pie dzēšanas',
-	'ON UPDATE' => 'Pie atjaunošanas',
-	'Index Type' => 'Indeksa tips',
-	'length' => 'garums',
-	'View has been dropped.' => 'Skats dzēsts.',
-	'View has been altered.' => 'Skats izmainīts.',
-	'View has been created.' => 'Skats izveidots.',
-	'Alter view' => 'Izmainīt skatu',
-	'Create view' => 'Izveidot skatu',
-	'Name' => 'Nosaukums',
-	'Process list' => 'Procesu saraksts',
-	'%d process(es) have been killed.' => array('Pabeigts %d process.', 'Pabeigti %d procesi.', 'Pabeigti %d procesi.'),
-	'Kill' => 'Nobeigt',
-	'Parameter name' => 'Parametra nosaukums',
-	'Database schema' => 'Datubāzes shēma',
-	'Create procedure' => 'Izveidot procedūru',
-	'Create function' => 'Izveidot funkciju',
-	'Routine has been dropped.' => 'Procedūru dzēsta.',
-	'Routine has been altered.' => 'Procedūru izmainīta.',
-	'Routine has been created.' => 'Procedūru izveidota.',
-	'Alter function' => 'Mainīt funkciju',
-	'Alter procedure' => 'Mainīt procedūru',
-	'Return type' => 'Atgriezt tips',
-	'Add trigger' => 'Pievienot trigeri',
-	'Trigger has been dropped.' => 'Trigeris dzēsts.',
-	'Trigger has been altered.' => 'Trigeris izmainīts.',
-	'Trigger has been created.' => 'Trigeris izveidots.',
-	'Alter trigger' => 'Izmainīt trigeri',
-	'Create trigger' => 'Izveidot trigeri',
-	'Time' => 'Laiks',
-	'Event' => 'Notikums',
-	'%s version: %s through PHP extension %s' => 'Versija %s: %s ar PHP paplašinājumu %s',
-	'%d row(s)' => array('%d rinda', '%d rindas', '%d rindu'),
-	'Remove' => 'Noņemt',
-	'Are you sure?' => 'Vai Tu esi pārliecināts?',
-	'Privileges' => 'Tiesības',
-	'Create user' => 'Izveidot lietotāju',
-	'User has been dropped.' => 'Lietotājs dzests.',
-	'User has been altered.' => 'Lietotājs izmainīts.',
-	'User has been created.' => 'Lietotājs izveidots.',
-	'Hashed' => 'Sajaukts',
-	'Column' => 'Lauks',
-	'Routine' => 'Procedūra',
-	'Grant' => 'Atļaut',
-	'Revoke' => 'Aizliegt',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST metodes pieprasījums apjoms par lielu. Atsūtiet mazāka apjoma pieprasījumu kā konfigurācijas %s.',
-	'Logged as: %s' => 'Ielogojies kā: %s',
-	'Move up' => 'Pārvietot uz augšu',
-	'Move down' => 'Pārvietot uz leju',
-	'Functions' => 'Funkcijas',
-	'Aggregation' => 'Agregācija',
-	'Export' => 'Eksports',
-	'Output' => 'Izejas dati',
-	'open' => 'atvērt',
-	'save' => 'saglabāt',
-	'Format' => 'Formāts',
-	'Tables' => 'Tabulas',
-	'Data' => 'Dati',
-	'Event has been dropped.' => 'Notikums dzēsts.',
-	'Event has been altered.' => 'Notikums izmainīts.',
-	'Event has been created.' => 'Notikums izveidots.',
-	'Alter event' => 'Izmainīt notikumu',
-	'Create event' => 'Izveidot notikumu',
-	'At given time' => 'Norāditā laikā',
-	'Every' => 'Katru',
-	'Events' => 'Notikumi',
-	'Schedule' => 'Grafiks',
-	'Start' => 'Sākums',
-	'End' => 'Beigas',
-	'Status' => 'Statuss',
-	'On completion preserve' => 'Beigās saglabāt',
-	'Tables and views' => 'Tabulas un skati',
-	'Data Length' => 'Datu apjoms',
-	'Index Length' => 'Indeksu izmērs',
-	'Data Free' => 'Brīvā vieta',
-	'Collation' => 'Kolācija',
-	'Analyze' => 'Analizēt',
-	'Optimize' => 'Optimizēt',
-	'Check' => 'Pārbaudīt',
-	'Repair' => 'Salabot',
-	'Truncate' => 'Iztīrīt',
-	'Tables have been truncated.' => 'Tabulas iztīrītas.',
-	'Rows' => 'Rindas',
-	',' => ' ',
-	'0123456789' => '0123456789',
-	'Tables have been moved.' => 'Tabulas pārvietotas.',
-	'Move to other database' => 'Pārvietot uz citu datubāzi',
-	'Move' => 'Pārvietot',
-	'Engine' => 'Dzinējs',
-	'Save and continue edit' => 'Saglabāt un turpināt rediģēt',
-	'original' => 'oriģināls',
-	'%d item(s) have been affected.' => array('Izmainīts %d ieraksts.', 'Izmainīti %d ieraksti.', 'Izmainīti %d ieraksti.'),
-	'Whole result' => 'Viss rezultāts',
-	'Tables have been dropped.' => 'Tabulas dzēstas.',
-	'Clone' => 'Klonēt',
-	'Partition by' => 'Sadalīt pēc',
-	'Partitions' => 'Partīcijas',
-	'Partition name' => 'Partīcijas nosaukums',
-	'Values' => 'Vērtības',
-	'%d row(s) have been imported.' => array('Importēta %d rinda.', 'Importētas %d rindas.', 'Importētas %d rindas.'),
-	'Import' => 'Imports',
-	'Stop on error' => 'Astāties kļūdas gadījumā',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sasniegts maksimālais lauku skaita ierobežojums. Palieliniet %s.',
-	'anywhere' => 'jebkurā vietā',
-	'%.3f s' => '%.3f s',
-	'$1-$3-$5' => '$5.$3.$1',
-	'[yyyy]-mm-dd' => 'dd.mm.[gggg]',
-	'History' => 'Vēsture',
-	'Variables' => 'Mainīgie',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Lauku tipiem jābūt vienādiem, rezultējošā laukā jābut indeksa datiem.',
-	'Relations' => 'Relācijas',
-	'Run file' => 'Izpildīt failu',
-	'Clear' => 'Notīrīt',
-	'Maximum allowed file size is %sB.' => 'Faila maksimālais izmērs — %sB.',
-	'Numbers' => 'Skaitļi',
-	'Date and time' => 'Datums un laiks',
-	'Strings' => 'Virknes',
-	'Binary' => 'Binārie',
-	'Lists' => 'Saraksti',
-	'Editor' => 'Redaktors',
-	'E-mail' => 'Epasts',
-	'From' => 'No',
-	'Subject' => 'Tēma',
-	'Send' => 'Sūtīt',
-	'%d e-mail(s) have been sent.' => array('Nosūtīts %d epasts.', 'Nosūtīti %d epasti.', 'Nosūtīti %d epasti.'),
-	'Webserver file %s' => 'Fails %s uz servera',
-	'File does not exist.' => 'Fails neeksistē.',
-	'%d in total' => 'Kopā %d',
-	'Permanent login' => 'Atcerēties mani',
-	'Databases have been dropped.' => 'Datubāzes dzēstas.',
-	'Search data in tables' => 'Meklēt tabulās',
-	'Schema' => 'Shēma',
-	'Alter schema' => 'Izmainīt shēmu',
-	'Create schema' => 'Jauna shēma',
-	'Schema has been dropped.' => 'Shēma dzēsta.',
-	'Schema has been created.' => 'Izveidota jauna shēma.',
-	'Schema has been altered.' => 'Shēma izmainīta.',
-	'Sequences' => 'Virknes',
-	'Create sequence' => 'Izveidot virkni',
-	'Alter sequence' => 'Izmainīt virkni',
-	'Sequence has been dropped.' => 'Virkne dzēsta.',
-	'Sequence has been created.' => 'Izveidota virkne.',
-	'Sequence has been altered.' => 'Virkne izmainīta.',
-	'User types' => 'Lietotāju tipi',
-	'Create type' => 'Izveidot tipu',
-	'Alter type' => 'Izmainīt tipu',
-	'Type has been dropped.' => 'Tips dzēsts.',
-	'Type has been created.' => 'Tips izveidots.',
-	'Ctrl+click on a value to modify it.' => 'Lai izmainītu vērtību, izmanto Ctrl + peles klikšķi.',
-	'Use edit link to modify this value.' => 'Izmainīt vērtību var tikai ar saiti "Izmainīt".',
-	'last' => 'pēdējā',
-	'From server' => 'No servera',
-	'System' => 'Sistēma',
-	'Select data' => 'Izvēlēties datus',
-	'Show structure' => 'Parādīt struktūru',
-	'empty' => 'tukšs',
-	'Network' => 'Tīkls',
-	'Geometry' => 'Ģeometrija',
-	'File exists.' => 'Fails eksistē.',
-	'Attachments' => 'Pielikumi',
-	'%d query(s) executed OK.' => array('%d pieprasījums veiksmīgs.', '%d pieprasījumi veiksmīgi.', '%d pieprasījumi veiksmīgi.'),
-	'Show only errors' => 'Rādīt tikai kļūdas',
-	'Refresh' => 'Atjaunot',
-	'Invalid schema.' => 'Nederīga shēma.',
-	'Please use one of the extensions %s.' => 'Izmainojiet kādu no paplašinājumiem %s.',
-	'now' => 'tagad',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => 'Tabulas nokopētas.',
-	'Copy' => 'kopēt',
-	'Permanent link' => 'Pastāvīga saite',
-	'Edit all' => 'Rediģēt visus',
-	'HH:MM:SS' => 'HH:MM:SS',
-	'Tables have been optimized.' => 'Tabulas optimizētas.',
-	'Materialized view' => 'Matrializēts skats',
-	'Vacuum' => 'Vakums',
-	'Selected' => 'Izvēlētie',
-	'File must be in UTF-8 encoding.' => 'Failam jābūt UTF-8 kodējumam.',
-	'Modify' => 'Izmainīt',
-	'Loading' => 'Ielāde',
-	'Load more data' => 'Ielādēt vēl datus',
-	'ATTACH queries are not supported.' => 'ATTACH-pieprasījumi nav atbalstīti.',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Rindu limits',
-	'Default value' => 'Noklusētā vērtība',
-	'Full table scan' => 'Pilna tabulas analīze',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtes.', 'Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtēm.', 'Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtēm.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-parole nav derīga. <a href="https://www.adminer.org/en/extension/"%s>Implementējiet</a> metodi %s, lai padarīgu šo par ierastu metodi.',
-	'If you did not send this request from Adminer then close this page.' => 'Ja nesūtījāt šo pieprasījumu no Adminer, tad aizveriet pārlūka logu.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Varat ielādēt lielu SQL failu uz servera un tad importēt to.',
-	'Size' => 'Izmērs',
-	'Compute' => 'Izskaitļot',
-	'You are offline.' => 'Jūs est bezsasaistē.',
-	'You have no privileges to update this table.' => 'jums nav pieejas labot šo tabulu.',
-	'Saving' => 'Saglabāšana',
-	'yes' => 'Jā',
-	'no' => 'Nē',
-	'Drop %s?' => 'Dzēst %s?',
-	'overwrite' => 'pārrakstīt',
-	'DB' => 'DB',
-	'Warnings' => 'Brīdinājumi',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer neatbalsta pieeju bez paroles, <a href="https://www.adminer.org/en/password/"%s>vairāk informācijas šeit</a>.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Paldies, ka izmantoji Adminer, vai vēlies veikt <a href="https://www.adminer.org/en/donation/">ziedojumu</a>.',
-	'The action will be performed after successful login with the same credentials.' => 'Darbība tiks pabeigta pēc derīgas pieteikšanās sistēmā.',
-	'Connecting to privileged ports is not allowed.' => 'Pieeja priviliģētiem portiem nav atļauta.',
-	'There is a space in the input password which might be the cause.' => 'Parole satur atstarpi, kas varētu būt lieka.',
-	'Unknown error.' => 'Nezināma kļūda.',
-	'Database does not support password.' => 'Datubāze neatbalsta paroli.',
-);

adminer/lang/ms.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -84,6 +82,7 @@ $translations = array(
 	'Data' => 'Data',
 
 	'Database' => 'Pangkalan data',
+	'database' => 'pangkalan data',
 	'Use' => 'Guna',
 	'Select database' => 'Pilih pangkalan data',
 	'Invalid database.' => 'Pangkalan data tidak sah.',
@@ -199,7 +198,7 @@ $translations = array(
 	'Alter indexes' => 'Ubah indeks',
 	'Add next' => 'Tambah yang seterusnya',
 	'Index Type' => 'Jenis Indeks',
-	'length' => 'kepanjangan',
+	'Column (length)' => 'Kolum (kepanjangan)',
 
 	'Foreign keys' => 'Kunci asing',
 	'Foreign key' => 'Kunci asing',

adminer/lang/nl.inc.php

@@ -1,10 +1,8 @@
 <?php
-namespace Adminer;
-
 $translations = array(
-	'Login' => 'Aanmelden',
+	'Login' => 'Inloggen',
-	'Logout successful.' => 'Successvol afgemeld.',
+	'Logout successful.' => 'Uitloggen geslaagd.',
-	'Invalid credentials.' => 'Ongeldige gebruikersgegevens.',
+	'Invalid credentials.' => 'Ongeldige logingegevens.',
 	'Server' => 'Server',
 	'Username' => 'Gebruikersnaam',
 	'Password' => 'Wachtwoord',
@@ -33,7 +31,8 @@ $translations = array(
 	'Alter database' => 'Database aanpassen',
 	'Create database' => 'Database aanmaken',
 	'SQL command' => 'SQL opdracht',
-	'Logout' => 'Afmelden',
+	'Logout' => 'Uitloggen',
+	'database' => 'database',
 	'Use' => 'Gebruik',
 	'No tables.' => 'Geen tabellen.',
 	'select' => 'kies',
@@ -42,7 +41,7 @@ $translations = array(
 	'Item%s has been inserted.' => 'Item%s toegevoegd.',
 	'Edit' => 'Bewerk',
 	'Insert' => 'Toevoegen',
-	'Save and insert next' => 'Opslaan en volgende toevoegen',
+	'Save and insert next' => 'Opslaan, daarna toevoegen',
 	'Delete' => 'Verwijderen',
 	'Database' => 'Database',
 	'Routines' => 'Procedures',
@@ -61,7 +60,7 @@ $translations = array(
 	'Action' => 'Acties',
 	'edit' => 'bewerk',
 	'Page' => 'Pagina',
-	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij aangepast.', 'Query uitgevoerd, %d rijen aangepast.'),
+	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen beïnvloed.'),
 	'Error in query' => 'Fout in query',
 	'Execute' => 'Uitvoeren',
 	'Table' => 'Tabel',
@@ -82,7 +81,7 @@ $translations = array(
 	'No extension' => 'Geen extensie',
 	'None of the supported PHP extensions (%s) are available.' => 'Geen geldige PHP extensies beschikbaar (%s).',
 	'Session support must be enabled.' => 'Sessies moeten geactiveerd zijn.',
-	'Session expired, please login again.' => 'Uw sessie is verlopen. Gelieve opnieuw aan te melden.',
+	'Session expired, please login again.' => 'Uw sessie is verlopen. Gelieve opnieuw in te loggen.',
 	'Text length' => 'Tekst lengte',
 	'Foreign key has been dropped.' => 'Foreign key verwijderd.',
 	'Foreign key has been altered.' => 'Foreign key aangepast.',
@@ -98,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index type',
-	'length' => 'lengte',
+	'Column (length)' => 'Kolom (lengte)',
 	'View has been dropped.' => 'View verwijderd.',
 	'View has been altered.' => 'View aangepast.',
 	'View has been created.' => 'View aangemaakt.',
@@ -254,7 +253,7 @@ $translations = array(
 	'Geometry' => 'Geometrie',
 	'File exists.' => 'Bestand bestaat reeds.',
 	'Attachments' => 'Bijlagen',
-	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd.'),
+	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd'),
 	'Show only errors' => 'Enkel fouten tonen',
 	'Refresh' => 'Vernieuwen',
 	'Invalid schema.' => 'Ongeldig schema.',
@@ -266,39 +265,4 @@ $translations = array(
 	'Permanent link' => 'Permanente link',
 	'Edit all' => 'Alles bewerken',
 	'HH:MM:SS' => 'HH:MM:SS',
-	'Drop %s?' => 'Verwijder %s?',
-	'Tables have been optimized.' => 'Tabellen zijn geoptimaliseerd.',
-	'Materialized view' => 'Materialized view',
-	'Vacuum' => 'Vacuum',
-	'Selected' => 'Geselecteerd',
-	'overwrite' => 'overschrijven',
-	'DB' => 'DB',
-	'File must be in UTF-8 encoding.' => 'Het bestand moet met UTF-8 encodering zijn opgeslagen.',
-	'Modify' => 'Aanpassen',
-	'Load more data' => 'Meer data inladen',
-	'Loading' => 'Aan het laden',
-	'ATTACH queries are not supported.' => 'ATTACH queries worden niet ondersteund.',
-	'Warnings' => 'Waarschuwingen',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Rijen beperken',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ondersteunt geen toegang tot databases zonder wachtwoord, <a href="https://www.adminer.org/en/password/"%s>meer informatie</a>.',
-	'Default value' => 'Standaardwaarde',
-	'Full table scan' => 'Full table scan',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuut.', 'Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuten.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master wachtwoord verlopen. <a href="https://www.adminer.org/en/extension/"%s>Implementeer</a> de %s methode om het permanent te maken.',
-	'The action will be performed after successful login with the same credentials.' => 'Deze actie zal uitgevoerd worden na het succesvol aanmelden met dezelfde gebruikersgegevens.',
-	'Connecting to privileged ports is not allowed.' => 'Verbindingen naar geprivilegieerde poorten is niet toegestaan.',
-	'There is a space in the input password which might be the cause.' => 'Er staat een spatie in het wachtwoord, wat misschien de oorzaak is.',
-	'If you did not send this request from Adminer then close this page.' => 'Als u deze actie niet via Adminer hebt gedaan, gelieve deze pagina dan te sluiten.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'U kan een groot SQL-bestand uploaden via FTP en het importeren via de server.',
-	'Size' => 'Grootte',
-	'Compute' => 'Bereken',
-	'You are offline.' => 'U bent offline.',
-	'You have no privileges to update this table.' => 'U bent niet gemachtigd om deze tabel aan te passen.',
-	'Saving' => 'Opslaan',
-	'Unknown error.' => 'Onbekende fout.',
-	'Database does not support password.' => 'Database ondersteunt het wachtwoord niet.',
-	'Disable %s or enable %s or %s extensions.' => 'Schakel %s uit or schakel extensies %s of %s in.',
-	'yes' => 'ja',
-	'no' => 'neen',
 );

adminer/lang/no.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'System' => 'System',
 	'Server' => 'Server',
@@ -66,6 +64,7 @@ $translations = array(
 	'Format' => 'Format',
 	'Data' => 'Data',
 	'Database' => 'Database',
+	'database' => 'database',
 	'Use' => 'Bruk',
 	'Select database' => 'Velg database',
 	'Invalid database.' => 'Ugyldig database.',
@@ -166,7 +165,7 @@ $translations = array(
 	'Alter indexes' => 'Endre indekser',
 	'Add next' => 'Legg til neste',
 	'Index Type' => 'Indekstype',
-	'length' => 'lengde',
+	'Column (length)' => 'Kolonne (lengde)',
 	'Foreign keys' => 'Fremmednøkler',
 	'Foreign key' => 'Fremmednøkkel',
 	'Foreign key has been dropped.' => 'Fremmednøkkelen er slettet.',

adminer/lang/pl.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Rodzaj bazy',
@@ -9,14 +7,11 @@ $translations = array(
 	'Password' => 'Hasło',
 	'Permanent login' => 'Zapamiętaj sesję',
 	'Login' => 'Zaloguj się',
-	'Logout' => 'Wyloguj się',
+	'Logout' => 'Wyloguj',
 	'Logged as: %s' => 'Zalogowany jako: %s',
 	'Logout successful.' => 'Wylogowano pomyślnie.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ <a href="https://www.adminer.org/pl/donation/">dotację</a>.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ proszę <a href="https://www.adminer.org/pl/donation/">dotację</a>.',
 	'Invalid credentials.' => 'Nieprawidłowe dane logowania.',
-	'There is a space in the input password which might be the cause.' => 'W haśle wejściowym znajduje się spacja, która może być przyczyną.',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nie obsługuje dostępu do bazy danych bez hasła, <a href="https://www.adminer.org/pl/password/"%s>więcej informacji</a>.',
-	'Database does not support password.' => 'Baza danych nie obsługuje hasła.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Za dużo nieudanych prób logowania, spróbuj ponownie za %d minutę.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minuty.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minut.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ważność hasła głównego wygasła. <a href="https://www.adminer.org/pl/extension/"%s>Zaimplementuj</a> własną metodę %s, aby ustawić je na stałe.',
 	'Language' => 'Język',
@@ -25,10 +20,8 @@ $translations = array(
 	'No extension' => 'Brak rozszerzenia',
 	'None of the supported PHP extensions (%s) are available.' => 'Żadne z rozszerzeń PHP umożliwiających połączenie się z bazą danych (%s) nie jest dostępne.',
 	'Connecting to privileged ports is not allowed.' => 'Łączenie do portów uprzywilejowanych jest niedozwolone.',
-	'Disable %s or enable %s or %s extensions.' => 'Wyłącz %s lub włącz rozszerzenia %s lub %s.',
 	'Session support must be enabled.' => 'Wymagana jest obsługa sesji w PHP.',
 	'Session expired, please login again.' => 'Sesja wygasła, zaloguj się ponownie.',
-	'The action will be performed after successful login with the same credentials.' => 'Czynność zostanie wykonana po pomyślnym zalogowaniu przy użyciu tych samych danych logowania.',
 	'%s version: %s through PHP extension %s' => 'Wersja %s: %s za pomocą %s',
 	'Refresh' => 'Odśwież',
 
@@ -58,8 +51,6 @@ $translations = array(
 	'Query executed OK, %d row(s) affected.' => array('Zapytanie wykonane pomyślnie, zmieniono %d rekord.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordy.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordów.'),
 	'No commands to execute.' => 'Nic do wykonania.',
 	'Error in query' => 'Błąd w zapytaniu',
-	'Unknown error.' => 'Nieznany błąd.',
-	'Warnings' => 'Ostrzeżenia',
 	'ATTACH queries are not supported.' => 'Zapytania ATTACH są niewspierane.',
 	'Execute' => 'Wykonaj',
 	'Stop on error' => 'Zatrzymaj w przypadku błędu',
@@ -82,7 +73,7 @@ $translations = array(
 	'You can upload a big SQL file via FTP and import it from server.' => 'Większe pliki SQL możesz wgrać na serwer poprzez FTP przed zaimportowaniem.',
 	'You are offline.' => 'Jesteś offline.',
 	
-	'Export' => 'Eksportuj',
+	'Export' => 'Eksport',
 	'Output' => 'Rezultat',
 	'open' => 'otwórz',
 	'save' => 'zapisz',
@@ -90,7 +81,7 @@ $translations = array(
 	'Data' => 'Dane',
 	
 	'Database' => 'Baza danych',
-	'DB' => 'BD',
+	'database' => 'baza danych',
 	'Use' => 'Wybierz',
 	'Select database' => 'Wybierz bazę danych',
 	'Invalid database.' => 'Nie znaleziono bazy danych.',
@@ -128,7 +119,6 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele zostały przeniesione.',
 	'Copy' => 'Kopiuj',
 	'Tables have been copied.' => 'Tabele zostały skopiowane.',
-	'overwrite' => 'nadpisz',
 	
 	'Routines' => 'Procedury i funkcje',
 	'Routine has been called, %d row(s) affected.' => array('Procedura została uruchomiona, zmieniono %d rekord.', 'Procedura została uruchomiona, zmieniono %d rekordy.', 'Procedura została uruchomiona, zmieniono %d rekordów.'),
@@ -174,15 +164,15 @@ $translations = array(
 	'Column name' => 'Nazwa kolumny',
 	'Type' => 'Typ',
 	'Length' => 'Długość',
-	'Auto Increment' => 'Automatyczny przyrost',
+	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Opcje',
 	'Comment' => 'Komentarz',
 	'Default value' => 'Wartość domyślna',
 	'Default values' => 'Wartości domyślne',
 	'Drop' => 'Usuń',
 	'Drop %s?' => 'Usunąć %s?',
-	'Are you sure?' => 'Czy na pewno?',
+	'Are you sure?' => 'Czy jesteś pewien?',
-	'Size' => 'Rozmiar',
+	'Size' => 'Wielkość',
 	'Compute' => 'Oblicz',
 	'Move up' => 'Przesuń w górę',
 	'Move down' => 'Przesuń w dół',
@@ -207,7 +197,7 @@ $translations = array(
 	'Alter indexes' => 'Zmień indeksy',
 	'Add next' => 'Dodaj następny',
 	'Index Type' => 'Typ indeksu',
-	'length' => 'długość',
+	'Column (length)' => 'Kolumna (długość)',
 	
 	'Foreign keys' => 'Klucze obce',
 	'Foreign key' => 'Klucz obcy',
@@ -262,14 +252,14 @@ $translations = array(
 	'Whole result' => 'Wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
 	
-	'Import' => 'Importuj',
+	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('%d rekord został zaimportowany.', '%d rekordy zostały zaimportowane.', '%d rekordów zostało zaimportowanych.'),
 	'File must be in UTF-8 encoding.' => 'Kodowanie pliku musi być ustawione na UTF-8.',
 	
 	// in-place editing in select
 	'Modify' => 'Zmień',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+kliknij wartość, aby ją edytować.',
-	'Use edit link to modify this value.' => 'Użyj linku edycji, aby zmienić tę wartość.',
+	'Use edit link to modify this value.' => 'Użyj linku edycji aby zmienić tę wartość.',
 	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Rekord%s został dodany.',
@@ -290,7 +280,7 @@ $translations = array(
 	'Selected' => 'Zaznaczone',
 	'Clone' => 'Duplikuj',
 	'Delete' => 'Usuń',
-	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli.',
+	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli',
 	
 	'E-mail' => 'E-mail',
 	'From' => 'Nadawca',
@@ -347,12 +337,4 @@ $translations = array(
 	'Type has been dropped.' => 'Typ został usunięty.',
 	'Type has been created.' => 'Typ został utworzony.',
 	'Alter type' => 'Zmień typ',
-
-	// Table check constraints
-	'Checks' => 'Kontrole',
-	'Create check' => 'Utwórz kontrolę',
-	'Alter check' => 'Zmień kontrolę',
-	'Check has been created.' => 'Kontrola została utworzona.',
-	'Check has been altered.' => 'Kontrola została zmieniona.',
-	'Check has been dropped.' => 'Kontrola została usunięta.',
 );

adminer/lang/pt-br.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Sair',
+	'database' => 'base de dados',
 	'Use' => 'Usar',
 	'No tables.' => 'Não existem tabelas.',
 	'select' => 'selecionar',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'tamanho',
+	'Column (length)' => 'Coluna (tamanho)',
 	'View has been dropped.' => 'A Visão foi apagada.',
 	'View has been altered.' => 'A Visão foi alterada.',
 	'View has been created.' => 'A Visão foi criada.',

adminer/lang/pt.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Sessão terminada com sucesso.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Terminar sessão',
+	'database' => 'base de dados',
 	'Use' => 'Usar',
 	'No tables.' => 'Não existem tabelas.',
 	'select' => 'registos',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'tamanho',
+	'Column (length)' => 'coluna (tamanho)',
 	'View has been dropped.' => 'Vista eliminada.',
 	'View has been altered.' => 'Vista modificada.',
 	'View has been created.' => 'Vista criada.',

adminer/lang/ro.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Intră',
 	'Logout successful.' => 'Ați ieșit cu succes.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Crează baza de date',
 	'SQL command' => 'SQL query',
 	'Logout' => 'Ieșire',
+	'database' => 'baza de date',
 	'Use' => 'Alege',
 	'No tables.' => 'În baza de date nu sunt tabele.',
 	'select' => 'selectează',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'La ștergere',
 	'ON UPDATE' => 'La modificare',
 	'Index Type' => 'Tipul indexului',
-	'length' => 'lungimea',
+	'Column (length)' => 'Coloană (lungimea)',
 	'View has been dropped.' => 'Reprezentarea a fost ștearsă.',
 	'View has been altered.' => 'Reprezentarea a fost modificată.',
 	'View has been created.' => 'Reprezentarea a fost creată.',
@@ -261,7 +260,7 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Folosiți una din următoarele extensii %s.',
 	'now' => 'acum',
 	'ltr' => 'ltr',
-	'Tables have been copied.' => 'Tabelele au fost copiate.',
+	'Tables have been copied.' => 'Tabelele au fost copiate',
 	'Copy' => 'Copiază',
 	'Permanent link' => 'Adresă permanentă',
 	'Edit all' => 'Editează tot',

adminer/lang/ru.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'Создать базу данных',
 	'SQL command' => 'SQL-запрос',
 	'Logout' => 'Выйти',
+	'database' => 'база данных',
 	'Use' => 'Выбрать',
 	'No tables.' => 'В базе данных нет таблиц.',
 	'select' => 'выбрать',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'При стирании',
 	'ON UPDATE' => 'При обновлении',
 	'Index Type' => 'Тип индекса',
-	'length' => 'длина',
+	'Column (length)' => 'Поле (длина)',
 	'View has been dropped.' => 'Представление было удалено.',
 	'View has been altered.' => 'Представление было изменено.',
 	'View has been created.' => 'Представление было создано.',
@@ -290,16 +289,4 @@ $translations = array(
 	'Saving' => 'Сохранение',
 	'yes' => 'Да',
 	'no' => 'Нет',
-	'Drop %s?' => 'Удалить %s?',
-	'overwrite' => 'перезаписать',
-	'DB' => 'DB',
-	'Warnings' => 'Предупреждения',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer не поддерживает доступ к базе данных без пароля, <a href="https://www.adminer.org/en/password/"%s>больше информации</a>.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Спасибо за использование Adminer, рассмотрите возможность <a href="https://www.adminer.org/en/donation/">пожертвования</a>.',
-	'The action will be performed after successful login with the same credentials.' => 'Действие будет выполнено после успешного входа в систему с теми же учетными данными.',
-	'Connecting to privileged ports is not allowed.' => 'Подключение к привилегированным портам не допускается.',
-	'There is a space in the input password which might be the cause.' => 'В введеном пароле есть пробел, это может быть причиною.',
-	'Unknown error.' => 'Неизвестная ошибка.',
-	'Database does not support password.' => 'База данных не поддерживает пароль.',
-	'Disable %s or enable %s or %s extensions.' => 'Отключите %s или включите расширения %s или %s.',
 );

adminer/lang/sk.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'Prihlásiť sa',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
@@ -34,6 +32,7 @@ $translations = array(
 	'Create database' => 'Vytvoriť databázu',
 	'SQL command' => 'SQL príkaz',
 	'Logout' => 'Odhlásiť',
+	'database' => 'databáza',
 	'Use' => 'Vybrať',
 	'No tables.' => 'Žiadne tabuľky.',
 	'select' => 'vypísať',
@@ -71,7 +70,7 @@ $translations = array(
 	'Unable to select the table' => 'Tabuľku sa nepodarilo vypísať',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odošlite formulár znova.',
 	'Comment' => 'Komentár',
-	'Default values' => 'Predvolené hodnoty',
+	'Default values' => 'Východzie hodnoty',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtov'),
 	'No commands to execute.' => 'Žiadne príkazy na vykonanie.',
 	'Unable to upload a file.' => 'Súbor sa nepodarilo nahrať.',
@@ -95,10 +94,10 @@ $translations = array(
 	'Add column' => 'Pridať stĺpec',
 	'Alter' => 'Zmeniť',
 	'Add foreign key' => 'Pridať cudzí kľúč',
-	'ON DELETE' => 'Pri zmazaní',
+	'ON DELETE' => 'ON DELETE',
-	'ON UPDATE' => 'Pri aktualizácii',
+	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Typ indexu',
-	'length' => 'dĺžka',
+	'Column (length)' => 'Stĺpec (dĺžka)',
 	'View has been dropped.' => 'Pohľad bol odstránený.',
 	'View has been altered.' => 'Pohľad bol zmenený.',
 	'View has been created.' => 'Pohľad bol vytvorený.',
@@ -266,46 +265,4 @@ $translations = array(
 	'Permanent link' => 'Permanentný odkaz',
 	'Edit all' => 'Upraviť všetko',
 	'HH:MM:SS' => 'HH:MM:SS',
-	'Drop %s?' => 'Odstrániť %s?',
-	'Tables have been optimized.' => 'Tabuľky boli optimalizované.',
-	'Materialized view' => 'Materializovaný pohľad',
-	'Vacuum' => 'Vyčistiť',
-	'Selected' => 'Označené',
-	'overwrite' => 'prepísať',
-	'DB' => 'DB',
-	'File must be in UTF-8 encoding.' => 'Súbor musí byť v kódovaní UTF-8.',
-	'Modify' => 'Zmeniť',
-	'Load more data' => 'Načítať ďalšie dáta',
-	'Loading' => 'Načítava sa',
-	'ATTACH queries are not supported.' => 'Dotazy ATTACH nie sú podporované.',
-	'Warnings' => 'Varovania',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Limit riadkov',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nepodporuje prístup k databáze bez hesla, <a href="https://www.adminer.org/cs/password/"%s>viac informácií</a>.',
-	'Default value' => 'Predvolená hodnota',
-	'Full table scan' => 'Prechod celej tabuľky',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Príliš veľa pokusov o prihlásenie, skúste to znova za %d minutu.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minuty.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minút.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Vďaka za používanie Admineru, <a href="https://www.adminer.org/sk/donation/">prispejte</a> na vývoj.',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Platnosť hlavného hesla vypršala. <a href="https://www.adminer.org/cs/extension/"%s>Implementujte</a> metodu %s, aby platilo natrvalo.',
-	'The action will be performed after successful login with the same credentials.' => 'Akcia sa vykoná po úspešnom prihlásení s rovnakými prihlasovacími údajmi.',
-	'Connecting to privileged ports is not allowed.' => 'Pripojenie k privilegovaným portom nie je povolené.',
-	'There is a space in the input password which might be the cause.' => 'V zadanom hesle je medzera, ktorá môže byť príčinou.',
-	'If you did not send this request from Adminer then close this page.' => 'Pokiaľ ste tento požiadavok neodoslali z Adminera, zatvorte túto stránku.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Veľký SQL soubor môžete nahrať pomocou FTP a importovať ho zo servera.',
-	'Size' => 'Veľkosť',
-	'Compute' => 'Spočítať',
-	'You are offline.' => 'Ste offline.',
-	'You have no privileges to update this table.' => 'Nemáte oprávnenie na aktualizáciu tejto tabuľky.',
-	'Saving' => 'Ukladá sa',
-	'Unknown error.' => 'Neznáma chyba.',
-	'Database does not support password.' => 'Databáza nepodporuje heslo.',
-	'Disable %s or enable %s or %s extensions.' => 'Zakážte %s alebo povoľte rozšírenie %s alebo %s.',
-	'yes' => 'áno',
-	'no' => 'nie',
-	'Checks' => 'Kontroly',
-	'Create check' => 'Vytvoriť kontrolu',
-	'Alter check' => 'Zmeniť kontrolu',
-	'Check has been created.' => 'Kontrola bola vytvorená.',
-	'Check has been altered.' => 'Kontrola bola zmenená.',
-	'Check has been dropped.' => 'Kontrola bola odstránená.',
 );

adminer/lang/sl.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -74,6 +72,7 @@ $translations = array(
 	'Data' => 'Podatki',
 	
 	'Database' => 'Baza',
+	'database' => 'baza',
 	'Use' => 'Uporabi',
 	'Select database' => 'Izberi bazo',
 	'Invalid database.' => 'Neveljavna baza.',
@@ -179,7 +178,7 @@ $translations = array(
 	'Alter indexes' => 'Spremeni indekse',
 	'Add next' => 'Dodaj naslednjega',
 	'Index Type' => 'Tip indeksa',
-	'length' => 'dolžina',
+	'Column (length)' => 'Stolpec (dolžina)',
 	
 	'Foreign keys' => 'Tuji ključi',
 	'Foreign key' => 'Tuj ključ',

adminer/lang/sr.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Систем',
@@ -16,7 +14,7 @@ $translations = array(
 	'Language' => 'Језик',
 	'Invalid CSRF token. Send the form again.' => 'Неважећи CSRF код. Проследите поново форму.',
 	'No extension' => 'Без додатака',
-	'None of the supported PHP extensions (%s) are available.' => 'Ниједан од подржаних PHP додатака (%s) није доступан.',
+	'None of the supported PHP extensions (%s) are available.' => 'Ниједан од подржаних PHP додатака није доступан.',
 	'Session support must be enabled.' => 'Морате омогућити подршку за сесије.',
 	'Session expired, please login again.' => 'Ваша сесија је истекла, пријавите се поново.',
 	'%s version: %s through PHP extension %s' => '%s верзија: %s помоћу PHP додатка је %s',
@@ -75,6 +73,7 @@ $translations = array(
 	'Data' => 'Податци',
 
 	'Database' => 'База података',
+	'database' => 'база података',
 	'Use' => 'Користи',
 	'Select database' => 'Изаберите базу',
 	'Invalid database.' => 'Неисправна база података.',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Уреди индексе',
 	'Add next' => 'Додај следећи',
 	'Index Type' => 'Тип индекса',
-	'length' => 'дужина',
+	'Column (length)' => 'Колона (дужина)',
 
 	'Foreign keys' => 'Страни кључеви',
 	'Foreign key' => 'Страни кључ',

adminer/lang/sv.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'System',
@@ -16,7 +14,7 @@ $translations = array(
 	'Invalid credentials.' => 'Ogiltiga inloggningsuppgifter.',
 	'There is a space in the input password which might be the cause.' => 'Det finns ett mellanslag i lösenordet, vilket kan vara anledningen.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer tillåter inte att ansluta till en databas utan lösenord. <a href="https://www.adminer.org/en/password/"%s>Mer information</a>.',
-	'Database does not support password.' => 'Databasen stödjer inte lösenord.',
+	'Database does not support password.' => 'Databasen stöder inte lösenord.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('För många misslyckade inloggningar, försök igen om %d minut.', 'För många misslyckade inloggningar, försök igen om %d minuter.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Huvudlösenordet har löpt ut. <a href="https://www.adminer.org/en/extension/"%s>Implementera</a> %s en metod för att göra det permanent.',
 	'Language' => 'Språk',
@@ -27,7 +25,7 @@ $translations = array(
 	'Connecting to privileged ports is not allowed.' => 'Anslutning till privilegierade portar är inte tillåtet.',
 	'Disable %s or enable %s or %s extensions.' => 'Stäng av %s eller sätt på %s eller %s tilläggen.',
 	'Session support must be enabled.' => 'Support för sessioner måste vara på.',
-	'Session expired, please login again.' => 'Session har löpt ut, vänligen logga in igen.',
+	'Session expired, please login again.' => 'Session har löpt ur, vänligen logga in igen.',
 	'The action will be performed after successful login with the same credentials.' => 'Åtgärden kommer att utföras efter en lyckad inloggning med samma inloggningsuppgifter.',
 	'%s version: %s through PHP extension %s' => '%s version: %s genom PHP-tillägg %s',
 	'Refresh' => 'Ladda om',
@@ -91,6 +89,7 @@ $translations = array(
 	'Data' => 'Data',
 
 	'Database' => 'Databas',
+	'database' => 'databas',
 	'DB' => 'DB',
 	'Use' => 'Använd',
 	'Select database' => 'Välj databas',
@@ -208,7 +207,7 @@ $translations = array(
 	'Alter indexes' => 'Ändra index',
 	'Add next' => 'Lägg till nästa',
 	'Index Type' => 'Indextyp',
-	'length' => 'längd',
+	'Column (length)' => 'Kolumn (längd)',
 
 	'Foreign keys' => 'Främmande nycklar',
 	'Foreign key' => 'Främmande nyckel',

adminer/lang/ta.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'நுழை',
 	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'த‌க‌வ‌ல்த‌ள‌த்தை உருவாக்கு',
 	'SQL command' => 'SQL க‌ட்ட‌ளை',
 	'Logout' => 'வெளியேறு',
+	'database' => 'த‌க‌வ‌ல்த‌ள‌ம்',
 	'Use' => 'உப‌யோகி',
 	'No tables.' => 'அட்ட‌வ‌ணை இல்லை.',
 	'select' => 'தேர்வு செய்',
@@ -95,7 +94,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'அக‌வ‌ரிசை வ‌கை (Index Type)',
-	'length' => 'நீள‌ம்',
+	'Column (length)' => 'நெடுவ‌ரிசை (நீள‌ம்)',
 	'View has been dropped.' => 'தோற்ற‌ம் நீக்க‌ப்ப‌ட்ட‌து.',
 	'View has been altered.' => 'தோற்றம் மாற்றப்ப‌ட்ட‌து.',
 	'View has been created.' => 'தோற்ற‌ம் உருவாக்க‌ப்ப‌ட்ட‌து.',
@@ -229,7 +228,7 @@ $translations = array(
 	'Create sequence' => 'வ‌ரிசைமுறையை உருவாக்கு',
 	'User types' => 'ப‌ய‌னாள‌ர் வ‌கைக‌ள்',
 	'Create type' => 'வ‌கையை உருவாக்கு',
-	'Item%s has been inserted.' => 'உருப்ப‌டி (Item%s) சேர்க்க‌ப்ப‌ட்ட‌து.',
+	'Item%s has been inserted.' => 'உருப்ப‌டி (Item) சேர்க்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been dropped.' => 'அமைப்புமுறை நீக்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been created.' => 'அமைப்புமுறை உருவாக்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been altered.' => 'அமைப்புமுறை மாற்ற‌ப்ப‌ட்ட‌து.',

adminer/lang/th.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Login' => 'เข้าสู่ระบบ',
 	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
@@ -33,6 +31,7 @@ $translations = array(
 	'Create database' => 'สร้างฐานข้อมูล',
 	'SQL command' => 'คำสั่ง SQL',
 	'Logout' => 'ออกจากระบบ',
+	'database' => 'ฐานข้อมูล',
 	'Use' => 'ใช้งาน',
 	'No tables.' => 'ไม่พบตาราง.',
 	'select' => 'เลือก',
@@ -97,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'ชนิดของดัชนี',
-	'length' => 'ความยาว',
+	'Column (length)' => 'คอลัมน์ (ความยาว)',
 	'View has been dropped.' => 'วิวถูกลบแล้ว.',
 	'View has been altered.' => 'วิวถูกเปลี่ยนแปลงแล้ว.',
 	'View has been created.' => 'วิวถูกสร้างแล้ว.',

adminer/lang/tr.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -58,7 +56,7 @@ $translations = array(
 	'ATTACH queries are not supported.' => 'ATTACH sorguları desteklenmiyor.',
 	'Execute' => 'Çalıştır',
 	'Stop on error' => 'Hata oluşursa dur',
-	'Show only errors' => 'Sadece hataları göster',
+	'Show only errors' => 'Sadece hataları göster.',
 	// sprintf() format for time of the command
 	'%.3f s' => '%.3f s',
 	'History' => 'Geçmiş',
@@ -86,6 +84,7 @@ $translations = array(
 	'Data' => 'Veri',
 
 	'Database' => 'Veri Tabanı',
+	'database' => 'veri tabanı',
 	'DB' => 'DB',
 	'Use' => 'Kullan',
 	'Select database' => 'Veri tabanı seç',
@@ -202,7 +201,7 @@ $translations = array(
 	'Alter indexes' => 'İndeksleri değiştir',
 	'Add next' => 'Bundan sonra ekle',
 	'Index Type' => 'İndex Türü',
-	'length' => 'uzunluğu',
+	'Column (length)' => 'Kolon (uzunluğu)',
 
 	'Foreign keys' => 'Dış anahtarlar',
 	'Foreign key' => 'Dış anahtar',
@@ -225,7 +224,7 @@ $translations = array(
 	'Trigger has been dropped.' => 'Tetik silindi.',
 	'Trigger has been altered.' => 'Tetik değiştirildi.',
 	'Trigger has been created.' => 'Tetik oluşturuldu.',
-	'Alter trigger' => 'Tetiği değiştir',
+	'Alter trigger' => 'Tetiği değiştir.',
 	'Create trigger' => 'Tetik oluştur',
 	'Time' => 'Zaman',
 	'Event' => 'Olay',

adminer/lang/uk.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Система Бази Даних',
@@ -75,6 +73,7 @@ $translations = array(
 	'Data' => 'Дані',
 	
 	'Database' => 'База даних',
+	'database' => 'база даних',
 	'Use' => 'Обрати',
 	'Select database' => 'Обрати базу даних',
 	'Invalid database.' => 'Погана база даних.',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Змінити індексування',
 	'Add next' => 'Додати ще',
 	'Index Type' => 'Тип індексу',
-	'length' => 'довжина',
+	'Column (length)' => 'Стовпець (довжина)',
 	
 	'Foreign keys' => 'Зовнішні ключі',
 	'Foreign key' => 'Зовнішній ключ',
@@ -314,34 +313,4 @@ $translations = array(
 	'Type has been dropped.' => 'Тип було видалено.',
 	'Type has been created.' => 'Тип було створено.',
 	'Alter type' => 'Змінити тип',
-	'Drop %s?' => 'Вилучити %s?',
-	'Materialized view' => 'Матеріалізований вигляд',
-	'Selected' => 'Вибрані',
-	'overwrite' => 'перезаписати',
-	'DB' => 'DB',
-	'File must be in UTF-8 encoding.' => 'Файл повинен бути в кодуванні UTF-8.',
-	'Modify' => 'Змінити',
-	'Load more data' => 'Завантажити ще дані',
-	'Loading' => 'Завантаження',
-	'ATTACH queries are not supported.' => 'ATTACH-запити не підтримуються.',
-	'Warnings' => 'Попередження',
-	'Limit rows' => 'Обмеження рядків',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer не підтримує доступ до бази даних без пароля, <a href="https://www.adminer.org/en/password/"%s>більше інформації</a>.',
-	'Default value' => 'Значення за замовчуванням',
-	'Full table scan' => 'Повне сканування таблиці',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилину.', 'Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилини.', 'Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилин.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Дякуємо, що користуєтесь Adminer, подумайте про <a href="https://www.adminer.org/en/donation/">внесок</a>.',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Термін дії майстер пароля минув. <a href="https://www.adminer.org/en/extension/"%s>Реалізуйте</a> метод %s, щоб зробити його постійним.',
-	'The action will be performed after successful login with the same credentials.' => 'Дія буде виконуватися після успішного входу в систему з тими ж обліковими даними.',
-	'Connecting to privileged ports is not allowed.' => 'Підключення до привілейованих портів заборонено.',
-	'There is a space in the input password which might be the cause.' => 'У вхідному паролі є пробіл, який може бути причиною.',
-	'If you did not send this request from Adminer then close this page.' => 'Якщо ви не посилали цей запит з Adminer, закрийте цю сторінку.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Ви можете завантажити великий файл SQL через FTP та імпортувати його з сервера.',
-	'Size' => 'Розмір',
-	'Compute' => 'Обчислити',
-	'You are offline.' => 'Ви офлайн.',
-	'You have no privileges to update this table.' => 'Ви не маєте привілеїв для оновлення цієї таблиці.',
-	'Saving' => 'Збереження',
-	'Unknown error.' => 'Невідома помилка.',
-	'Database does not support password.' => 'База даних не підтримує пароль.',
 );

adminer/lang/vi.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Hệ thống',
@@ -61,7 +59,7 @@ $translations = array(
 	
 	'File upload' => 'Tải tệp lên',
 	'From server' => 'Dùng tệp trên máy chủ',
-	'Webserver file %s' => 'Tệp trên máy chủ %s',
+	'Webserver file %s' => 'Tệp trên máy chủ',
 	'Run file' => 'Chạy tệp',
 	'File does not exist.' => 'Tệp không tồn tại.',
 	'File uploads are disabled.' => 'Chức năng tải tệp lên đã bị cấm.',
@@ -78,6 +76,7 @@ $translations = array(
 	'Data' => 'Dữ liệu',
 	
 	'Database' => 'Cơ sở dữ liệu',
+	'database' => 'cơ sở dữ liệu',
 	'Use' => 'Sử dụng',
 	'Select database' => 'Chọn CSDL',
 	'Invalid database.' => 'CSDL sai.',
@@ -189,7 +188,7 @@ $translations = array(
 	'Alter indexes' => 'Sửa chỉ mục',
 	'Add next' => 'Thêm tiếp',
 	'Index Type' => 'Loại chỉ mục',
-	'length' => 'độ dài',
+	'Column (length)' => 'Cột (độ dài)',
 	
 	'Foreign keys' => 'Các khoá ngoại',
 	'Foreign key' => 'Khoá ngoại',

adminer/lang/xx.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Xx',
@@ -18,12 +16,11 @@ $translations = array(
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Xx, <a href="https://www.adminer.org/en/password/"%s>xx</a>.',
 	'Database does not support password.' => 'Xx.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx %d.', 'Xx %d.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Xx. <a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s xx.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '<a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s xx.',
 	'Language' => 'Xx',
 	'Invalid CSRF token. Send the form again.' => 'Xx.',
 	'If you did not send this request from Adminer then close this page.' => 'Xx.',
 	'No extension' => 'Xx',
-	// %s contains the list of the extensions, e.g. 'mysqli, PDO_MySQL'
 	'None of the supported PHP extensions (%s) are available.' => 'Xx (%s).',
 	'Connecting to privileged ports is not allowed.' => 'Xx.',
 	'Disable %s or enable %s or %s extensions.' => 'Xx %s xx %s xx %s xx.',
@@ -34,7 +31,7 @@ $translations = array(
 	'Refresh' => 'Xx',
 	
 	// text direction - 'ltr' or 'rtl'
-	'ltr' => 'ltr',
+	'ltr' => 'xx',
 	
 	'Privileges' => 'Xx',
 	'Create user' => 'Xx',
@@ -92,6 +89,7 @@ $translations = array(
 	'Data' => 'Xx',
 	
 	'Database' => 'Xx',
+	'database' => 'xx',
 	'DB' => 'XX',
 	'Use' => 'Xx',
 	'Select database' => 'Xx',
@@ -209,7 +207,7 @@ $translations = array(
 	'Alter indexes' => 'Xx',
 	'Add next' => 'Xx',
 	'Index Type' => 'Xx',
-	'length' => 'xx',
+	'Column (length)' => 'Xx',
 	
 	'Foreign keys' => 'Xx',
 	'Foreign key' => 'Xx',
@@ -255,7 +253,6 @@ $translations = array(
 	'Full table scan' => 'Xx',
 	'Unable to select the table' => 'Xx',
 	'No rows.' => 'Xx.',
-	// used in SQL query limit and it is followed by another number, e.g. '10 / 50 rows' meaning 10 of 50 rows
 	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d xx', '%d xx'),
 	'Page' => 'Xx',
@@ -274,7 +271,7 @@ $translations = array(
 	'Ctrl+click on a value to modify it.' => 'Xx.',
 	'Use edit link to modify this value.' => 'Xx.',
 	
-	// %s can contain auto-increment value, e.g. ' 123'
+	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
 	'Item has been updated.' => 'Xx.',
@@ -349,12 +346,4 @@ $translations = array(
 	'Type has been dropped.' => 'Xx.',
 	'Type has been created.' => 'Xx.',
 	'Alter type' => 'Xx',
-
-	// Table check constraints
-	'Checks' => 'Xx',
-	'Create check' => 'Xx',
-	'Alter check' => 'Xx',
-	'Check has been created.' => 'Xx.',
-	'Check has been altered.' => 'Xx.',
-	'Check has been dropped.' => 'Xx.',
 );

adminer/lang/zh-tw.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => '資料庫系統',
@@ -12,10 +10,10 @@ $translations = array(
 	'Logout' => '登出',
 	'Logged as: %s' => '登錄為： %s',
 	'Logout successful.' => '成功登出。',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感謝使用Adminer，請考慮為我們<a href="https://www.adminer.org/en/donation/">捐款（英文網頁）</a>。',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感謝使用Adminer，請考慮為我們<a href="https://www.adminer.org/en/donation/">捐款（英文網頁）</a>.',
 	'Invalid credentials.' => '無效的憑證。',
 	'There is a space in the input password which might be the cause.' => '您輸入的密碼中有一個空格，這可能是導致問題的原因。',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>。',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>.',
 	'Database does not support password.' => '資料庫不支援密碼。',
 	'Too many unsuccessful logins, try again in %d minute(s).' => '登錄失敗次數過多，請 %d 分鐘後重試。',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '主密碼已過期。<a href="https://www.adminer.org/en/extension/"%s>請擴展</a> %s 方法讓它永久化。',
@@ -47,7 +45,7 @@ $translations = array(
 	'Revoke' => '廢除',
 	
 	'Process list' => '處理程序列表',
-	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止。',
+	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
 	
 	'Variables' => '變數',
@@ -74,10 +72,10 @@ $translations = array(
 	'From server' => '從伺服器',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
 	'Run file' => '執行檔案',
-	'File does not exist.' => '檔案不存在。',
+	'File does not exist.' => '檔案不存在',
 	'File uploads are disabled.' => '檔案上傳已經被停用。',
 	'Unable to upload a file.' => '無法上傳檔案。',
-	'Maximum allowed file size is %sB.' => '允許的檔案上限大小為 %sB。',
+	'Maximum allowed file size is %sB.' => '允許的檔案上限大小為 %sB',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
 	'You can upload a big SQL file via FTP and import it from server.' => '您可以通過FTP上傳大型SQL檔並從伺服器導入。',
 	'You are offline.' => '您離線了。',
@@ -91,6 +89,7 @@ $translations = array(
 	'Data' => '資料',
 	
 	'Database' => '資料庫',
+	'database' => '資料庫',
 	'DB' => '資料庫',
 	'Use' => '使用',
 	'Select database' => '選擇資料庫',
@@ -128,11 +127,11 @@ $translations = array(
 	'Move' => '轉移',
 	'Tables have been moved.' => '已轉移資料表。',
 	'Copy' => '複製',
-	'Tables have been copied.' => '資料表已經複製。',
+	'Tables have been copied.' => '資料表已經複製',
 	'overwrite' => '覆蓋',
 	
 	'Routines' => '程序',
-	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響。',
+	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響',
 	'Call' => '呼叫',
 	'Parameter name' => '參數名稱',
 	'Create procedure' => '建立預存程序',
@@ -208,7 +207,7 @@ $translations = array(
 	'Alter indexes' => '修改索引',
 	'Add next' => '新增下一筆',
 	'Index Type' => '索引類型',
-	'length' => '長度',
+	'Column (length)' => '欄位（長度）',
 	
 	'Foreign keys' => '外來鍵',
 	'Foreign key' => '外來鍵',
@@ -274,7 +273,7 @@ $translations = array(
 	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '已新增項目 %s。',
-	'Item has been deleted.' => '該項目已被刪除。',
+	'Item has been deleted.' => '該項目已被刪除',
 	'Item has been updated.' => '已更新項目。',
 	'%d item(s) have been affected.' => '%d 個項目受到影響。',
 	'New item' => '新增項目',

adminer/lang/zh.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => '系统',
@@ -12,10 +10,10 @@ $translations = array(
 	'Logout' => '登出',
 	'Logged as: %s' => '登录用户：%s',
 	'Logout successful.' => '成功登出。',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感谢使用Adminer，请考虑为我们<a href="https://www.adminer.org/en/donation/">捐款（英文页面）</a>。',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感谢使用Adminer，请考虑为我们<a href="https://www.adminer.org/en/donation/">捐款（英文页面）</a>.',
 	'Invalid credentials.' => '无效凭据。',
 	'There is a space in the input password which might be the cause.' => '您输入的密码中有一个空格，这可能是导致问题的原因。',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>。',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>.',
 	'Database does not support password.' => '数据库不支持密码。',
 	'Too many unsuccessful logins, try again in %d minute(s).' => '登录失败次数过多，请 %d 分钟后重试。',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '主密码已过期。<a href="https://www.adminer.org/en/extension/"%s>请扩展</a> %s 方法让它永久化。',
@@ -47,7 +45,7 @@ $translations = array(
 	'Revoke' => '废除',
 
 	'Process list' => '进程列表',
-	'%d process(es) have been killed.' => '%d 个进程被终止。',
+	'%d process(es) have been killed.' => '%d 个进程被终止',
 	'Kill' => '终止',
 
 	'Variables' => '变量',
@@ -91,6 +89,7 @@ $translations = array(
 	'Data' => '数据',
 
 	'Database' => '数据库',
+	'database' => '数据库',
 	'DB' => '数据库',
 	'Use' => '使用',
 	'Select database' => '选择数据库',
@@ -208,7 +207,7 @@ $translations = array(
 	'Alter indexes' => '修改索引',
 	'Add next' => '下一行插入',
 	'Index Type' => '索引类型',
-	// 'Column (length)' => '列（长度）',
+	'Column (length)' => '列（长度）',
 
 	'Foreign keys' => '外键',
 	'Foreign key' => '外键',

adminer/plugin.php

@@ -8,9 +8,6 @@ function adminer_object() {
 		include_once $filename;
 	}
 	
-	// enable extra drivers just by including them
-	//~ include "../plugins/drivers/simpledb.php";
-
 	$plugins = array(
 		// specify enabled plugins here
 		new AdminerDatabaseHide(array('information_schema')),
@@ -20,7 +17,9 @@ function adminer_object() {
 		new AdminerDumpXml,
 		new AdminerDumpAlter,
 		//~ new AdminerSqlLog("past-" . rtrim(`git describe --tags --abbrev=0`) . ".sql"),
+		//~ new AdminerEditCalendar(script_src("../externals/jquery-ui/jquery-1.4.4.js") . script_src("../externals/jquery-ui/ui/jquery.ui.core.js") . script_src("../externals/jquery-ui/ui/jquery.ui.widget.js") . script_src("../externals/jquery-ui/ui/jquery.ui.datepicker.js") . script_src("../externals/jquery-ui/ui/jquery.ui.mouse.js") . script_src("../externals/jquery-ui/ui/jquery.ui.slider.js") . script_src("../externals/jquery-timepicker/jquery-ui-timepicker-addon.js") . "<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
 		//~ new AdminerTinymce("../externals/tinymce/jscripts/tiny_mce/tiny_mce_dev.js"),
+		//~ new AdminerWymeditor(array("../externals/wymeditor/src/jquery/jquery.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.explorer.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.mozilla.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.opera.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.safari.js")),
 		new AdminerFileUpload(""),
 		new AdminerJsonColumn,
 		new AdminerSlugify,

adminer/privileges.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 page_header(lang('Privileges'));
 
 echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";
@@ -16,15 +14,15 @@ echo "<form action=''><p>\n";
 hidden_fields_get();
 echo "<input type='hidden' name='db' value='" . h(DB) . "'>\n";
 echo ($grant ? "" : "<input type='hidden' name='grant' value=''>\n");
-echo "<table class='odds'>\n";
+echo "<table cellspacing='0'>\n";
 echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th></thead>\n";
 
 while ($row = $result->fetch_assoc()) {
-	echo '<tr><td>' . h($row["User"]) . "<td>" . h($row["Host"]) . '<td><a href="' . h(ME . 'user=' . urlencode($row["User"]) . '&host=' . urlencode($row["Host"])) . '">' . lang('Edit') . "</a>\n";
+	echo '<tr' . odd() . '><td>' . h($row["User"]) . "<td>" . h($row["Host"]) . '<td><a href="' . h(ME . 'user=' . urlencode($row["User"]) . '&host=' . urlencode($row["Host"])) . '">' . lang('Edit') . "</a>\n";
 }
 
 if (!$grant || DB != "") {
-	echo "<tr><td><input name='user' autocapitalize='off'><td><input name='host' value='localhost' autocapitalize='off'><td><input type='submit' value='" . lang('Edit') . "'>\n";
+	echo "<tr" . odd() . "><td><input name='user' autocapitalize='off'><td><input name='host' value='localhost' autocapitalize='off'><td><input type='submit' value='" . lang('Edit') . "'>\n";
 }
 
 echo "</table>\n";

adminer/procedure.inc.php

@@ -1,7 +1,5 @@
 <?php
-namespace Adminer;
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["procedure"]);
-
-$PROCEDURE = ($_GET["name"] ?: $_GET["procedure"]);
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 $row = $_POST;
 $row["fields"] = (array) $row["fields"];
@@ -34,7 +32,6 @@ if (!$_POST && $PROCEDURE != "") {
 $collations = get_vals("SHOW CHARACTER SET");
 sort($collations);
 $routine_languages = routine_languages();
-echo ($collations ? "<datalist id='collations'>" . optionlist($collations) . "</datalist>" : "");
 ?>
 
 <form action="" method="post" id="form">
@@ -42,12 +39,12 @@ echo ($collations ? "<datalist id='collations'>" . optionlist($collations) . "</
 <?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "\n" : ""); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <div class="scrollable">
-<table class="nowrap">
+<table cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);
 if (isset($_GET["function"])) {
 	echo "<tr><td>" . lang('Return type');
-	edit_type("returns", $row["returns"], $collations, array(), (JUSH == "pgsql" ? array("void", "trigger") : array()));
+	edit_type("returns", $row["returns"], $collations, array(), ($jush == "pgsql" ? array("void", "trigger") : array()));
 }
 ?>
 </table>
@@ -56,8 +53,6 @@ if (isset($_GET["function"])) {
 <p><?php textarea("definition", $row["definition"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($PROCEDURE != "") { ?>
+<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?><?php } ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?>
-<?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/processlist.inc.php

@@ -1,8 +1,5 @@
 <?php
-namespace Adminer;
+if (support("kill") && $_POST && !$error) {
-
-if (support("kill")) {
-	if ($_POST && !$error) {
 	$killed = 0;
 	foreach ((array) $_POST["kill"] as $val) {
 		if (kill_process($val)) {
@@ -10,7 +7,6 @@ if (support("kill")) {
 		}
 	}
 	queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
-	}
 }
 
 page_header(lang('Process list'), $error);
@@ -18,12 +14,13 @@ page_header(lang('Process list'), $error);
 
 <form action="" method="post">
 <div class="scrollable">
-<table class="nowrap checkable odds">
+<table cellspacing="0" class="nowrap checkable">
 <?php
 echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 // HTML valid because there is always at least one process
 $i = -1;
 foreach (process_list() as $i => $row) {
+
 	if (!$i) {
 		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>" : "");
 		foreach ($row as $key => $val) {
@@ -35,13 +32,13 @@ foreach (process_list() as $i => $row) {
 		}
 		echo "</thead>\n";
 	}
-	echo "<tr>" . (support("kill") ? "<td>" . checkbox("kill[]", $row[JUSH == "sql" ? "Id" : "pid"], 0) : "");
+	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
 	foreach ($row as $key => $val) {
 		echo "<td>" . (
-			(JUSH == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
+			($jush == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
-			(JUSH == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
+			($jush == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
-			(JUSH == "oracle" && $key == "sql_text" && $val != "")
+			($jush == "oracle" && $key == "sql_text" && $val != "")
-			? "<code class='jush-" . JUSH . "'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
+			? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
 			: h($val)
 		);
 	}

adminer/schema.inc.php

@@ -1,11 +1,9 @@
 <?php
-namespace Adminer;
-
 page_header(lang('Database schema'), "", array(), h(DB . ($_GET["ns"] ? ".$_GET[ns]" : "")));
 
 $table_pos = array();
 $table_pos_js = array();
-$SCHEMA = ($_GET["schema"] ?: $_COOKIE["adminer_schema-" . str_replace(".", "_", DB)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
+$SCHEMA = ($_GET["schema"] ? $_GET["schema"] : $_COOKIE["adminer_schema-" . str_replace(".", "_", DB)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
 preg_match_all('~([^:]+):([-0-9.]+)x([-0-9.]+)(_|$)~', $SCHEMA, $matches, PREG_SET_ORDER);
 foreach ($matches as $i => $match) {
 	$table_pos[$match[1]] = array($match[2], $match[3]);
@@ -28,7 +26,7 @@ foreach (table_status('', true) as $table => $table_status) {
 		$field["pos"] = $pos;
 		$schema[$table]["fields"][$name] = $field;
 	}
-	$schema[$table]["pos"] = ($table_pos[$table] ?: array($top, 0));
+	$schema[$table]["pos"] = ($table_pos[$table] ? $table_pos[$table] : array($top, 0));
 	foreach ($adminer->foreignKeys($table) as $val) {
 		if (!$val["db"]) {
 			$left = $base_left;
@@ -84,10 +82,7 @@ foreach ($schema as $name => $table) {
 			$left1 = $left - $table_pos[$name][1];
 			$i = 0;
 			foreach ($columns as $target) {
-				echo "\n<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'>"
+				echo "\n<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'><div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>";
-					. "<div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div>"
-					. "</div>"
-				;
 			}
 		}
 	}

adminer/scheme.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $row = $_POST;
 
 if ($_POST && !$error) {
@@ -28,7 +26,8 @@ if (!$row) {
 ?>
 
 <form action="" method="post">
-<p><input name="name" autofocus value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php echo script("focus(qs('#name'));"); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {

adminer/script.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 header("Content-Type: text/javascript; charset=utf-8");
 
 if ($_GET["script"] == "db") {
@@ -14,12 +12,10 @@ if ($_GET["script"] == "db") {
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
 					$val = format_number($table_status[$key]);
-					if ($val >= 0) {
+					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
-						json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == (JUSH == "pgsql" ? "table" : "InnoDB")
 						? "~ $val"
 						: $val
 					));
-					}
 					if (isset($sums[$key])) {
 						// ignore innodb_file_per_table because it is not active for tables created before it was enabled
 						$sums[$key] += ($table_status["Engine"] != "InnoDB" || $key != "Data_free" ? $table_status[$key] : 0);