Release 5.0.1

This reverts b848764.

.editorconfig

@@ -5,8 +5,9 @@ root = true
 charset = utf-8
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.{php,css,js}]
+[*.{php,css,js,xml}]
 indent_style = tab
 
 [*.json]

.github/FUNDING.yml

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

.github/workflows/codeql-analysis.yml

@@ -1,67 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '20 16 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

adminer/call.inc.php

@@ -1,5 +1,7 @@
 <?php
-$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["call"]);
+namespace Adminer;
+
+$PROCEDURE = ($_GET["name"] ?: $_GET["call"]);
 page_header(lang('Call') . ": " . h($PROCEDURE), $error);
 
 $routine = routine($_GET["call"], (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
@@ -28,21 +30,21 @@ if (!$error && $_POST) {
 		}
 		$call[] = (isset($out[$key]) ? "@" . idf_escape($field["field"]) : $val);
 	}
-	
+
 	$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
 	echo $adminer->selectQuery($query, $start, !$result);
-	
+
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
-		$connection2 = connect();
+		$connection2 = connect($adminer->credentials());
 		if (is_object($connection2)) {
 			$connection2->select_db(DB);
 		}
-		
+
 		do {
 			$result = $connection->store_result();
 			if (is_object($result)) {
@@ -53,7 +55,7 @@ if (!$error && $_POST) {
 				;
 			}
 		} while ($connection->next_result());
-		
+
 		if ($out) {
 			select($connection->query("SELECT " . implode(", ", $out)));
 		}
@@ -64,7 +66,7 @@ if (!$error && $_POST) {
 <form action="" method="post">
 <?php
 if ($in) {
-	echo "<table cellspacing='0' class='layout'>\n";
+	echo "<table class='layout'>\n";
 	foreach ($in as $key) {
 		$field = $routine["fields"][$key];
 		$name = $field["field"];
@@ -88,3 +90,25 @@ 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

@@ -0,0 +1,51 @@
+<?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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["create"];
 $partition_by = array();
 foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
@@ -46,7 +48,7 @@ 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["has_default"]) {
+				if (!$field["generated"]) {
 					$field["default"] = null;
 				}
 				$process_field = process_field($field, $type_field);
@@ -58,7 +60,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 					}
 				}
 				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"]),
@@ -124,7 +126,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"] : ""),
@@ -138,6 +140,7 @@ 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" => "")),
@@ -152,7 +155,7 @@ if (!$_POST) {
 			$row["Auto_increment"] = "";
 		}
 		foreach ($orig_fields as $field) {
-			$field["has_default"] = isset($field["default"]);
+			$field["generated"] = $field["generated"] ?: (isset($field["default"]) ? "DEFAULT" : "");
 			$row["fields"][] = $field;
 		}
 
@@ -180,38 +183,40 @@ foreach ($engines as $engine) {
 <?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 ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
- <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
+ <?php echo ($collations && !preg_match("~sqlite|mssql~", JUSH) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
 <?php if (support("columns")) { ?>
 <div class="scrollable">
-<table cellspacing="0" id="edit-fields" class="nowrap">
+<table 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" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
+<?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" class="size" 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
-$comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
-echo (support("comment")
-	? 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'") . '>'
-		)
-	: '')
-;
-?>
+	$comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
+	echo (support("comment")
+		? 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 != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?><?php } ?>
+<?php if ($TABLE != "") { ?>
+<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"]);
@@ -221,16 +226,16 @@ if (support("partitioning")) {
 <?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 cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
+<table 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) {
-	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]) . '">';
-}
-?>
+	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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $row = $_POST;
 
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
@@ -44,7 +46,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]) {
@@ -64,7 +66,7 @@ echo ($_POST["add_x"] || strpos($name, "\n")
 ) . "\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' => "ms187963.aspx",
+	'mssql' => "relational-databases/system-functions/sys-fn-helpcollations-transact-sql",
 )) : "");
 ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">

adminer/db.inc.php

@@ -1,10 +1,12 @@
 <?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
 	}
 
@@ -27,15 +29,21 @@ if ($tables_views && !$error && !$_POST["search"]) {
 			$result = drop_tables($_POST["tables"]);
 		}
 		$message = lang('Tables have been dropped.');
-	} elseif ($jush != "sql") {
-		$result = ($jush == "sqlite"
+	} elseif (JUSH == "sqlite" && $_POST["check"]) {
+		foreach ((array) $_POST["tables"] as $table) {
+			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('idf_escape', $_POST["tables"])))) {
+	} elseif ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('Adminer\idf_escape', $_POST["tables"])))) {
 		while ($row = $result->fetch_assoc()) {
 			$message .= "<b>" . h($row["Table"]) . "</b>: " . h($row["Msg_text"]) . "<br>";
 		}
@@ -66,7 +74,7 @@ if ($adminer->homepage()) {
 				}
 			}
 			echo "<div class='scrollable'>\n";
-			echo "<table cellspacing='0' class='nowrap checkable'>\n";
+			echo "<table class='nowrap checkable odds'>\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)\[/);", "");
@@ -85,21 +93,23 @@ if ($adminer->homepage()) {
 			foreach ($tables_list as $name => $type) {
 				$view = ($type !== null && !preg_match('~table|sequence~i', $type));
 				$id = h("Table-" . $name);
-				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "", "", $id);
+				echo '<tr><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 (array(
-						"Engine" => array(),
-						"Collation" => array(),
-						"Data_length" => array("create", lang('Alter table')),
-						"Index_length" => array("indexes", lang('Alter indexes')),
-						"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) {
+					foreach (
+						array(
+							"Engine" => array(),
+							"Collation" => array(),
+							"Data_length" => array("create", lang('Alter table')),
+							"Index_length" => array("indexes", lang('Alter indexes')),
+							"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
+					) {
 						$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>"
@@ -109,32 +119,35 @@ 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" ? $connection->result("SELECT @@default_storage_engine") : "");
+			echo "<td>" . h(JUSH == "sql" ? $connection->result("SELECT @@default_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
-				: ($jush == "pgsql" ? $vacuum . $optimize
-				: ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'") . $optimize
+				. (JUSH == "sqlite" ? $vacuum . "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'PRAGMA integrity_check'")
+				: (JUSH == "pgsql" ? $vacuum . $optimize
+				: (JUSH == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'")
+					. $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">');
@@ -159,12 +172,11 @@ if ($adminer->homepage()) {
 			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
 			$routines = routines();
 			if ($routines) {
-				echo "<table cellspacing='0'>\n";
+				echo "<table class='odds'>\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' . odd() . '>';
+					echo '<tr>';
 					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"]);
@@ -182,11 +194,10 @@ 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 cellspacing='0'>\n";
+				echo "<table class='odds'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
-				odd('');
 				foreach ($sequences as $val) {
-					echo "<tr" . odd() . "><th><a href='" . h(ME) . "sequence=" . urlencode($val) . "'>" . h($val) . "</a>\n";
+					echo "<tr><th><a href='" . h(ME) . "sequence=" . urlencode($val) . "'>" . h($val) . "</a>\n";
 				}
 				echo "</table>\n";
 			}
@@ -197,11 +208,10 @@ if ($adminer->homepage()) {
 			echo "<h3 id='user-types'>" . lang('User types') . "</h3>\n";
 			$user_types = types();
 			if ($user_types) {
-				echo "<table cellspacing='0'>\n";
+				echo "<table class='odds'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
-				odd('');
 				foreach ($user_types as $val) {
-					echo "<tr" . odd() . "><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
+					echo "<tr><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
 				}
 				echo "</table>\n";
 			}
@@ -212,7 +222,7 @@ if ($adminer->homepage()) {
 			echo "<h3 id='events'>" . lang('Events') . "</h3>\n";
 			$rows = get_rows("SHOW EVENTS");
 			if ($rows) {
-				echo "<table cellspacing='0'>\n";
+				echo "<table>\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>";

adminer/download.inc.php

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

adminer/drivers/mongo.inc.php

@@ -1,235 +1,32 @@
 <?php
+namespace Adminer;
+
 $drivers["mongo"] = "MongoDB (alpha)";
 
 if (isset($_GET["mongo"])) {
-	define("DRIVER", "mongo");
+	define('Adminer\DRIVER', "mongo");
 
-	if (class_exists('MongoDB')) {
-		class Min_DB {
-			var $extension = "Mongo", $server_info = MongoClient::VERSION, $error, $last_id, $_link, $_db;
-
-			function connect($uri, $options) {
-				try {
-					$this->_link = new MongoClient($uri, $options);
-					if ($options["password"] != "") {
-						$options["password"] = "";
-						try {
-							new MongoClient($uri, $options);
-							$this->error = lang('Database does not support password.');
-						} catch (Exception $e) {
-							// this is what we want
-						}
-					}
-				} catch (Exception $e) {
-					$this->error = $e->getMessage();
-				}
-			}
-			
-			function query($query) {
-				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(\"$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') ? "$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 {
+	if (class_exists('MongoDB\Driver\Manager')) {
+		class Db {
 			var $extension = "MongoDB", $server_info = MONGODB_VERSION, $affected_rows, $error, $last_id;
 			/** @var MongoDB\Driver\Manager */
 			var $_link;
 			var $_db, $_db_name;
 
 			function connect($uri, $options) {
-				$class = 'MongoDB\Driver\Manager';
-				$this->_link = new $class($uri, $options);
+				$this->_link = new \MongoDB\Driver\Manager($uri, $options);
 				$this->executeCommand($options["db"], array('ping' => 1));
 			}
-			
+
 			function executeCommand($db, $command) {
-				$class = 'MongoDB\Driver\Command';
 				try {
-					return $this->_link->executeCommand($db, new $class($command));
+					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);
@@ -255,7 +52,7 @@ if (isset($_GET["mongo"])) {
 			}
 		}
 
-		class Min_Result {
+		class Result {
 			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
 
 			function __construct($result) {
@@ -313,88 +110,9 @@ if (isset($_GET["mongo"])) {
 					'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';
-				try {
-					return new Min_Result($connection->_link->executeQuery("$connection->_db_name.$table", new $class($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort))));
-				} catch (Exception $e) {
-					$connection->error = $e->getMessage();
-					return false;
-				}
-			}
-
-			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));
-				return $connection->executeBulkWrite("$db.$table", $bulk, 'getModifiedCount');
-			}
-
-			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));
-				return $connection->executeBulkWrite("$db.$table", $bulk, 'getDeletedCount');
-			}
-
-			function insert($table, $set) {
-				global $connection;
-				$db = $connection->_db_name;
-				$class = 'MongoDB\Driver\BulkWrite';
-				$bulk = new $class(array());
-				if ($set['_id'] == '') {
-					unset($set['_id']);
-				}
-				$bulk->insert($set);
-				return $connection->executeBulkWrite("$db.$table", $bulk, 'getInsertedCount');
-			}
-		}
 
 		function get_databases($flush) {
 			global $connection;
@@ -517,9 +235,8 @@ if (isset($_GET["mongo"])) {
 							$val = (float) $val;
 							$op = $match[1];
 						} elseif (preg_match('~^\(date\)(.+)~', $op, $match)) {
-							$dateTime = new DateTime($val);
-							$class = 'MongoDB\BSON\UTCDatetime';
-							$val = new $class($dateTime->getTimestamp() * 1000);
+							$dateTime = new \DateTime($val);
+							$val = new \MongoDB\BSON\UTCDatetime($dateTime->getTimestamp() * 1000);
 							$op = $match[1];
 						}
 						switch ($op) {
@@ -557,8 +274,17 @@ if (isset($_GET["mongo"])) {
 			}
 			return $data;
 		}
+	}
 
-		$operators = array(
+
+
+	class Driver extends SqlDriver {
+		static $possibleDrivers = array("mongodb");
+		static $jush = "mongo";
+
+		var $editFunctions = array(array("json"));
+
+		var $operators = array(
 			"=",
 			"!=",
 			">",
@@ -579,9 +305,79 @@ 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("$connection->_db_name.$table", new \MongoDB\Driver\Query($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort))));
+			} catch (Exception $e) {
+				$connection->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;
 	}
@@ -625,10 +421,10 @@ if (isset($_GET["mongo"])) {
 		return $credentials[1];
 	}
 
-	function connect() {
+	function connect($credentials) {
 		global $adminer;
-		$connection = new Min_DB;
-		list($server, $username, $password) = $adminer->credentials();
+		$connection = new Db;
+		list($server, $username, $password) = $credentials;
 
 		if ($server == "") {
 			$server = "localhost:27017";
@@ -739,16 +535,4 @@ if (isset($_GET["mongo"])) {
 		}
 		return true;
 	}
-
-	function driver_config() {
-		global $operators;
-		return array(
-			'possible_drivers' => array("mongo", "mongodb"),
-			'jush' => "mongo",
-			'operators' => $operators,
-			'functions' => array(),
-			'grouping' => array(),
-			'edit_functions' => array(array("json")),
-		);
-	}
 }

adminer/drivers/mssql.inc.php

@@ -5,12 +5,14 @@
 * @author Jakub Vrana
 */
 
-$drivers["mssql"] = "MS SQL (beta)";
+namespace Adminer;
+
+$drivers["mssql"] = "MS SQL";
 
 if (isset($_GET["mssql"])) {
-	define("DRIVER", "mssql");
+	define('Adminer\DRIVER', "mssql");
 	if (extension_loaded("sqlsrv")) {
-		class Min_DB {
+		class Db {
 			var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $errno, $error;
 
 			function _get_error() {
@@ -52,7 +54,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function select_db($database) {
-				return $this->query("USE " . idf_escape($database));
+				return $this->query(use_sql($database));
 			}
 
 			function query($query, $unbuffered = false) {
@@ -83,7 +85,7 @@ if (isset($_GET["mssql"])) {
 					return false;
 				}
 				if (sqlsrv_field_metadata($result)) {
-					return new Min_Result($result);
+					return new Result($result);
 				}
 				$this->affected_rows = sqlsrv_rows_affected($result);
 				return true;
@@ -103,7 +105,7 @@ if (isset($_GET["mssql"])) {
 			}
 		}
 
-		class Min_Result {
+		class Result {
 			var $_result, $_offset = 0, $_fields, $num_rows;
 
 			function __construct($result) {
@@ -134,7 +136,7 @@ if (isset($_GET["mssql"])) {
 					$this->_fields = sqlsrv_field_metadata($this->_result);
 				}
 				$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);
@@ -152,106 +154,23 @@ if (isset($_GET["mssql"])) {
 			}
 		}
 
-	} elseif (extension_loaded("mssql")) {
-		class Min_DB {
-			var $extension = "MSSQL", $_link, $_result, $server_info, $affected_rows, $error;
+	} elseif (extension_loaded("pdo_sqlsrv")) {
+		class Db extends PdoDb {
+			var $extension = "PDO_SQLSRV";
 
 			function connect($server, $username, $password) {
-				$this->_link = @mssql_connect($server, $username, $password);
-				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) {
-				$unicode = strlen($string) != strlen(utf8_decode($string));
-				return ($unicode ? "N" : "") . "'" . str_replace("'", "''", $string) . "'";
+				$this->dsn("sqlsrv:Server=" . str_replace(":", ",", $server), $username, $password);
+				return true;
 			}
 
 			function select_db($database) {
-				return mssql_select_db($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);
+				// database selection is separated from the connection so dbname in DSN can't be used
+				return $this->query(use_sql($database));
 			}
 		}
 
 	} elseif (extension_loaded("pdo_dblib")) {
-		class Min_DB extends Min_PDO {
+		class Db extends PdoDb {
 			var $extension = "PDO_DBLIB";
 
 			function connect($server, $username, $password) {
@@ -260,40 +179,95 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function select_db($database) {
-				// database selection is separated from the connection so dbname in DSN can't be used
-				return $this->query("USE " . idf_escape($database));
+				return $this->query(use_sql($database));
 			}
 		}
 	}
 
 
-	class Min_Driver extends Min_SQL {
+	class Driver extends SqlDriver {
+		static $possibleDrivers = array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB");
+		static $jush = "mssql";
+
+		var $editFunctions = array(
+			array(
+				"date|time" => "getdate",
+			), array(
+				"int|decimal|real|float|money|datetime" => "+/-",
+				"char|text" => "+",
+			)
+		);
+
+		var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
+		var $functions = array("len", "lower", "round", "upper");
+		var $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+		var $onActions = "NO ACTION|CASCADE|SET NULL|SET DEFAULT";
+		var $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) {
-			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";
-					}
+			$fields = fields($table);
+			$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++;
+				$name = idf_unescape($key);
+				if (!$fields[$name]["auto_increment"]) {
+					$insert[$key] = "c$c";
 				}
-				//! can use only one query for all rows
-				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
-					. " WHEN MATCHED THEN UPDATE SET " . implode(", ", $update)
-					. " WHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ");" // ; is mandatory
-				)) {
-					return false;
+				if (isset($primary[$name])) {
+					$where[] = "$key = c$c";
+				} else {
+					$update[] = "$key = c$c";
 				}
 			}
-			return true;
+			$values = array();
+			foreach ($rows as $set) {
+				$values[] = "(" . implode(", ", $set) . ")";
+			}
+			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 = 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";
+			}
+		}
 	}
 
 
@@ -306,15 +280,11 @@ if (isset($_GET["mssql"])) {
 		return ($_GET["ns"] != "" ? idf_escape($_GET["ns"]) . "." : "") . idf_escape($idf);
 	}
 
-	function connect() {
-		global $adminer;
-		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
-
+	function connect($credentials) {
+		$connection = new Db;
 		if ($credentials[0] == "") {
 			$credentials[0] = "localhost:1433";
 		}
-
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -363,7 +333,11 @@ if (isset($_GET["mssql"])) {
 
 	function table_status($name = "") {
 		$return = array();
-		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) {
+		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
+		) {
 			if ($name != "") {
 				return $row;
 			}
@@ -381,43 +355,56 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function fields($table) {
+		global $connection;
 		$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)");
 		$return = array();
-		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]
+		$table_id = $connection->result("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], 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.parent_column_id
-WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . q($table)
-		) as $row) {
+LEFT JOIN sys.default_constraints d ON c.default_object_id = d.object_id
+LEFT JOIN sys.index_columns ic ON c.object_id = ic.object_id AND c.column_id = ic.column_id
+LEFT JOIN sys.indexes i ON ic.object_id = i.object_id AND ic.index_id = i.index_id
+WHERE c.object_id = " . q($table_id)) as $row
+		) {
 			$type = $row["type"];
-			$length = (preg_match("~char|binary~", $type) ? $row["max_length"] : ($type == "decimal" ? "$row[precision],$row[scale]" : ""));
+			$length = (preg_match("~char|binary~", $type)
+				? $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" => $row["default"],
+				"default" => (preg_match("~^\('(.*)'\)$~", $row["default"], $match) ? str_replace("''", "'", $match[1]) : $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),
-				"primary" => $row["is_identity"], //! or indexes.is_primary_key
+				"primary" => $row["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 (get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name, is_descending_key
+		foreach (
+			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();
@@ -441,7 +428,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 
 	function information_schema($db) {
-		return false;
+		return get_schema() == "INFORMATION_SCHEMA";
 	}
 
 	function error() {
@@ -454,7 +441,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 
 	function drop_databases($databases) {
-		return queries("DROP DATABASE " . implode(", ", array_map('idf_escape', $databases)));
+		return queries("DROP DATABASE " . implode(", ", array_map('Adminer\idf_escape', $databases)));
 	}
 
 	function rename_database($name, $collation) {
@@ -472,6 +459,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	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];
@@ -481,14 +469,28 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 				$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 +504,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 			$alter[""] = $foreign;
 		}
 		foreach ($alter as $key => $val) {
-			if (!queries("ALTER TABLE " . idf_escape($name) . " $key" . implode(",", $val))) {
+			if (!queries("ALTER TABLE " . table($name) . " $key" . implode(",", $val))) {
 				return false;
 			}
 		}
@@ -524,10 +526,12 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 				} else {
 					$index[] = idf_escape($val[1]) . " ON " . table($table);
 				}
-			} elseif (!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]) . ")")) {
+			} elseif (
+				!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]) . ")")
+			) {
 				return false;
 			}
 		}
@@ -553,10 +557,14 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	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) . ", @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"];
 		}
@@ -568,11 +576,11 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 
 	function drop_views($views) {
-		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
+		return queries("DROP VIEW " . implode(", ", array_map('Adminer\table', $views)));
 	}
 
 	function drop_tables($tables) {
-		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
+		return queries("DROP TABLE " . implode(", ", array_map('Adminer\table', $tables)));
 	}
 
 	function move_tables($tables, $views, $target) {
@@ -583,7 +591,8 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		if ($name == "") {
 			return array();
 		}
-		$rows = get_rows("SELECT s.name [Trigger],
+		$rows = get_rows(
+			"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
@@ -600,13 +609,14 @@ WHERE s.xtype = 'TR' AND s.name = " . q($name)
 
 	function triggers($table) {
 		$return = array();
-		foreach (get_rows("SELECT sys1.name,
+		foreach (
+			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) { // triggers are not schema-scoped
+WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
+		) { // triggers are not schema-scoped
 			$return[$row["name"]] = array($row["Timing"], $row["Event"]);
 		}
 		return $return;
@@ -633,23 +643,63 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 	}
 
 	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 show_variables() {
-		return array();
-	}
-
-	function is_c_style_escapes() {
-		return true;
-	}
-
-	function show_status() {
-		return array();
+	function trigger_sql($table) {
+		$return = "";
+		foreach (triggers($table) as $name => $trigger) {
+			$return .= create_trigger(" ON " . table($table), trigger($name)) . ";";
+		}
+		return $return;
 	}
 
 	function convert_field($field) {
@@ -660,38 +710,6 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 	}
 
 	function support($feature) {
-		return preg_match('~^(comment|columns|database|drop_col|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
-	}
-
-	function driver_config() {
-		$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);
-		}
-		return array(
-			'possible_drivers' => array("SQLSRV", "MSSQL", "PDO_DBLIB"),
-			'jush' => "mssql",
-			'types' => $types,
-			'structured_types' => $structured_types,
-			'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" => "+",
-				)
-			),
-		);
+		return preg_match('~^(check|comment|columns|database|drop_col|dump|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
 	}
 }

adminer/drivers/mysql.inc.php

@@ -1,11 +1,13 @@
 <?php
+namespace Adminer;
+
 $drivers = array("server" => "MySQL") + $drivers;
 
-if (!defined("DRIVER")) {
-	define("DRIVER", "server"); // server - backwards compatibility
+if (!defined('Adminer\DRIVER')) {
+	define('Adminer\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 Min_DB extends MySQLi {
+		class Db extends \MySQLi {
 			var $extension = "MySQLi";
 
 			function __construct() {
@@ -27,7 +29,7 @@ if (!defined("DRIVER")) {
 					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
 					(!is_numeric($port) ? $port : $socket),
-					($ssl ? (empty($ssl['cert']) ? 2048 : 64) : 0) // 2048 - MYSQLI_CLIENT_SSL, 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
+					($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)
 				);
 				$this->options(MYSQLI_OPT_LOCAL_INFILE, false);
 				return $return;
@@ -57,7 +59,7 @@ if (!defined("DRIVER")) {
 		}
 
 	} elseif (extension_loaded("mysql") && !((ini_bool("sql.safe_mode") || ini_bool("mysql.allow_local_infile")) && extension_loaded("pdo_mysql"))) {
-		class Min_DB {
+		class Db {
 			var
 				$extension = "MySQL", ///< @var string extension name
 				$server_info, ///< @var string server version
@@ -127,7 +129,7 @@ if (!defined("DRIVER")) {
 			/** Send query
 			* @param string
 			* @param bool
-			* @return mixed bool or Min_Result
+			* @return mixed bool or Result
 			*/
 			function query($query, $unbuffered = false) {
 				$result = @($unbuffered ? mysql_unbuffered_query($query, $this->_link) : mysql_query($query, $this->_link)); // @ - mute mysql.trace_mode
@@ -142,7 +144,7 @@ if (!defined("DRIVER")) {
 					$this->info = mysql_info($this->_link);
 					return true;
 				}
-				return new Min_Result($result);
+				return new Result($result);
 			}
 
 			/** Send query with more resultsets
@@ -154,7 +156,7 @@ if (!defined("DRIVER")) {
 			}
 
 			/** Get current resultset
-			* @return Min_Result
+			* @return Result
 			*/
 			function store_result() {
 				return $this->_result;
@@ -182,7 +184,7 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-		class Min_Result {
+		class Result {
 			var
 				$num_rows, ///< @var int number of rows in the result
 				$_result, $_offset = 0 ///< @access private
@@ -229,25 +231,25 @@ if (!defined("DRIVER")) {
 		}
 
 	} elseif (extension_loaded("pdo_mysql")) {
-		class Min_DB extends Min_PDO {
+		class Db extends PdoDb {
 			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 (!empty($ssl['key'])) {
-						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
+					if ($ssl['key']) {
+						$options[\PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
 					}
-					if (!empty($ssl['cert'])) {
-						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
+					if ($ssl['cert']) {
+						$options[\PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
 					}
-					if (!empty($ssl['ca'])) {
-						$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
+					if ($ssl['ca']) {
+						$options[\PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
 					}
-					if (!empty($ssl['verify'])) {
-						$options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $ssl['verify'];
+					if (isset($ssl['verify'])) {
+						$options[\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $ssl['verify'];
 					}
 				}
 				$this->dsn(
@@ -269,7 +271,7 @@ if (!defined("DRIVER")) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$this->pdo->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
+				$this->pdo->setAttribute(\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
 				return parent::query($query, $unbuffered);
 			}
 		}
@@ -278,7 +280,52 @@ if (!defined("DRIVER")) {
 
 
 
-	class Min_Driver extends Min_SQL {
+	class Driver extends SqlDriver {
+		static $possibleDrivers = array("MySQLi", "MySQL", "PDO_MySQL");
+		static $jush = "sql"; ///< @var string JUSH identifier
+
+		var $unsigned = array("unsigned", "zerofill", "unsigned zerofill");
+		var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
+		var $functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper");
+		var $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
+
+		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 ()"));
@@ -335,16 +382,24 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-		function tableHelp($name) {
+		function tableHelp($name, $is_view = false) {
 			$maria = preg_match('~MariaDB~', $this->_conn->server_info);
 			if (information_schema(DB)) {
-				return strtolower(($maria ? "information-schema-$name-table/" : str_replace("_", "-", $name) . "-table.html"));
+				return strtolower("information-schema-" . ($maria ? "$name-table/" : str_replace("_", "-", $name) . "-table.html"));
 			}
 			if (DB == "mysql") {
-				return ($maria ? "mysql$name-table/" : "system-database.html"); //! more precise link
+				return ($maria ? "mysql$name-table/" : "system-schema.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;
+		}
 	}
 
 
@@ -366,24 +421,14 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Connect to the database
-	* @return mixed Min_DB or string for error
+	* @param array [$server, $username, $password]
+	* @return mixed Db or string for error
 	*/
-	function connect() {
-		global $adminer, $types, $structured_types, $edit_functions;
-		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
+	function connect($credentials) {
+		$connection = new Db;
 		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;
-			}
-			if (min_version('', 10.7, $connection)) {
-				$structured_types[lang('Strings')][] = "uuid";
-				$types["uuid"] = 128;
-				$edit_functions[0]['uuid'] = 'uuid';
-			}
 			return $connection;
 		}
 		$return = $connection->error;
@@ -401,10 +446,7 @@ if (!defined("DRIVER")) {
 		// SHOW DATABASES can take a very long time so it is cached
 		$return = get_session("dbs");
 		if ($return === null) {
-			$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
+			$query = "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME"; // SHOW DATABASES can be disabled by skip_show_database
 			$return = ($flush ? slow_query($query) : get_vals($query));
 			restart_session();
 			set_session("dbs", $return);
@@ -476,18 +518,15 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Get tables list
-	* @return array array($name => $type)
+	* @return array [$name => $type]
 	*/
 	function tables_list() {
-		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"
-		);
+		return get_key_vals("SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME");
 	}
 
 	/** Count tables in all databases
 	* @param array
-	* @return array array($db => $tables)
+	* @return array [$db => $tables]
 	*/
 	function count_tables($databases) {
 		$return = array();
@@ -500,14 +539,17 @@ if (!defined("DRIVER")) {
 	/** Get table status
 	* @param string
 	* @param bool return only "Name", "Engine" and "Comment" fields
-	* @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
+	* @return array [$name => ["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 (get_rows($fast && min_version(5)
-			? "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) {
+		foreach (
+			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
+		) {
 			if ($row["Engine"] == "InnoDB") {
 				// ignore internal comment, unnecessary since MySQL 5.1.21
 				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\1', $row["Comment"]);
@@ -544,28 +586,39 @@ if (!defined("DRIVER")) {
 
 	/** Get information about fields
 	* @param string
-	* @return array array($name => array("field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => ))
+	* @return array [$name => ["field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => , "generated" => ]]
 	*/
 	function fields($table) {
 		$return = array();
-		foreach (get_rows("SHOW FULL COLUMNS FROM " . table($table)) as $row) {
-			preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
-			$return[$row["Field"]] = array(
-				"field" => $row["Field"],
-				"full_type" => $row["Type"],
+		foreach (get_rows("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION") as $row) {
+			$field = $row["COLUMN_NAME"];
+			$default = $row["COLUMN_DEFAULT"];
+			$type = $row["COLUMN_TYPE"];
+			$extra = $row["EXTRA"];
+			// 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);
+			$return[$field] = array(
+				"field" => $field,
+				"full_type" => $type,
 				"type" => $match[1],
 				"length" => $match[2],
 				"unsigned" => ltrim($match[3] . $match[4]),
-				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? (preg_match('~text~', $match[1]) ? stripslashes(preg_replace("~^'(.*)'\$~", '\1', $row["Default"])) : $row["Default"]) : null),
-				"null" => ($row["Null"] == "YES"),
-				"auto_increment" => ($row["Extra"] == "auto_increment"),
-				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
-				"collation" => $row["Collation"],
-				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
-				"comment" => $row["Comment"],
-				"primary" => ($row["Key"] == "PRI"),
-				// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
-				"generated" => preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $row["Extra"]),
+				"default" => ($generated
+					? $row["GENERATION_EXPRESSION"]
+					: ($default != "" || preg_match("~char|set~", $match[1])
+						? (preg_match('~text~', $match[1]) ? stripslashes(preg_replace("~^'(.*)'\$~", '\1', $default)) : $default)
+						: null
+					)
+				),
+				"null" => ($row["IS_NULLABLE"] == "YES"),
+				"auto_increment" => ($extra == "auto_increment"),
+				"on_update" => (preg_match('~\bon update (\w+)~i', $extra, $match) ? $match[1] : ""), //! available since MySQL 5.1.23
+				"collation" => $row["COLLATION_NAME"],
+				"privileges" => array_flip(explode(",", $row["PRIVILEGES"])),
+				"comment" => $row["COLUMN_COMMENT"],
+				"primary" => ($row["COLUMN_KEY"] == "PRI"),
+				"generated" => ($generated[1] == "PERSISTENT" ? "STORED" : $generated[1]),
 			);
 		}
 		return $return;
@@ -573,8 +626,8 @@ if (!defined("DRIVER")) {
 
 	/** Get table indexes
 	* @param string
-	* @param string Min_DB to use
-	* @return array array($key_name => array("type" => , "columns" => array(), "lengths" => array(), "descs" => array()))
+	* @param string Db to use
+	* @return array [$key_name => ["type" => , "columns" => [], "lengths" => [], "descs" => []]]
 	*/
 	function indexes($table, $connection2 = null) {
 		$return = array();
@@ -590,25 +643,25 @@ if (!defined("DRIVER")) {
 
 	/** Get foreign keys in table
 	* @param string
-	* @return array array($name => array("db" => , "ns" => , "table" => , "source" => array(), "target" => array(), "on_delete" => , "on_update" => ))
+	* @return array [$name => ["db" => , "ns" => , "table" => , "source" => [], "target" => [], "on_delete" => , "on_update" => ]]
 	*/
 	function foreign_keys($table) {
-		global $connection, $on_actions;
+		global $connection, $driver;
 		static $pattern = '(?:`(?:[^`]|``)+`|"(?:[^"]|"")+")';
 		$return = array();
 		$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 ($on_actions))?(?: ON UPDATE ($on_actions))?~", $create_table, $matches, PREG_SET_ORDER);
+			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);
 			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('idf_unescape', $source[0]),
-					"target" => array_map('idf_unescape', $target[0]),
-					"on_delete" => ($match[6] ? $match[6] : "RESTRICT"),
-					"on_update" => ($match[7] ? $match[7] : "RESTRICT"),
+					"source" => array_map('Adminer\idf_unescape', $source[0]),
+					"target" => array_map('Adminer\idf_unescape', $target[0]),
+					"on_delete" => ($match[6] ?: "RESTRICT"),
+					"on_update" => ($match[7] ?: "RESTRICT"),
 				);
 			}
 		}
@@ -617,7 +670,7 @@ if (!defined("DRIVER")) {
 
 	/** Get view SELECT
 	* @param string
-	* @return array array("select" => )
+	* @return array ["select" => ]
 	*/
 	function view($name) {
 		global $connection;
@@ -648,7 +701,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function information_schema($db) {
-		return (min_version(5) && $db == "information_schema")
+		return ($db == "information_schema")
 			|| (min_version(5.5) && $db == "performance_schema");
 	}
 
@@ -674,7 +727,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function drop_databases($databases) {
-		$return = apply_queries("DROP DATABASE", $databases, 'idf_escape');
+		$return = apply_queries("DROP DATABASE", $databases, 'Adminer\idf_escape');
 		restart_session();
 		set_session("dbs", null);
 		return $return;
@@ -726,7 +779,7 @@ if (!defined("DRIVER")) {
 	/** Run commands to create or alter table
 	* @param string "" to create
 	* @param string new name
-	* @param array of array($orig, $process_field, $after)
+	* @param array of [$orig, $process_field, $after]
 	* @param array of strings
 	* @param string
 	* @param string
@@ -738,10 +791,16 @@ if (!defined("DRIVER")) {
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
 		foreach ($fields as $field) {
-			$alter[] = ($field[1]
-				? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? $field[2] : "")
-				: "DROP " . idf_escape($field[0])
-			);
+			if ($field[1]) {
+				$default = $field[1][3];
+				if (preg_match('~ GENERATED~', $default)) {
+					$field[1][3] = $field[1][2];
+					$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) : "")
@@ -763,7 +822,7 @@ if (!defined("DRIVER")) {
 
 	/** Run commands to alter indexes
 	* @param string escaped table name
-	* @param array of array("index type", "name", array("column definition", ...)) or array("index type", "name", "DROP")
+	* @param array of ["index type", "name", ["column definition", ...]] or ["index type", "name", "DROP"]
 	* @return bool
 	*/
 	function alter_indexes($table, $alter) {
@@ -789,7 +848,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function drop_views($views) {
-		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
+		return queries("DROP VIEW " . implode(", ", array_map('Adminer\table', $views)));
 	}
 
 	/** Drop tables
@@ -797,7 +856,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function drop_tables($tables) {
-		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
+		return queries("DROP TABLE " . implode(", ", array_map('Adminer\table', $tables)));
 	}
 
 	/** Move tables to other schema
@@ -840,7 +899,8 @@ if (!defined("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 (($_POST["overwrite"] && !queries("\nDROP TABLE IF EXISTS $name"))
+			if (
+				($_POST["overwrite"] && !queries("\nDROP TABLE IF EXISTS $name"))
 				|| !queries("CREATE TABLE $name LIKE " . table($table))
 				|| !queries("INSERT INTO $name SELECT * FROM " . table($table))
 			) {
@@ -856,8 +916,10 @@ if (!defined("DRIVER")) {
 		foreach ($views as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
 			$view = view($table);
-			if (($_POST["overwrite"] && !queries("DROP VIEW IF EXISTS $name"))
-				|| !queries("CREATE VIEW $name AS $view[select]")) { //! USE to avoid db.table
+			if (
+				($_POST["overwrite"] && !queries("DROP VIEW IF EXISTS $name"))
+				|| !queries("CREATE VIEW $name AS $view[select]") //! USE to avoid db.table
+			) {
 				return false;
 			}
 		}
@@ -866,7 +928,7 @@ if (!defined("DRIVER")) {
 
 	/** Get information about trigger
 	* @param string trigger name
-	* @return array array("Trigger" => , "Timing" => , "Event" => , "Of" => , "Type" => , "Statement" => )
+	* @return array ["Trigger" => , "Timing" => , "Event" => , "Of" => , "Type" => , "Statement" => ]
 	*/
 	function trigger($name) {
 		if ($name == "") {
@@ -878,7 +940,7 @@ if (!defined("DRIVER")) {
 
 	/** Get defined triggers
 	* @param string
-	* @return array array($name => array($timing, $event))
+	* @return array [$name => [$timing, $event]]
 	*/
 	function triggers($table) {
 		$return = array();
@@ -889,7 +951,7 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Get trigger options
-	* @return array ("Timing" => array(), "Event" => array(), "Type" => array())
+	* @return array ["Timing" => [], "Event" => [], "Type" => []]
 	*/
 	function trigger_options() {
 		return array(
@@ -902,14 +964,14 @@ if (!defined("DRIVER")) {
 	/** Get information about stored routine
 	* @param string
 	* @param string "FUNCTION" or "PROCEDURE"
-	* @return array ("fields" => array("field" => , "type" => , "length" => , "unsigned" => , "inout" => , "collation" => ), "returns" => , "definition" => , "language" => )
+	* @return array ["fields" => ["field" => , "type" => , "length" => , "unsigned" => , "inout" => , "collation" => ], "returns" => , "definition" => , "language" => ]
 	*/
 	function routine($name, $type) {
-		global $connection, $enum_length, $inout, $types;
+		global $connection, $driver;
 		$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($types), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]|$enum_length)++)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?";
-		$pattern = "$space*(" . ($type == "FUNCTION" ? "" : $inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
+		$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,]+)['\"]?)?";
+		$pattern = "$space*(" . ($type == "FUNCTION" ? "" : $driver->inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
 		$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();
@@ -918,7 +980,7 @@ if (!defined("DRIVER")) {
 			$fields[] = array(
 				"field" => str_replace("``", "`", $param[2]) . $param[3],
 				"type" => strtolower($param[5]),
-				"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
+				"length" => preg_replace_callback("~$driver->enumLength~s", 'Adminer\normalize_enum', $param[6]),
 				"unsigned" => strtolower(preg_replace('~\s+~', ' ', trim("$param[8] $param[7]"))),
 				"null" => 1,
 				"full_type" => $param[4],
@@ -926,22 +988,21 @@ if (!defined("DRIVER")) {
 				"collation" => strtolower($param[9]),
 			);
 		}
-		if ($type != "FUNCTION") {
-			return array("fields" => $fields, "definition" => $match[11]);
-		}
 		return array(
 			"fields" => $fields,
+			"comment" => $connection->result("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.PARAMETER_STYLE
-		);
+			"language" => "SQL", // available in information_schema.ROUTINES.BODY_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 = " . q(DB));
+		return get_rows("SELECT ROUTINE_NAME AS SPECIFIC_NAME, ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = DATABASE()");
 	}
 
 	/** Get list of available routine languages
@@ -969,9 +1030,9 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Explain select
-	* @param Min_DB
+	* @param Db
 	* @param string
-	* @return Min_Result
+	* @return Result
 	*/
 	function explain($connection, $query) {
 		return $connection->query("EXPLAIN " . (min_version(5.1) && !min_version(5.7) ? "PARTITIONS " : "") . $query);
@@ -986,35 +1047,40 @@ if (!defined("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
-	*/
+	* @return array [$id => $name]
 	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 Min_DB
+	* @param Db
 	* @return bool
-	*/
 	function set_schema($schema, $connection2 = null) {
 		return true;
 	}
+	*/
 
 	/** Get SQL command to create table
 	* @param string
@@ -1060,33 +1126,21 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Get server variables
-	* @return array ($name => $value)
+	* @return array [$name => $value]
 	*/
 	function show_variables() {
 		return get_key_vals("SHOW VARIABLES");
 	}
 
-	/** Checks if C-style escapes are supported
-	* @return bool
-	*/
-	function is_c_style_escapes() {
-		static $c_style = null;
-		if ($c_style === null) {
-			$variables = get_key_vals("SHOW VARIABLES LIKE 'sql_mode'");
-			$c_style = strpos($variables["sql_mode"], 'NO_BACKSLASH_ESCAPES') === false;
-		}
-		return $c_style;
-	}
-
 	/** 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");
@@ -1128,11 +1182,11 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Check whether a feature is supported
-	* @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"
+	* @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"
 	* @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(5) ? "" : "|routine|trigger|view"))) . "~", $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);
 	}
 
 	/** Kill a process
@@ -1146,7 +1200,7 @@ if (!defined("DRIVER")) {
 	/** Return query to get connection ID
 	* @return string
 	*/
-	function connection_id(){
+	function connection_id() {
 		return "SELECT CONNECTION_ID()";
 	}
 
@@ -1157,45 +1211,4 @@ if (!defined("DRIVER")) {
 		global $connection;
 		return $connection->result("SELECT @@max_connections");
 	}
-
-	/** Get driver config
-	* @return array array('possible_drivers' => , 'jush' => , 'types' => , 'structured_types' => , 'unsigned' => , 'operators' => , 'functions' => , 'grouping' => , 'edit_functions' => )
-	*/
-	function driver_config() {
-		$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);
-		}
-		return array(
-			'possible_drivers' => array("MySQLi", "MySQL", "PDO_MySQL"),
-			'jush' => "sql", ///< @var string JUSH identifier
-			'types' => $types,
-			'structured_types' => $structured_types,
-			'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,10 +1,12 @@
 <?php
+namespace Adminer;
+
 $drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
-	define("DRIVER", "oracle");
+	define('Adminer\DRIVER', "oracle");
 	if (extension_loaded("oci8")) {
-		class Min_DB {
+		class Db {
 			var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $errno, $error;
 			var $_current_db;
 
@@ -50,7 +52,7 @@ if (isset($_GET["oracle"])) {
 				restore_error_handler();
 				if ($return) {
 					if (oci_num_fields($result)) {
-						return new Min_Result($result);
+						return new Result($result);
 					}
 					$this->affected_rows = oci_num_rows($result);
 					oci_free_statement($result);
@@ -79,7 +81,7 @@ if (isset($_GET["oracle"])) {
 			}
 		}
 
-		class Min_Result {
+		class Result {
 			var $_result, $_offset = 1, $num_rows;
 
 			function __construct($result) {
@@ -105,7 +107,7 @@ if (isset($_GET["oracle"])) {
 
 			function fetch_field() {
 				$column = $this->_offset++;
-				$return = new stdClass;
+				$return = new \stdClass;
 				$return->name = oci_field_name($this->_result, $column);
 				$return->orgname = $return->name;
 				$return->type = oci_field_type($this->_result, $column);
@@ -119,7 +121,7 @@ if (isset($_GET["oracle"])) {
 		}
 
 	} elseif (extension_loaded("pdo_oci")) {
-		class Min_DB extends Min_PDO {
+		class Db extends PdoDb {
 			var $extension = "PDO_OCI";
 			var $_current_db;
 
@@ -138,7 +140,34 @@ if (isset($_GET["oracle"])) {
 
 
 
-	class Min_Driver extends Min_SQL {
+	class Driver extends SqlDriver {
+		static $possibleDrivers = array("OCI8", "PDO_OCI");
+		static $jush = "oracle";
+
+		var $editFunctions = array(
+			array( //! no parentheses
+				"date" => "current_date",
+				"timestamp" => "current_timestamp",
+			), array(
+				"number|float|double" => "+/-",
+				"date|timestamp" => "+ interval/- interval",
+				"char|clob" => "||",
+			)
+		);
+
+		var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
+		var $functions = array("length", "lower", "round", "upper");
+		var $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()
 
@@ -157,14 +186,19 @@ if (isset($_GET["oracle"])) {
 						$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) . ")")
-				)) {
+				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;
+		}
 	}
 
 
@@ -177,10 +211,8 @@ if (isset($_GET["oracle"])) {
 		return idf_escape($idf);
 	}
 
-	function connect() {
-		global $adminer;
-		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
+	function connect($credentials) {
+		$connection = new Db;
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -188,7 +220,8 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT DISTINCT tablespace_name FROM (
+		return get_vals(
+			"SELECT DISTINCT tablespace_name FROM (
 SELECT tablespace_name FROM user_tablespaces
 UNION SELECT tablespace_name FROM all_tables WHERE tablespace_name IS NOT NULL
 )
@@ -223,7 +256,7 @@ ORDER BY 1"
 
 	function get_current_db() {
 		global $connection;
-		$db = $connection->_current_db ? $connection->_current_db : DB;
+		$db = $connection->_current_db ?: DB;
 		unset($connection->_current_db);
 		return $db;
 	}
@@ -237,13 +270,14 @@ ORDER BY 1"
 
 	function views_table($columns) {
 		$owner = where_owner('');
-		return "(SELECT $columns FROM all_views WHERE " . ($owner ? $owner : "rownum < 0") . ")";
+		return "(SELECT $columns FROM all_views WHERE " . ($owner ?: "rownum < 0") . ")";
 	}
 
 	function tables_list() {
 		$view = views_table("view_name");
 		$owner = where_owner(" AND ");
-		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "$owner
+		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
@@ -264,10 +298,11 @@ ORDER BY 1"
 		$db = get_current_db();
 		$view = views_table("view_name");
 		$owner = where_owner(" AND ");
-		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) . $owner . ($name != "" ? " AND table_name = $search" : "") . "
+		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) . $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) {
+ORDER BY 1") as $row
+		) {
 			if ($name != "") {
 				return $row;
 			}
@@ -313,12 +348,14 @@ ORDER BY 1"
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		$owner = where_owner(" AND ", "aic.table_owner");
-		foreach (get_rows("SELECT aic.*, ac.constraint_type, atc.data_default
+		foreach (
+			get_rows("SELECT aic.*, ac.constraint_type, atc.data_default
 FROM all_ind_columns aic
 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
 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) {
+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
@@ -341,7 +378,7 @@ ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row) {
 	}
 
 	function information_schema($db) {
-		return false;
+		return get_schema() == "INFORMATION_SCHEMA";
 	}
 
 	function error() {
@@ -464,7 +501,7 @@ 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 ($return ? $return : get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
+		return ($return ?: get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
 	}
 
 	function get_schema() {
@@ -484,10 +521,6 @@ AND c_src.TABLE_NAME = " . q($table);
 		return get_key_vals('SELECT name, display_value FROM v$parameter');
 	}
 
-	function is_c_style_escapes() {
-		return true;
-	}
-
 	function process_list() {
 		return get_rows('SELECT sess.process AS "process", sess.username AS "user", sess.schemaname AS "schema", sess.status AS "status", sess.wait_class AS "wait_class", sess.seconds_in_wait AS "seconds_in_wait", sql.sql_text AS "sql_text", sess.machine AS "machine", sess.port AS "port"
 FROM v$session sess LEFT OUTER JOIN v$sql sql
@@ -512,38 +545,4 @@ ORDER BY PROCESS
 	function support($feature) {
 		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view)$~', $feature); //!
 	}
-
-	function driver_config() {
-		$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);
-		}
-		return array(
-			'possible_drivers' => array("OCI8", "PDO_OCI"),
-			'jush' => "oracle",
-			'types' => $types,
-			'structured_types' => $structured_types,
-			'unsigned' => array(),
-			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "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,10 +1,12 @@
 <?php
+namespace Adminer;
+
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
-	define("DRIVER", "pgsql");
+	define('Adminer\DRIVER', "pgsql");
 	if (extension_loaded("pgsql")) {
-		class Min_DB {
+		class Db {
 			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error, $timeout;
 
 			function _error($errno, $error) {
@@ -77,7 +79,7 @@ if (isset($_GET["pgsql"])) {
 					$this->affected_rows = pg_affected_rows($result);
 					$return = true;
 				} else {
-					$return = new Min_Result($result);
+					$return = new Result($result);
 				}
 				if ($this->timeout) {
 					$this->timeout = 0;
@@ -112,7 +114,7 @@ if (isset($_GET["pgsql"])) {
 			}
 		}
 
-		class Min_Result {
+		class Result {
 			var $_result, $_offset = 0, $num_rows;
 
 			function __construct($result) {
@@ -130,7 +132,7 @@ if (isset($_GET["pgsql"])) {
 
 			function fetch_field() {
 				$column = $this->_offset++;
-				$return = new stdClass;
+				$return = new \stdClass;
 				if (function_exists('pg_field_table')) {
 					$return->orgtable = pg_field_table($this->_result, $column);
 				}
@@ -147,7 +149,7 @@ if (isset($_GET["pgsql"])) {
 		}
 
 	} elseif (extension_loaded("pdo_pgsql")) {
-		class Min_DB extends Min_PDO {
+		class Db extends PdoDb {
 			var $extension = "PDO_PgSQL", $timeout;
 
 			function connect($server, $username, $password) {
@@ -193,7 +195,48 @@ if (isset($_GET["pgsql"])) {
 
 
 
-	class Min_Driver extends Min_SQL {
+	class Driver extends SqlDriver {
+		static $possibleDrivers = array("PgSQL", "PDO_PgSQL");
+		static $jush = "pgsql";
+
+		var $operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid CSRF
+		var $functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
+		var $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 setUserTypes($types) {
+			$this->types[lang('User types')] = array_flip($types);
+		}
 
 		function insertUpdate($table, $rows, $primary) {
 			global $connection;
@@ -206,9 +249,10 @@ if (isset($_GET["pgsql"])) {
 						$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) . ")")
-				)) {
+				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;
 				}
 			}
@@ -238,10 +282,10 @@ if (isset($_GET["pgsql"])) {
 			return $this->_conn->warnings();
 		}
 
-		function tableHelp($name) {
+		function tableHelp($name, $is_view = false) {
 			$links = array(
 				"information_schema" => "infoschema",
-				"pg_catalog" => "catalog",
+				"pg_catalog" => ($is_view ? "view" : "catalog"),
 			);
 			$link = $links[$_GET["ns"]];
 			if ($link) {
@@ -249,6 +293,17 @@ if (isset($_GET["pgsql"])) {
 			}
 		}
 
+		function supportsIndex($table_status) {
+			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;
+		}
 	}
 
 
@@ -261,21 +316,11 @@ if (isset($_GET["pgsql"])) {
 		return idf_escape($idf);
 	}
 
-	function connect() {
-		global $adminer, $types, $structured_types;
-		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
+	function connect($credentials) {
+		$connection = new Db;
 		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;
 		}
@@ -283,9 +328,9 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT d.datname FROM pg_database d JOIN pg_roles r ON d.datdba = r.oid
-WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE')
-ORDER BY d.datname");
+		return get_vals("SELECT datname FROM pg_database
+WHERE datallowconn = TRUE AND has_database_privilege(datname, 'CONNECT')
+ORDER BY datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -315,7 +360,7 @@ ORDER BY d.datname");
 
 	function tables_list() {
 		$query = "SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema()";
-		if (support('materializedview')) { // ' - support("materializedview") could be removed by compile.php
+		if (support("materializedview")) {
 			$query .= "
 UNION ALL
 SELECT matviewname, 'MATERIALIZED VIEW'
@@ -328,17 +373,33 @@ ORDER BY 1";
 	}
 
 	function count_tables($databases) {
-		return array(); // would require reconnect
+		global $connection;
+		$return = array();
+		foreach ($databases as $db) {
+			if ($connection->select_db($db)) {
+				$return[$db] = count(tables_list());
+			}
+		}
+		return $return;
 	}
 
 	function table_status($name = "") {
 		$return = array();
-		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_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
+		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_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')
-" . ($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);
@@ -358,7 +419,8 @@ 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" : "") . "
+		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" : "") : "") . "
 FROM pg_class c
 JOIN pg_namespace n ON c.relnamespace = n.oid
 JOIN pg_attribute a ON c.oid = a.attrelid
@@ -367,8 +429,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;
@@ -384,6 +446,7 @@ ORDER BY a.attnum"
 			if (in_array($row['attidentity'], array('a', 'd'))) {
 				$row['default'] = 'GENERATED ' . ($row['attidentity'] == 'd' ? 'BY DEFAULT' : 'ALWAYS') . ' AS IDENTITY';
 			}
+			$row["generated"] = ($row["attgenerated"] == "s" ? "STORED" : "");
 			$row["null"] = !$row["attnotnull"];
 			$row["auto_increment"] = $row['attidentity'] || preg_match('~^nextval\(~i', $row["default"]);
 			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
@@ -403,16 +466,18 @@ ORDER BY a.attnum"
 		$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", $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 ORDER BY indisprimary DESC, indisunique DESC", $connection2) as $row) {
 			$relname = $row["relname"];
 			$return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
 			$return[$relname]["columns"] = array();
-			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
+			if ($row["indkey"]) {
+				foreach (explode(" ", $row["indkey"]) as $indkey) {
+					$return[$relname]["columns"][] = $columns[$indkey];
+				}
+				foreach (explode(" ", $row["indoption"]) as $indoption) {
+					$return[$relname]["descs"][] = ($indoption & 1 ? '1' : null); // 1 - INDOPTION_DESC
+				}
 			}
 			$return[$relname]["lengths"] = array();
 		}
@@ -420,45 +485,30 @@ ORDER BY a.attnum"
 	}
 
 	function foreign_keys($table) {
-		global $on_actions;
+		global $driver;
 		$return = array();
-		foreach (get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
+		foreach (
+			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('idf_unescape', array_map('trim', explode(',', $match[1])));
+				$row['source'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[1])));
 				if (preg_match('~^(("([^"]|"")+"|[^"]+)\.)?"?("([^"]|"")+"|[^"]+)$~', $match[2], $match2)) {
 					$row['ns'] = idf_unescape($match2[2]);
 					$row['table'] = idf_unescape($match2[4]);
 				}
-				$row['target'] = array_map('idf_unescape', array_map('trim', explode(',', $match[3])));
-				$row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
-				$row['on_update'] = (preg_match("~ON UPDATE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['target'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[3])));
+				$row['on_delete'] = (preg_match("~ON DELETE ($driver->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['on_update'] = (preg_match("~ON UPDATE ($driver->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
 				$return[$row['conname']] = $row;
 			}
 		}
 		return $return;
 	}
 
-	function constraints($table) {
-		global $on_actions;
-		$return = array();
-		foreach (get_rows("SELECT conname, consrc
-FROM pg_catalog.pg_constraint
-INNER JOIN pg_catalog.pg_namespace ON pg_constraint.connamespace = pg_namespace.oid
-INNER JOIN pg_catalog.pg_class ON pg_constraint.conrelid = pg_class.oid AND pg_constraint.connamespace = pg_class.relnamespace
-WHERE pg_constraint.contype = 'c'
-AND conrelid != 0 -- handle only CONSTRAINTs here, not TYPES
-AND nspname = current_schema()
-AND relname = " . q($table) . "
-ORDER BY connamespace, conname") as $row) {
-			$return[$row['conname']] = $row['consrc'];
-		}
-		return $return;
-	}
-
 	function view($name) {
 		global $connection;
 		return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . $connection->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($name)) . ")")));
@@ -470,7 +520,7 @@ ORDER BY connamespace, conname") as $row) {
 	}
 
 	function information_schema($db) {
-		return ($db == "information_schema");
+		return get_schema() == "information_schema";
 	}
 
 	function error() {
@@ -489,7 +539,7 @@ ORDER BY connamespace, conname") as $row) {
 	function drop_databases($databases) {
 		global $connection;
 		$connection->close();
-		return apply_queries("DROP DATABASE", $databases, 'idf_escape');
+		return apply_queries("DROP DATABASE", $databases, 'Adminer\idf_escape');
 	}
 
 	function rename_database($name, $collation) {
@@ -531,9 +581,9 @@ ORDER BY connamespace, conname") as $row) {
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
 					$sequence_name = $table . "_" . idf_unescape($val[0]) . "_seq";
-					$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]"
+					$alter[] = "ALTER $column " . ($val[3] ? "SET" . preg_replace('~GENERATED ALWAYS(.*) STORED~', 'EXPRESSION\1', $val[3])
 						: (isset($val[6]) ? "SET DEFAULT nextval(" . q($sequence_name) . ")"
-						: "DROP DEFAULT"
+						: "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]";
@@ -557,9 +607,9 @@ ORDER BY connamespace, conname") as $row) {
 		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;
@@ -600,7 +650,7 @@ ORDER BY connamespace, conname") as $row) {
 	}
 
 	function truncate_tables($tables) {
-		return queries("TRUNCATE " . implode(", ", array_map('table', $tables)));
+		return queries("TRUNCATE " . implode(", ", array_map('Adminer\table', $tables)));
 		return true;
 	}
 
@@ -610,10 +660,10 @@ ORDER BY connamespace, conname") as $row) {
 
 	function drop_tables($tables) {
 		foreach ($tables as $table) {
-				$status = table_status($table);
-				if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
-					return false;
-				}
+			$status = table_status($table);
+			if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -710,18 +760,15 @@ ORDER BY SPECIFIC_NAME');
 
 	function found_rows($table_status, $where) {
 		global $connection;
-		if (preg_match(
-			"~ rows=([0-9]+)~",
-			$connection->result("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")),
-			$regs
-		)) {
+		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_vals("SELECT typname
+		return get_key_vals(
+			"SELECT oid, typname
 FROM pg_type
 WHERE typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
 AND typtype IN ('b','d','e')
@@ -729,6 +776,12 @@ 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");
 	}
@@ -739,17 +792,12 @@ AND typelem = 0"
 	}
 
 	function set_schema($schema, $connection2 = null) {
-		global $connection, $types, $structured_types;
+		global $connection, $driver;
 		if (!$connection2) {
 			$connection2 = $connection;
 		}
 		$return = $connection2->query("SET search_path TO " . idf_escape($schema));
-		foreach (types() as $type) { //! get types from current_schemas('t')
-			if (!isset($types[$type])) {
-				$types[$type] = 0;
-				$structured_types[lang('User types')][] = $type;
-			}
-		}
+		$driver->setUserTypes(types()); //! get types from current_schemas('t')
 		return $return;
 	}
 
@@ -771,6 +819,7 @@ AND typelem = 0"
 	}
 
 	function create_sql($table, $auto_increment, $style) {
+		global $driver;
 		$return_parts = array();
 		$sequences = array();
 
@@ -780,9 +829,6 @@ AND typelem = 0"
 			return rtrim("CREATE VIEW " . idf_escape($table) . " AS $view[select]", ";");
 		}
 		$fields = fields($table);
-		$indexes = indexes($table);
-		ksort($indexes);
-		$constraints = constraints($table);
 
 		if (!$status || empty($fields)) {
 			return false;
@@ -800,10 +846,10 @@ 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 * 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]"
 					. ($auto_increment && $sq['last_value'] ? " START " . ($sq["last_value"] + 1) : "")
@@ -817,31 +863,20 @@ AND typelem = 0"
 			$return = implode("\n\n", $sequences) . "\n\n$return";
 		}
 
-		// primary + unique keys
-		foreach ($indexes as $index_name => $index) {
-			switch($index['type']) {
-				case 'UNIQUE': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " UNIQUE (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
-				case 'PRIMARY': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+		$primary = "";
+		foreach (indexes($table) as $index_name => $index) {
+			if ($index['type'] == 'PRIMARY') {
+				$primary = $index_name;
+				$return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('Adminer\idf_escape', $index['columns'])) . ")";
 			}
 		}
 
-		foreach ($constraints as $conname => $consrc) {
+		foreach ($driver->checkConstraints($table) as $conname => $consrc) {
 			$return_parts[] = "CONSTRAINT " . idf_escape($conname) . " CHECK $consrc";
 		}
 
 		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
 
-		// "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) . ");";
-			}
-		}
-
 		// comments for table & fields
 		if ($status['Comment']) {
 			$return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
@@ -853,6 +888,10 @@ 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, ';');
 	}
 
@@ -879,22 +918,10 @@ AND typelem = 0"
 		return get_key_vals("SHOW ALL");
 	}
 
-	function is_c_style_escapes() {
-		static $c_style = null;
-		if ($c_style === null) {
-			$vals = get_vals("SHOW standard_conforming_strings");
-			$c_style = $vals[0] == "off";
-		}
-		return $c_style;
-	}
-
 	function process_list() {
 		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
 
-	function show_status() {
-	}
-
 	function convert_field($field) {
 	}
 
@@ -903,14 +930,14 @@ AND typelem = 0"
 	}
 
 	function support($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);
+		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);
 	}
 
 	function kill_process($val) {
 		return queries("SELECT pg_terminate_backend(" . number($val) . ")");
 	}
 
-	function connection_id(){
+	function connection_id() {
 		return "SELECT pg_backend_pid()";
 	}
 
@@ -918,40 +945,4 @@ AND typelem = 0"
 		global $connection;
 		return $connection->result("SHOW max_connections");
 	}
-
-	function driver_config() {
-		$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, "macaddr8" => 23, "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);
-		}
-		return array(
-			'possible_drivers' => array("PgSQL", "PDO_PgSQL"),
-			'jush' => "pgsql",
-			'types' => $types,
-			'structured_types' => $structured_types,
-			'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/sqlite.inc.php

@@ -1,185 +1,103 @@
 <?php
-$drivers["sqlite"] = "SQLite 3";
-$drivers["sqlite2"] = "SQLite 2";
+namespace Adminer;
 
-if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
-	define("DRIVER", (isset($_GET["sqlite"]) ? "sqlite" : "sqlite2"));
-	if (class_exists(isset($_GET["sqlite"]) ? "SQLite3" : "SQLiteDatabase")) {
-		if (isset($_GET["sqlite"])) {
+$drivers["sqlite"] = "SQLite";
 
-			class Min_SQLite {
-				var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
+if (isset($_GET["sqlite"])) {
+	define('Adminer\DRIVER', "sqlite");
+	if (class_exists("SQLite3")) {
 
-				function __construct($filename) {
-					$this->_link = new SQLite3($filename);
-					$version = $this->_link->version();
-					$this->server_info = $version["versionString"];
-				}
+		class SqliteDb {
+			var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
 
-				function query($query) {
-					$result = @$this->_link->query($query);
-					$this->error = "";
-					if (!$result) {
-						$this->errno = $this->_link->lastErrorCode();
-						$this->error = $this->_link->lastErrorMsg();
-						return false;
-					} elseif ($result->numColumns()) {
-						return new Min_Result($result);
-					}
-					$this->affected_rows = $this->_link->changes();
-					return true;
-				}
-
-				function quote($string) {
-					return (is_utf8($string)
-						? "'" . $this->_link->escapeString($string) . "'"
-						: "x'" . reset(unpack('H*', $string)) . "'"
-					);
-				}
-
-				function store_result() {
-					return $this->_result;
-				}
-
-				function result($query, $field = 0) {
-					$result = $this->query($query);
-					if (!is_object($result)) {
-						return false;
-					}
-					$row = $result->_result->fetchArray();
-					return $row ? $row[$field] : false;
-				}
+			function __construct($filename) {
+				$this->_link = new \SQLite3($filename);
+				$version = $this->_link->version();
+				$this->server_info = $version["versionString"];
 			}
 
-			class Min_Result {
-				var $_result, $_offset = 0, $num_rows;
-
-				function __construct($result) {
-					$this->_result = $result;
-				}
-
-				function fetch_assoc() {
-					return $this->_result->fetchArray(SQLITE3_ASSOC);
-				}
-
-				function fetch_row() {
-					return $this->_result->fetchArray(SQLITE3_NUM);
-				}
-
-				function fetch_field() {
-					$column = $this->_offset++;
-					$type = $this->_result->columnType($column);
-					return (object) array(
-						"name" => $this->_result->columnName($column),
-						"type" => $type,
-						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
-					);
-				}
-
-				function __desctruct() {
-					return $this->_result->finalize();
+			function query($query) {
+				$result = @$this->_link->query($query);
+				$this->error = "";
+				if (!$result) {
+					$this->errno = $this->_link->lastErrorCode();
+					$this->error = $this->_link->lastErrorMsg();
+					return false;
+				} elseif ($result->numColumns()) {
+					return new Result($result);
 				}
+				$this->affected_rows = $this->_link->changes();
+				return true;
 			}
 
-		} 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];
-				}
+			function quote($string) {
+				return (is_utf8($string)
+					? "'" . $this->_link->escapeString($string) . "'"
+					: "x'" . reset(unpack('H*', $string)) . "'"
+				);
 			}
 
-			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[idf_unescape($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,
-					);
-				}
-
+			function store_result() {
+				return $this->_result;
 			}
 
+			function result($query, $field = 0) {
+				$result = $this->query($query);
+				if (!is_object($result)) {
+					return false;
+				}
+				$row = $result->_result->fetchArray();
+				return $row ? $row[$field] : false;
+			}
+		}
+
+		class Result {
+			var $_result, $_offset = 0, $num_rows;
+
+			function __construct($result) {
+				$this->_result = $result;
+			}
+
+			function fetch_assoc() {
+				return $this->_result->fetchArray(SQLITE3_ASSOC);
+			}
+
+			function fetch_row() {
+				return $this->_result->fetchArray(SQLITE3_NUM);
+			}
+
+			function fetch_field() {
+				$column = $this->_offset++;
+				$type = $this->_result->columnType($column);
+				return (object) array(
+					"name" => $this->_result->columnName($column),
+					"type" => $type,
+					"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
+				);
+			}
+
+			function __desctruct() {
+				return $this->_result->finalize();
+			}
 		}
 
 	} elseif (extension_loaded("pdo_sqlite")) {
-		class Min_SQLite extends Min_PDO {
+		class SqliteDb extends PdoDb {
 			var $extension = "PDO_SQLite";
 
 			function __construct($filename) {
 				$this->dsn(DRIVER . ":$filename", "", "");
 			}
+
+			function select_db($db) {
+				return false;
+			}
 		}
 
 	}
 
-	if (class_exists("Min_SQLite")) {
-		class Min_DB extends Min_SQLite {
+	if (class_exists('Adminer\SqliteDb')) {
+		class Db extends SqliteDb {
 
 			function __construct() {
 				parent::__construct(":memory:");
@@ -208,7 +126,36 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 
 
-	class Min_Driver extends Min_SQL {
+	class Driver extends SqlDriver {
+		static $possibleDrivers = array("SQLite3", "PDO_SQLite");
+		static $jush = "sqlite";
+
+		protected $types = array(array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0));
+
+		var $editFunctions = array(
+			array(
+				// "text" => "date('now')/time('now')/datetime('now')",
+			), array(
+				"integer|real|numeric" => "+/-",
+				// "text" => "date/time/datetime",
+				"text" => "||",
+			)
+		);
+
+		var $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
+		var $functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
+		var $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();
@@ -218,7 +165,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys(reset($rows))) . ") VALUES\n" . implode(",\n", $values));
 		}
 
-		function tableHelp($name) {
+		function tableHelp($name, $is_view = false) {
 			if ($name == "sqlite_sequence") {
 				return "fileformat2.html#seqtab";
 			}
@@ -227,6 +174,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			}
 		}
 
+		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]);
+		}
 	}
 
 
@@ -239,13 +190,12 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return idf_escape($idf);
 	}
 
-	function connect() {
-		global $adminer;
-		list(, , $password) = $adminer->credentials();
+	function connect($credentials) {
+		list(, , $password) = $credentials;
 		if ($password != "") {
 			return lang('Database does not support password.');
 		}
-		return new Min_DB;
+		return new Db;
 	}
 
 	function get_databases() {
@@ -311,7 +261,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		global $connection;
 		$return = array();
 		$primary = "";
-		foreach (get_rows("PRAGMA table_info(" . table($table) . ")") as $row) {
+		foreach (get_rows("PRAGMA table_" . (min_version(3.31) ? "x" : "") . "info(" . table($table) . ")") as $row) {
 			$name = $row["name"];
 			$type = strtolower($row["type"]);
 			$default = $row["dflt_value"];
@@ -334,13 +284,20 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			}
 		}
 		$sql = $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
-		preg_match_all('~(("[^"]*+")+|[a-z0-9_]+)\s+text\s+COLLATE\s+(\'[^\']+\'|\S+)~i', $sql, $matches, PREG_SET_ORDER);
+		$idf = '(("[^"]*+")+|[a-z0-9_]+)';
+		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;
 	}
 
@@ -395,7 +352,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		$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;
 			}
@@ -407,7 +363,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 	function view($name) {
 		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 []
+		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE type = 'view' AND name = " . q($name)))); //! identifiers may be inside []
 	}
 
 	function collations() {
@@ -444,7 +400,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			return false;
 		}
 		try {
-			$link = new Min_SQLite($db);
+			$link = new SqliteDb($db);
 		} catch (Exception $ex) {
 			$connection->error = $ex->getMessage();
 			return false;
@@ -478,7 +434,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function auto_increment() {
-		return " PRIMARY KEY" . (DRIVER == "sqlite" ? " AUTOINCREMENT" : "");
+		return " PRIMARY KEY AUTOINCREMENT";
 	}
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
@@ -523,8 +479,20 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return true;
 	}
 
-	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment = 0, $indexes = array()) {
-		global $connection;
+	/** Recreate table
+	* @param string original name
+	* @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 $connection, $driver;
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
@@ -582,16 +550,27 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			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('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
+			if ($originals && !queries("INSERT INTO " . table($temp_name) . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('Adminer\idf_escape', array_keys($originals))) . " FROM " . table($table))) {
 				return false;
 			}
 			$triggers = array();
@@ -600,7 +579,8 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
 			}
 			$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 (!queries("DROP TABLE " . table($table)) // drop before creating indexes and triggers to allow using old names
+			if (
+				!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)
 			) {
@@ -634,10 +614,11 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			}
 		}
 		foreach (array_reverse($alter) as $val) {
-			if (!queries($val[2] == "DROP"
+			if (
+				!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;
 			}
 		}
@@ -720,18 +701,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return array();
 	}
 
-	function schemas() {
-		return array();
-	}
-
-	function get_schema() {
-		return "";
-	}
-
-	function set_schema($scheme) {
-		return true;
-	}
-
 	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
@@ -739,7 +708,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			if ($name == '') {
 				continue;
 			}
-			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('idf_escape', $index['columns'])) . ")");
+			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('Adminer\idf_escape', $index['columns'])) . ")");
 		}
 		return $return;
 	}
@@ -756,18 +725,18 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function show_variables() {
-		global $connection;
 		$return = array();
-		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) {
-			$return[$key] = $connection->result("PRAGMA $key");
+		foreach (get_rows("PRAGMA pragma_list") as $row) {
+			$name = $row["name"];
+			if ($name != "pragma_list" && $name != "compile_options") {
+				foreach (get_rows("PRAGMA $name") as $row) {
+					$return[$name] .= implode(", ", $row) . "\n";
+				}
+			}
 		}
 		return $return;
 	}
 
-	function is_c_style_escapes() {
-		return true;
-	}
-
 	function show_status() {
 		$return = array();
 		foreach (get_vals("PRAGMA compile_options") as $option) {
@@ -785,29 +754,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
-	}
-
-	function driver_config() {
-		$types = array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0);
-		return array(
-			'possible_drivers' => array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite"),
-			'jush' => "sqlite",
-			'types' => $types,
-			'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" => "||",
-				)
-			),
-		);
+		return preg_match('~^(check|columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
 	}
 }

adminer/dump.inc.php

@@ -1,21 +1,24 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["dump"];
 
 if ($_POST && !$error) {
 	$cookie = "";
-	foreach (array("output", "format", "db_style", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
+	foreach (array("output", "format", "db_style", "types", "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";
-		if ($jush == "sql") {
+		if (JUSH == "sql") {
 			echo "SET NAMES utf8;
 SET time_zone = '+00:00';
 SET foreign_key_checks = 0;
@@ -52,16 +55,28 @@ SET foreign_key_checks = 0;
 				}
 				$out = "";
 
-				if ($_POST["routines"]) {
-					foreach (array("FUNCTION", "PROCEDURE") as $routine) {
-						foreach (get_rows("SHOW $routine STATUS WHERE Db = " . q($db), null, "-- ") as $row) {
-							$create = remove_definer($connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2));
-							set_utf8mb4($create);
-							$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
+				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) {
+						$name = $row["ROUTINE_NAME"];
+						$routine = $row["ROUTINE_TYPE"];
+						$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";
+					}
+				}
+
 				if ($_POST["events"]) {
 					foreach (get_rows("SHOW EVENTS", null, "-- ") as $row) {
 						$create = remove_definer($connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3));
@@ -70,9 +85,7 @@ SET foreign_key_checks = 0;
 					}
 				}
 
-				if ($out) {
-					echo "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n";
-				}
+				echo ($out && JUSH == 'sql' ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : $out);
 			}
 
 			if ($_POST["table_style"] || $_POST["data_style"]) {
@@ -107,7 +120,7 @@ SET foreign_key_checks = 0;
 				}
 
 				// add FKs after creating tables (except in MySQL which uses SET FOREIGN_KEY_CHECKS=0)
-				if (function_exists('foreign_keys_sql')) {
+				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)) {
@@ -128,7 +141,7 @@ SET foreign_key_checks = 0;
 	}
 
 	if ($is_sql) {
-		echo "-- " . $connection->result("SELECT NOW()") . "\n";
+		echo "-- " . gmdate("Y-m-d H:i:s e") . "\n";
 	}
 	exit;
 }
@@ -137,12 +150,12 @@ page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" class="layout">
+<table 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);
@@ -158,7 +171,8 @@ echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dump
 
 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')) : "")
 );
@@ -174,7 +188,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 cellspacing="0">
+<table>
 <?php
 echo script("qsl('table').onclick = dumpClick;");
 $prefixes = array();

adminer/edit.inc.php

@@ -1,4 +1,6 @@
 <?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));
@@ -70,7 +72,7 @@ if ($_POST["save"]) {
 			if ($_POST["clone"] && $field["auto_increment"]) {
 				$as = "''";
 			}
-			if ($jush == "sql" && preg_match("~enum|set~", $field["type"])) {
+			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,13 +1,9 @@
 <?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";
-	include_once "../plugins/drivers/elastic5.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)),
-	));
+	return new Adminer\Adminer;
 }
 
 include "./index.php";

adminer/event.inc.php

@@ -1,4 +1,6 @@
 <?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");
@@ -15,14 +17,18 @@ if ($_POST && !$error) {
 			: "AT " . q($row["STARTS"])
 			) . " ON COMPLETION" . ($row["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
 		;
-		
-		queries_redirect(substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')), 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]", ";") . ";"
-		));
+
+		queries_redirect(
+			substr(ME, 0, -1),
+			($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')),
+			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]", ";") . ";"
+			)
+		);
 	}
 }
 
@@ -35,7 +41,7 @@ if (!$row && $EVENT != "") {
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" class="layout">
+<table 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"]); ?>">
@@ -47,6 +53,8 @@ if (!$row && $EVENT != "") {
 <p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?><?php } ?>
+<?php if ($EVENT != "") { ?>
+<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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
@@ -12,15 +14,34 @@ 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;../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'));
+	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'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {
-		case "plus.gif": echo compile_file('../adminer/static/plus.gif'); break;
-		case "cross.gif": echo compile_file('../adminer/static/cross.gif'); 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;
+		case "plus.gif":
+			echo compile_file('../adminer/static/plus.gif');
+			break;
+		case "cross.gif":
+			echo compile_file('../adminer/static/cross.gif');
+			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,12 +1,11 @@
 <?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,19 +15,24 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
 		}
 		$row["target"] = $target;
 	}
-	
-	if ($jush == "sqlite") {
-		queries_redirect($location, $message, recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($_POST["drop"] ? "" : " " . format_foreign_key($row)))));
+
+	if (JUSH == "sqlite") {
+		$result = recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($row["drop"] ? "" : " " . format_foreign_key($row))));
 	} else {
 		$alter = "ALTER TABLE " . table($TABLE);
-		$drop = "\nDROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name);
-		if ($_POST["drop"]) {
-			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
+		$result = ($name == "" || queries("$alter DROP " . (JUSH == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name)));
+		if (!$row["drop"]) {
+			$result = queries("$alter ADD" . format_foreign_key($row));
 		}
 	}
+	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));
@@ -57,15 +61,22 @@ 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), 'fk_support'));
+$referencable = array_keys(array_filter(table_status('', true), 'Adminer\fk_support'));
 $target = 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 ($jush == "pgsql") {
-	echo lang('Schema') . ": " . html_select("ns", $adminer->schemas(), $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
-} elseif ($jush != "sqlite") {
+if (support("scheme")) {
+	$schemas = array_filter($adminer->schemas(), function ($schema) {
+		return !preg_match('~^information_schema$~i', $schema);
+	});
+	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)) {
@@ -77,7 +88,7 @@ if ($jush == "pgsql") {
 ?>
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
-<table cellspacing="0">
+<table>
 <thead><tr><th id="label-source"><?php echo lang('Source'); ?><th id="label-target"><?php echo lang('Target'); ?></thead>
 <?php
 $j = 0;
@@ -90,18 +101,20 @@ foreach ($row["source"] as $key => $val) {
 ?>
 </table>
 <p>
-<?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("|", $on_actions), $row["on_update"]); ?>
+<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", $driver->onActions), $row["on_delete"]); ?>
+ <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $driver->onActions), $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' => "ms174979.aspx",
-	'oracle' => "https://docs.oracle.com/cd/B19306_01/server.102/b14200/clauses002.htm#sthref2903",
+	'mssql' => "t-sql/statements/create-table-transact-sql",
+	'oracle' => "SQLRF01111",
 )); ?>
 <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 != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?><?php } ?>
+<?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/include/adminer.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // any method change in this file should be transferred to editor/include/adminer.inc.php and plugins/plugin.php
 
 class Adminer {
@@ -13,14 +15,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 array("key" => filename, "cert" => filename, "ca" => filename) or null
+	* @return array ["key" => filename, "cert" => filename, "ca" => filename] or null
 	*/
 	function connectSsl() {
 	}
@@ -39,7 +41,7 @@ class Adminer {
 	function bruteForceKey() {
 		return $_SERVER["REMOTE_ADDR"];
 	}
-	
+
 	/** Get server name displayed in breadcrumbs
 	* @param string
 	* @return string HTML code or null
@@ -118,17 +120,17 @@ class Adminer {
 	*/
 	function loginForm() {
 		global $drivers;
-		echo "<table cellspacing='0' class='layout'>\n";
-		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">' . "\n");
+		echo "<table class='layout'>\n";
+		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);"));
+		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('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('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">' . "\n");
+		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">');
+		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">');
 		echo "</table>\n";
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
-	
+
 	/** Get login form field
 	* @param string
 	* @param string HTML
@@ -136,7 +138,7 @@ class Adminer {
 	* @return string
 	*/
 	function loginFormField($name, $heading, $value) {
-		return $heading . $value;
+		return $heading . $value . "\n";
 	}
 
 	/** Authorize the user
@@ -174,14 +176,16 @@ class Adminer {
 	* @return null
 	*/
 	function selectLinks($tableStatus, $set = "") {
-		global $jush, $driver;
+		global $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")) {
-			if (is_view($tableStatus)) {
+			$is_view = is_view($tableStatus);
+			if ($is_view) {
 				$links["view"] = lang('Alter view');
 			} else {
 				$links["create"] = lang('Alter table');
@@ -194,7 +198,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)), "?");
+		echo doc_link(array(JUSH => $driver->tableHelp($name, $is_view)), "?");
 		echo "\n";
 	}
 
@@ -230,7 +234,7 @@ class Adminer {
 	* @return string
 	*/
 	function selectQuery($query, $start, $failed = false) {
-		global $jush, $driver;
+		global $driver;
 		$return = "</p>\n"; // required for IE9 inline edit
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
@@ -238,7 +242,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
 		;
@@ -309,15 +313,22 @@ class Adminer {
 	* @return null
 	*/
 	function tableStructurePrint($fields) {
+		global $driver;
 		echo "<div class='scrollable'>\n";
-		echo "<table cellspacing='0' class='nowrap'>\n";
+		echo "<table class='nowrap odds'>\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" . odd() . "><th>" . h($field["field"]);
-			echo "<td><span title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . "</span>";
+			echo "<tr><th>" . h($field["field"]);
+			$type = h($field["full_type"]);
+			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>" : "");
-			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
+			$default = h($field["default"]);
+			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";
 		}
@@ -330,7 +341,7 @@ class Adminer {
 	* @return null
 	*/
 	function tableIndexesPrint($indexes) {
-		echo "<table cellspacing='0'>\n";
+		echo "<table>\n";
 		foreach ($indexes as $name => $index) {
 			ksort($index["columns"]); // enforce correct columns order
 			$print = array();
@@ -351,7 +362,7 @@ class Adminer {
 	* @return null
 	*/
 	function selectColumnsPrint($select, $columns) {
-		global $functions, $grouping;
+		global $driver;
 		print_fieldset("select", lang('Select'), $select);
 		$i = 0;
 		$select[""] = array();
@@ -363,8 +374,8 @@ class Adminer {
 				$val["col"],
 				($key !== "" ? "selectFieldChange" : "selectAddRow")
 			);
-			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
-				. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
+			echo "<div>" . ($driver->functions || $driver->grouping ? "<select name='columns[$i][fun]'>"
+				. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $driver->functions, lang('Aggregation') => $driver->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";
@@ -383,7 +394,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('h', $index["columns"])) . "</i>) AGAINST";
+				echo "<div>(<i>" . implode("</i>, <i>", array_map('Adminer\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");
@@ -479,7 +490,7 @@ class Adminer {
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
-	
+
 	/** Print command box in select
 	* @return bool whether to print default commands
 	*/
@@ -505,16 +516,16 @@ class Adminer {
 	/** Process columns box in select
 	* @param array selectable columns
 	* @param array
-	* @return array (array(select_expressions), array(group_expressions))
+	* @return array [[select_expressions], [group_expressions]]
 	*/
 	function selectColumnsProcess($columns, $indexes) {
-		global $functions, $grouping;
+		global $driver;
 		$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"], $functions) || in_array($val["fun"], $grouping)))) {
+			if ($val["fun"] == "count" || ($val["col"] != "" && (!$val["fun"] || in_array($val["fun"], $driver->functions) || in_array($val["fun"], $driver->grouping)))) {
 				$select[$key] = apply_sql_function($val["fun"], ($val["col"] != "" ? idf_escape($val["col"]) : "*"));
-				if (!in_array($val["fun"], $grouping)) {
+				if (!in_array($val["fun"], $driver->grouping)) {
 					$group[] = $select[$key];
 				}
 			}
@@ -532,7 +543,7 @@ class Adminer {
 		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
-				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
+				$return[] = "MATCH (" . implode(", ", array_map('Adminer\idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
 		foreach ((array) $_GET["where"] as $key => $val) {
@@ -560,7 +571,8 @@ class Adminer {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if ((preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+						if (
+							(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"]))
 						) {
@@ -634,7 +646,7 @@ class Adminer {
 	* @return string
 	*/
 	function messageQuery($query, $time, $failed = false) {
-		global $jush, $driver;
+		global $driver;
 		restart_session();
 		$history = &get_session("queries");
 		if (!$history[$_GET["db"]]) {
@@ -651,7 +663,7 @@ 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>'
@@ -673,10 +685,10 @@ class Adminer {
 	* @return array
 	*/
 	function editFunctions($field) {
-		global $edit_functions;
+		global $driver;
 		$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"]) && $update)) { // relative functions
 				foreach ($functions as $pattern => $val) {
 					if (!$pattern || preg_match("~$pattern~", $field["type"])) {
@@ -705,7 +717,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, 0) // 0 - empty
+				. enum_input("radio", $attrs, $field, $value, $value === 0 ? 0 : null) // 0 - empty value
 			;
 		}
 		return "";
@@ -764,7 +776,7 @@ class Adminer {
 	* @return array empty to disable export
 	*/
 	function dumpFormat() {
-		return array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
+		return (support("dump") ? array('sql' => 'SQL') : array()) + array('csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
 	}
 
 	/** Export database structure
@@ -816,14 +828,25 @@ class Adminer {
 	* @return null prints data
 	*/
 	function dumpData($table, $style, $query) {
-		global $connection, $jush;
-		$max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
+		global $connection;
 		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) {
@@ -856,7 +879,7 @@ class Adminer {
 						dump_csv($row);
 					} else {
 						if (!$insert) {
-							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
+							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('Adminer\idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
 							if ($generated[$key]) {
@@ -886,6 +909,9 @@ class Adminer {
 			} elseif ($_POST["format"] == "sql") {
 				echo "-- " . str_replace("\n", " ", $connection->error) . "\n";
 			}
+			if ($identity_insert) {
+				echo "SET IDENTITY_INSERT " . table($table) . " OFF;\n";
+			}
 		}
 	}
 
@@ -939,7 +965,7 @@ class Adminer {
 	* @return null
 	*/
 	function navigation($missing) {
-		global $VERSION, $jush, $drivers, $connection;
+		global $VERSION, $drivers, $connection;
 		?>
 <h1>
 <?php echo $this->name(); ?>
@@ -949,6 +975,7 @@ class Adminer {
 </span>
 </h1>
 <?php
+		switch_lang();
 		if ($missing == "auth") {
 			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
@@ -977,7 +1004,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
@@ -986,9 +1013,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;
@@ -1004,9 +1031,7 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 					$actions[] = "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>";
 					$actions[] = "<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>";
 				}
-				if (support("dump")) {
-					$actions[] = "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>";
-				}
+				$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 ($in_db) {
@@ -1041,7 +1066,7 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
 		echo "<span title='" . lang('Database') . "'>" . lang('DB') . "</span>: " . ($databases
 			? "<select name='db'>" . optionlist(array("" => "") + $databases, DB) . "</select>$db_events"
-			: "<input name='db' value='" . h(DB) . "' autocapitalize='off'>\n"
+			: "<input name='db' value='" . h(DB) . "' autocapitalize='off' size='19'>\n"
 		);
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
 		if (support("scheme")) {
@@ -1084,5 +1109,4 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 		}
 		echo "</ul>\n";
 	}
-
 }

adminer/include/auth.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $connection = '';
 
 $has_token = $_SESSION["token"];
@@ -64,7 +66,8 @@ if ($auth) {
 		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($password, $private) : "");
 		cookie("adminer_permanent", implode(" ", $permanent));
 	}
-	if (count($_POST) == 1 // 1 - auth
+	if (
+		count($_POST) == 1 // 1 - auth
 		|| DRIVER != $vendor
 		|| SERVER != $server
 		|| $_GET["username"] !== $username // "0" == "00"
@@ -72,14 +75,14 @@ if ($auth) {
 	) {
 		redirect(auth_url($vendor, $server, $username, $db));
 	}
-	
+
 } elseif ($_POST["logout"] && (!$has_token || verify_token())) {
 	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();
 	$private = $adminer->permanentLogin();
@@ -130,7 +133,7 @@ function auth_error($error) {
 		$error = lang('Session support must be enabled.');
 	}
 	$params = session_get_cookie_params();
-	cookie("adminer_key", ($_COOKIE["adminer_key"] ? $_COOKIE["adminer_key"] : rand_string()), $params["lifetime"]);
+	cookie("adminer_key", ($_COOKIE["adminer_key"] ?: rand_string()), $params["lifetime"]);
 	page_header(lang('Login'), $error, null);
 	echo "<form action='' method='post'>\n";
 	echo "<div>";
@@ -144,10 +147,10 @@ function auth_error($error) {
 	exit;
 }
 
-if (isset($_GET["username"]) && !class_exists("Min_DB")) {
+if (isset($_GET["username"]) && !class_exists('Adminer\Db')) {
 	unset($_SESSION["pwds"][DRIVER]);
 	unset_permanent();
-	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
+	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", Driver::$possibleDrivers)), false);
 	page_footer("auth");
 	exit;
 }
@@ -160,13 +163,16 @@ if (isset($_GET["username"]) && is_string(get_password())) {
 		auth_error(lang('Connecting to privileged ports is not allowed.'));
 	}
 	check_invalid_login();
-	$connection = connect();
-	$driver = new Min_Driver($connection);
+	$connection = connect($adminer->credentials());
+	$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) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.')));
+	$error = (is_string($connection) ? nl_br(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.') : ''));
 }
 
@@ -199,7 +205,7 @@ if ($_POST) {
 			: lang('Invalid CSRF token. Send the form again.') . ' ' . lang('If you did not send this request from Adminer then close this page.')
 		);
 	}
-	
+
 } elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
 	// posted form with no data means that post_max_size exceeded because Adminer always sends token at least
 	$error = lang('Too big POST data. Reduce the data or increase the %s configuration directive.', "'post_max_size'");

adminer/include/bootstrap.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 include "../adminer/include/version.inc.php";
 include "../adminer/include/errors.inc.php";
 include "../adminer/include/coverage.inc.php";
@@ -33,7 +35,7 @@ if ($_GET["script"] == "version") {
 	exit;
 }
 
-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
+global $adminer, $connection, $driver, $drivers, $error, $HTTPS, $LANG, $langs, $permanent, $has_token, $token, $translations, $VERSION; // allows including Adminer inside a function
 
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];
@@ -50,11 +52,7 @@ $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
-	$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_set_cookie_params(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS, true); // ini_set() may be disabled
 	session_start();
 }
 
@@ -80,27 +78,16 @@ include "./include/adminer.inc.php";
 $adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
-$config = driver_config();
-$possible_drivers = $config['possible_drivers'];
-$jush = $config['jush'];
-$types = $config['types'];
-$structured_types = $config['structured_types'];
-$unsigned = $config['unsigned'];
-$operators = $config['operators'];
-$functions = $config['functions'];
-$grouping = $config['grouping'];
-$edit_functions = $config['edit_functions'];
-if ($adminer->operators === null) {
-	$adminer->operators = $operators;
-}
-
-define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
-define("DB", $_GET["db"]); // for the sake of speed and size
-define("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"]) . "&" : "") : '')
+define('Adminer\JUSH', Driver::$jush);
+define('Adminer\SERVER', $_GET[DRIVER]); // read from pgsql=localhost
+define('Adminer\DB', $_GET["db"]); // for the sake of speed and size
+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/design.inc.php";
@@ -108,5 +95,3 @@ 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,6 +1,18 @@
 <?php
-function connect_error() {
-	global $adminer, $connection, $token, $error, $drivers;
+namespace Adminer;
+
+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);
@@ -8,16 +20,18 @@ function connect_error() {
 		if ($_POST["db"] && !$error) {
 			queries_redirect(substr(ME, 0, -1), lang('Databases have been dropped.'), drop_databases($_POST["db"]));
 		}
-		
+
 		page_header(lang('Select database'), $error, false);
 		echo "<p class='links'>\n";
-		foreach (array(
-			'database' => lang('Create database'),
-			'privileges' => lang('Privileges'),
-			'processlist' => lang('Process list'),
-			'variables' => lang('Variables'),
-			'status' => lang('Status'),
-		) as $key => $val) {
+		foreach (
+			array(
+				'database' => lang('Create database'),
+				'privileges' => lang('Privileges'),
+				'processlist' => lang('Process list'),
+				'variables' => lang('Variables'),
+				'status' => lang('Status'),
+			) as $key => $val
+		) {
 			if (support($key)) {
 				echo "<a href='" . h(ME) . "$key='>$val</a>\n";
 			}
@@ -29,23 +43,23 @@ function connect_error() {
 			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
-			echo "<table cellspacing='0' class='checkable'>\n";
+			echo "<table class='checkable odds'>\n";
 			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo "<thead><tr>"
 				. (support("database") ? "<td>" : "")
-				. "<th>" . lang('Database') . " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>"
+				. "<th>" . lang('Database') . (get_session("dbs") !== null ? " - <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');", "")
 				. "</thead>\n"
 			;
-			
+
 			$databases = ($_GET["dbsize"] ? count_tables($databases) : array_flip($databases));
-			
+
 			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
 				$id = h("Db-" . $db);
-				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
+				echo "<tr>" . (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);
@@ -53,7 +67,7 @@ function connect_error() {
 				echo "<td align='right' id='size-" . h($db) . "'>" . ($_GET["dbsize"] ? db_size($db) : "?");
 				echo "\n";
 			}
-			
+
 			echo "</table>\n";
 			echo (support("database")
 				? "<div class='footer'><div>\n"
@@ -69,23 +83,8 @@ function connect_error() {
 			echo script("tableCheck();");
 		}
 	}
-	
+
 	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;
 }
 

adminer/include/coverage.inc.php

@@ -1,4 +1,6 @@
 <?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() {
@@ -14,5 +16,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('save_coverage');
+	register_shutdown_function('Adminer\save_coverage');
 }

adminer/include/design.inc.php

@@ -1,13 +1,19 @@
 <?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 array("key" => "link", "key2" => array("link", "desc")), null for nothing, false for driver only, true for driver and server
+* @param mixed ["key" => "link", "key2" => ["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, $jush;
+	global $LANG, $VERSION, $adminer, $drivers;
 	page_headers();
 	if (is_ajax() && $error) {
 		page_messages($error);
@@ -20,6 +26,7 @@ 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"); ?>
@@ -61,14 +68,14 @@ 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 ? $link : ".") . '">' . $drivers[DRIVER] . '</a> » ';
+		echo '<p id="breadcrumb"><a href="' . h($link ?: ".") . '">' . $drivers[DRIVER] . '</a> » ';
 		$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
 		$server = $adminer->serverName(SERVER);
 		$server = ($server != "" ? $server : lang('Server'));
@@ -102,7 +109,7 @@ var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 		$databases = null;
 	}
 	stop_session();
-	define("PAGE_HEADER", 1);
+	define('Adminer\PAGE_HEADER', 1);
 }
 
 /** Send HTTP headers
@@ -178,7 +185,10 @@ function page_footer($missing = "") {
 	?>
 </div>
 
-<?php switch_lang(); ?>
+<div id="menu">
+<?php $adminer->navigation($missing); ?>
+</div>
+
 <?php if ($missing != "auth") { ?>
 <form action="" method="post">
 <p class="logout">
@@ -188,9 +198,6 @@ function page_footer($missing = "") {
 </p>
 </form>
 <?php } ?>
-<div id="menu">
-<?php $adminer->navigation($missing); ?>
-</div>
 <?php
 	echo script("setupSubmitHighlight(document);");
 }

adminer/include/driver.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $drivers = array();
 
 /** Add a driver
@@ -20,16 +22,43 @@ function get_driver($id) {
 	return $drivers[$id];
 }
 
-/*abstract*/ class Min_SQL {
+abstract class SqlDriver {
+	static $possibleDrivers = array();
+	static $jush; ///< @var string JUSH identifier
+
 	var $_conn;
-	
+	protected $types = array(); ///< @var array [$description => [$type => $maximum_unsigned_length, ...], ...]
+	var $editFunctions = array(); ///< @var array of ["$type|$type2" => "$function/$function2"] functions used in editing, [0] - edit and insert, [1] - edit only
+	var $unsigned = array(); ///< @var array number variants
+	var $operators = array(); ///< @var array operators used in select
+	var $functions = array(); ///< @var array functions used in select
+	var $grouping = array(); ///< @var array grouping functions used in select
+	var $onActions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()
+	var $inout = "IN|OUT|INOUT";
+	var $enumLength = "'(?:''|[^'\\\\]|\\\\.)*'";
+	var $generated = array();
+
 	/** Create object for performing database operations
-	* @param Min_DB
+	* @param Db
 	*/
 	function __construct($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);
+	}
+
 	/** Select data from table
 	* @param string
 	* @param array result of $adminer->selectColumnsProcess()[0]
@@ -39,15 +68,15 @@ function get_driver($id) {
 	* @param int result of $adminer->selectLimitProcess()
 	* @param int index of page starting at zero
 	* @param bool whether to print the query
-	* @return Min_Result
+	* @return Result
 	*/
 	function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-		global $adminer, $jush;
+		global $adminer;
 		$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),
@@ -61,7 +90,7 @@ function get_driver($id) {
 		}
 		return $return;
 	}
-	
+
 	/** Delete data from table
 	* @param string
 	* @param string " WHERE ..."
@@ -72,7 +101,7 @@ function get_driver($id) {
 		$query = "FROM " . table($table);
 		return queries("DELETE" . ($limit ? limit1($table, $query, $queryWhere) : " $query$queryWhere"));
 	}
-	
+
 	/** Update data in table
 	* @param string
 	* @param array escaped columns in keys, quoted data in values
@@ -89,7 +118,7 @@ function get_driver($id) {
 		$query = table($table) . " SET$separator" . implode(",$separator", $values);
 		return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere, $separator) : " $query$queryWhere"));
 	}
-	
+
 	/** Insert data into table
 	* @param string
 	* @param array escaped columns in keys, quoted data in values
@@ -101,38 +130,38 @@ function get_driver($id) {
 			: " DEFAULT VALUES"
 		));
 	}
-	
+
 	/** Insert or update data in table
 	* @param string
 	* @param array
 	* @param array of arrays with escaped columns in keys and quoted data in values
 	* @return bool
 	*/
-	/*abstract*/ function insertUpdate($table, $rows, $primary) {
+	function insertUpdate($table, $rows, $primary) {
 		return false;
 	}
-	
+
 	/** Begin transaction
 	* @return bool
 	*/
 	function begin() {
 		return queries("BEGIN");
 	}
-	
+
 	/** Commit transaction
 	* @return bool
 	*/
 	function commit() {
 		return queries("COMMIT");
 	}
-	
+
 	/** Rollback transaction
 	* @return bool
 	*/
 	function rollback() {
 		return queries("ROLLBACK");
 	}
-	
+
 	/** Return query with a timeout
 	* @param string
 	* @param int seconds
@@ -140,10 +169,10 @@ function get_driver($id) {
 	*/
 	function slowQuery($query, $timeout) {
 	}
-	
+
 	/** Convert column to be searchable
 	* @param string escaped column name
-	* @param array array("op" => , "val" => )
+	* @param array ["op" => , "val" => ]
 	* @param array
 	* @return string
 	*/
@@ -178,19 +207,48 @@ function get_driver($id) {
 	function quoteBinary($s) {
 		return q($s);
 	}
-	
+
 	/** Get warnings about the last command
 	* @return string HTML
 	*/
 	function warnings() {
 		return '';
 	}
-	
+
 	/** Get help link for table
 	* @param string
+	* @param bool
 	* @return string relative URL or null
 	*/
-	function tableHelp($name) {
+	function tableHelp($name, $is_view = false) {
+	}
+
+	/** 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,26 @@
 <?php
+namespace Adminer;
+
 // This file is not used in Adminer Editor.
 
 /** Print select result
-* @param Min_Result
-* @param Min_DB connection to examine indexes
+* @param Result
+* @param 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 cellspacing='0' class='nowrap'>\n";
+			echo "<table class='nowrap odds'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
 				$field = $result->fetch_field();
@@ -28,7 +28,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,11 +61,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 			}
 			echo "</thead>\n";
 		}
-		echo "<tr" . odd() . ">";
+		echo "<tr>";
 		foreach ($row as $key => $val) {
 			$link = "";
 			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
+				if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
 					$table = $row[array_search("table=", $links)];
 					$link = ME . $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
 				} else {
@@ -99,7 +99,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,8 +152,7 @@ function set_adminer_settings($settings) {
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
-	global $jush;
-	echo "<textarea name='" . h($name) . "' rows='$rows' cols='$cols' class='sqlarea jush-$jush' spellcheck='false' wrap='off'>";
+	echo "<textarea name='" . h($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)
@@ -208,22 +207,30 @@ function json_row($key, $val = null) {
 * @return null
 */
 function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) {
-	global $structured_types, $types, $unsigned, $on_actions;
+	global $driver;
 	$type = $field["type"];
-	?>
-<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;
-}
-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 "<select name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
-	echo ($unsigned ? "<select name='" . h($key) . "[unsigned]'" . (!$type || preg_match(number_type(), $type) ? "" : " class='hidden'") . '><option>' . optionlist($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("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
+	?><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)) {
+		$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 ? "<select name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>' : '');
+	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
 }
 
 /** Get partition info
@@ -235,7 +242,7 @@ function get_partitions_info($table) {
 	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
 	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
 	$return = array();
-	list($return["partition_by"], $return["partition"],  $return["partitions"]) = $result->fetch_row();
+	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);
@@ -247,7 +254,8 @@ function get_partitions_info($table) {
 * @return string
 */
 function process_length($length) {
-	global $enum_length;
+	global $driver;
+	$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))
@@ -260,18 +268,18 @@ function process_length($length) {
 * @return string
 */
 function process_type($field, $collate = "COLLATE") {
-	global $unsigned;
+	global $driver;
 	return " $field[type]"
 		. process_length($field["length"])
-		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
-		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
+		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $driver->unsigned) ? " $field[unsigned]" : "")
+		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . (JUSH == "mssql" ? $field["collation"] : q($field["collation"])) : "")
 	;
 }
 
 /** Create SQL string from field
 * @param array basic field information
 * @param array information about field type
-* @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
+* @return array ["field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT"]
 */
 function process_field($field, $type_field) {
 	// MariaDB exports CURRENT_TIMESTAMP as a function.
@@ -294,12 +302,16 @@ function process_field($field, $type_field) {
 * @return string
 */
 function default_value($field) {
-	global $jush;
+	global $driver;
 	$default = $field["default"];
-	return ($default === null ? "" : " DEFAULT " .
-		(!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default))
-		? q($default) : str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", ($jush == "sqlite" ? "($default)" : $default)))
-	);
+	$generated = $field["generated"];
+	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))
+			? q($default)
+			: str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", (JUSH == "sqlite" ? "($default)" : $default))
+		)
+	));
 }
 
 /** Get type class to use in CSS
@@ -307,12 +319,14 @@ function default_value($field) {
 * @return string class=''
 */
 function type_class($type) {
-	foreach (array(
-		'char' => 'text',
-		'date' => 'time|year',
-		'binary' => 'blob',
-		'enum' => 'set',
-	) as $key => $val) {
+	foreach (
+		array(
+			'char' => 'text',
+			'date' => 'time|year',
+			'binary' => 'blob',
+			'enum' => 'set',
+		) as $key => $val
+	) {
 		if (preg_match("~$key|$val~", $type)) {
 			return " class='$key'";
 		}
@@ -327,13 +341,13 @@ function type_class($type) {
 * @return null
 */
 function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array()) {
-	global $inout;
+	global $driver;
 	$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 if ($type == "PROCEDURE") { ?><td><?php } ?>
+<?php echo ($type == "PROCEDURE" ? "<td>" : ""); ?>
 <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'); ?>
@@ -345,7 +359,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 	'mariadb' => "auto_increment/",
 	'sqlite' => "autoinc.html",
 	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
-	'mssql' => "ms186775.aspx",
+	'mssql' => "t-sql/statements/create-table-transact-sql-identity-property",
 )); ?>
 <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') : ""); ?>
@@ -361,13 +375,22 @@ 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("|", $inout), $field["inout"]) : ""); ?>
-<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 } ?>
+<?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $driver->inout), $field["inout"]) : "") . "<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 type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>"><?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
-<?php if ($type == "TABLE") { ?>
+<?php
+		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 if ($field["auto_increment"]) { ?> checked<?php } ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
-			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
+<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
+			echo ($driver->generated
+				? "<select name='fields[$i][generated]'>" . optionlist(array_merge(array("", "DEFAULT"), $driver->generated), $field["generated"]) . "</select> "
+				: 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>";
@@ -490,11 +513,10 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 * @return string
 */
 function create_trigger($on, $row) {
-	global $jush;
 	$timing_event = " $row[Timing] $row[Event]" . (preg_match('~ OF~', $row["Event"]) ? " $row[Of]" : ""); // SQL injection
 	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]", ";")
 		. ";"
 	;
@@ -506,22 +528,22 @@ function create_trigger($on, $row) {
 * @return string
 */
 function create_routine($routine, $row) {
-	global $inout, $jush;
+	global $driver;
 	$set = array();
 	$fields = (array) $row["fields"];
 	ksort($fields); // enforce fields order
 	foreach ($fields as $field) {
 		if ($field["field"] != "") {
-			$set[] = (preg_match("~^($inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
+			$set[] = (preg_match("~^($driver->inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
 	}
-	$definition = rtrim("\n$row[definition]", ";");
+	$definition = rtrim($row["definition"], ";");
 	return "CREATE $routine "
 		. idf_escape(trim($row["name"]))
 		. " (" . implode(", ", $set) . ")"
-		. (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
+		. ($routine == "FUNCTION" ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
 		. ($row["language"] ? " LANGUAGE $row[language]" : "")
-		. ($jush == "pgsql" ? " AS " . q($definition) : "$definition;")
+		. (JUSH == "pgsql" ? " AS " . q($definition) : "\n$definition;")
 	;
 }
 
@@ -534,20 +556,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 $on_actions;
+	global $driver;
 	$db = $foreign_key["db"];
 	$ns = $foreign_key["ns"];
-	return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES "
+	return " FOREIGN KEY (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["source"])) . ") REFERENCES "
 		. ($db != "" && $db != $_GET["db"] ? idf_escape($db) . "." : "")
 		. ($ns != "" && $ns != $_GET["ns"] ? idf_escape($ns) . "." : "")
-		. table($foreign_key["table"])
-		. " (" . implode(", ", array_map('idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
-		. (preg_match("~^($on_actions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
-		. (preg_match("~^($on_actions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
+		. idf_escape($foreign_key["table"])
+		. " (" . implode(", ", array_map('Adminer\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("~^($driver->onActions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
 	;
 }
 
@@ -576,34 +598,37 @@ function tar_file($filename, $tmp_file) {
 function ini_bytes($ini) {
 	$val = ini_get($ini);
 	switch (strtolower(substr($val, -1))) {
-		case 'g': $val = (int)$val * 1024; // no break
-		case 'm': $val = (int)$val * 1024; // no break
-		case 'k': $val = (int)$val * 1024;
+		case 'g':
+			$val = (int) $val * 1024; // no break
+		case 'm':
+			$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 $jush, $connection;
+	global $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://msdn.microsoft.com/library/",
+		'mssql' => "https://learn.microsoft.com/en-us/sql/",
 		'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/";
 		$paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
 	}
-	return ($paths[$jush] ? "<a href='" . h($urls[$jush] . $paths[$jush]) . "'" . target_blank() . ">$text</a>" : "");
+	return ($paths[JUSH] ? "<a href='" . h($urls[JUSH] . $paths[JUSH] . (JUSH == 'mssql' ? "?view=sql-server-ver$version" : "")) . "'" . target_blank() . ">$text</a>" : "");
 }
 
 /** Wrap gzencode() for usage in ob_start()

adminer/include/errors.inc.php

@@ -1,7 +1,7 @@
 <?php
-function adminer_errors($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on( value of type)? null|Undefined (array key|property))~', $errstr);
-}
+namespace Adminer;
 
 error_reporting(6135); // errors and warnings
-set_error_handler('adminer_errors', E_WARNING);
+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,8 +1,10 @@
 <?php
+namespace Adminer;
+
 // This file is used both in Adminer and Adminer Editor.
 
 /** Get database connection
-* @return Min_DB
+* @return Db
 */
 function connection() {
 	// can be used in customization, $connection is minified
@@ -96,7 +98,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 Min_DB defaults to $connection
+* @param Db defaults to $connection
 * @return bool
 */
 function min_version($version, $maria_db = "", $connection2 = null) {
@@ -113,7 +115,7 @@ function min_version($version, $maria_db = "", $connection2 = null) {
 }
 
 /** Get connection charset
-* @param Min_DB
+* @param Db
 * @return string
 */
 function charset($connection) {
@@ -202,7 +204,11 @@ function optionlist($options, $selected = null, $use_keys = false) {
 			$opts = $v;
 		}
 		foreach ($opts as $key => $val) {
-			$return .= '<option' . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '') . (($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '') . '>' . h($val);
+			$return .= '<option'
+				. ($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>';
@@ -266,18 +272,6 @@ 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
@@ -362,7 +356,7 @@ function get_vals($query, $column = 0) {
 
 /** Get keys from first column and values from second
 * @param string
-* @param Min_DB
+* @param Db
 * @param bool
 * @return array
 */
@@ -387,7 +381,7 @@ function get_key_vals($query, $connection2 = null, $set_keys = true) {
 
 /** Get all rows of result
 * @param string
-* @param Min_DB
+* @param Db
 * @param string
 * @return array of associative arrays
 */
@@ -400,7 +394,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("PAGE_HEADER")) {
+	} elseif (!$result && !is_object($connection2) && $error && (defined('Adminer\PAGE_HEADER') || $error == "-- ")) {
 		echo $error . error() . "\n";
 	}
 	return $return;
@@ -443,19 +437,19 @@ function escape_key($key) {
 * @return string
 */
 function where($where, $fields = array()) {
-	global $connection, $jush;
+	global $connection;
 	$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 == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
+			. (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 == "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";
 		}
 	}
@@ -510,17 +504,19 @@ 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
+* @param int number of seconds, 0 for session cookie, 2592000 - 30 days
 * @return bool
 */
-function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
+function cookie($name, $value, $lifetime = 2592000) {
 	global $HTTPS;
-	return header("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);
+	return header(
+		"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
+	);
 }
 
 /** Restart stopped session
@@ -641,7 +637,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 Min_Result or array($queries, $time) if $query = null
+* @return Result or [$queries, $time] if $query = null
 */
 function queries($query) {
 	global $connection;
@@ -664,7 +660,7 @@ function queries($query) {
 * @param callback
 * @return bool
 */
-function apply_queries($query, $tables, $escape = 'table') {
+function apply_queries($query, $tables, $escape = 'Adminer\table') {
 	foreach ($tables as $table) {
 		if (!queries("$query " . $escape($table))) {
 			return false;
@@ -739,7 +735,8 @@ function get_file($key, $decompress = false) {
 		}
 		$name = $file["name"][$key];
 		$tmp_name = $file["tmp_name"][$key];
-		$content = file_get_contents($decompress && preg_match('~\.gz$~', $name)
+		$content = file_get_contents(
+			$decompress && preg_match('~\.gz$~', $name)
 			? "compress.zlib://$tmp_name"
 			: $tmp_name
 		); //! may not be reachable because of open_basedir
@@ -814,7 +811,7 @@ function format_number($val) {
 */
 function friendly_url($val) {
 	// used for blobs and export
-	return preg_replace('~[^a-z0-9_]~i', '-', $val);
+	return preg_replace('~\W~i', '-', $val);
 }
 
 /** Print hidden fields
@@ -854,12 +851,12 @@ function hidden_fields_get() {
 */
 function table_status1($table, $fast = false) {
 	$return = table_status($table, $fast);
-	return ($return ? $return : array("Name" => $table));
+	return ($return ?: array("Name" => $table));
 }
 
 /** Find out foreign keys for each column
 * @param string
-* @return array array($col => array())
+* @return array [$col => []]
 */
 function column_foreign_keys($table) {
 	global $adminer;
@@ -887,7 +884,7 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 	foreach ($matches[1] as $i => $val) {
 		$val = stripcslashes(str_replace("''", "'", $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='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
+		$return .= " <label><input type='$type'$attrs value='" . (JUSH == "sql" ? $i+1 : h($val)) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
 	}
 	return $return;
 }
@@ -899,7 +896,7 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-	global $types, $adminer, $jush;
+	global $driver, $adminer;
 	$name = h(bracket_escape($field["field"]));
 	echo "<td class='function'>";
 	if (is_array($value) && !$function) {
@@ -910,13 +907,22 @@ function input($field, $value, $function) {
 		$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]'$disabled";
+	$types = $driver->types();
+	$structured_types = $driver->structuredTypes();
+	if (in_array($field["type"], (array) $structured_types[lang('User types')])) {
+		$enums = type_values($types[$field["type"]]);
+		if ($enums) {
+			$field["type"] = "enum";
+			$field["length"] = $enums;
+		}
+	}
 	if ($field["type"] == "enum") {
 		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
@@ -943,7 +949,7 @@ function input($field, $value, $function) {
 		} 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);
@@ -954,8 +960,11 @@ 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
-			$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));
-			if ($jush == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
+			$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)
+			);
+			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
@@ -1215,7 +1224,7 @@ function select_value($val, $link, $field, $text_length) {
 				. "<td>" . select_value($v, $link, $field, $text_length)
 			;
 		}
-		return "<table cellspacing='0'>$return</table>";
+		return "<table>$return</table>";
 	}
 	if (!$link) {
 		$link = $adminer->selectLink($val, $field);
@@ -1277,9 +1286,8 @@ 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)
 	);
@@ -1294,7 +1302,7 @@ function slow_query($query) {
 	$db = $adminer->database();
 	$timeout = $adminer->queryTimeout();
 	$slow_query = $driver->slowQuery($query, $timeout);
-	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(); ?>>
@@ -1309,7 +1317,7 @@ var timeout = setTimeout(function () {
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals(($slow_query ? $slow_query : $query), $connection2, false); // @ - may be killed
+	$return = @get_key_vals(($slow_query ?: $query), $connection2, false); // @ - may be killed
 	if ($connection2) {
 		echo script("clearTimeout(timeout);");
 		ob_flush();
@@ -1389,7 +1397,7 @@ function on_help($command, $side = 0) {
 * @return null
 */
 function edit_form($table, $fields, $row, $update) {
-	global $adminer, $jush, $token, $error;
+	global $adminer, $token, $error;
 	$table_name = $adminer->tableName(table_status1($table, true));
 	page_header(
 		($update ? lang('Edit') : lang('Insert')),
@@ -1408,7 +1416,8 @@ function edit_form($table, $fields, $row, $update) {
 	if (!$fields) {
 		echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
 	} else {
-		echo "<table cellspacing='0' class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
+		echo "<table class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
+		$first = 0;
 		foreach ($fields as $name => $field) {
 			echo "<tr><th>" . $adminer->fieldName($field);
 			$default = $_GET["set"][bracket_escape($name)];
@@ -1419,7 +1428,7 @@ function edit_form($table, $fields, $row, $update) {
 				}
 			}
 			$value = ($row !== null
-				? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
+				? ($row[$name] != "" && JUSH == "sql" && preg_match("~enum|set~", $field["type"])
 					? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
 					: (is_bool($row[$name]) ? +$row[$name] : $row[$name])
 				)
@@ -1449,6 +1458,9 @@ function edit_form($table, $fields, $row, $update) {
 				$value = "";
 				$function = "uuid";
 			}
+			if ($field["auto_increment"] || $function == "now" || $function == "uuid") {
+				$first++;
+			}
 			input($field, $value, $function);
 			echo "\n";
 		}
@@ -1475,7 +1487,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'))[1].firstChild);"))
+		: ($_POST || !$fields ? "" : script("focus(qsa('td', qs('#form'))[2*$first+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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 // not used in a single language version
 
 $langs = array(
@@ -25,8 +27,8 @@ $langs = array(
 	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
 	'ka' => 'ქართული', // Saba Khmaladze skhmaladze@uglt.org
 	'ko' => '한국어', // dalli - skcha67@gmail.com
-    'lv' => 'Latviešu', // Kristaps Lediņš - https://krysits.com
-    'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
+	'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
@@ -63,7 +65,7 @@ function get_lang() {
 */
 function lang($idf, $number = null) {
 	global $LANG, $translations;
-	$translation = ($translations[$idf] ? $translations[$idf] : $idf);
+	$translation = ($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
@@ -71,9 +73,10 @@ 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,34 +1,28 @@
 <?php
+namespace Adminer;
+
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
-	/*abstract*/ class Min_PDO {
+	abstract class PdoDb {
 		var $_result, $server_info, $affected_rows, $errno, $error, $pdo;
-		
-		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('Min_PDOStatement');
+			$options[\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
+			$options[\PDO::ATTR_STATEMENT_CLASS] = array('Adminer\PdoDbStatement');
 			try {
-				$this->pdo = new PDO($dsn, $username, $password, $options);
+				$this->pdo = new \PDO($dsn, $username, $password, $options);
 			} catch (Exception $ex) {
 				auth_error(h($ex->getMessage()));
 			}
-			$this->server_info = @$this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
+			$this->server_info = @$this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION);
 		}
-		
-		/*abstract function select_db($database);*/
-		
+
+		abstract function select_db($database);
+
 		function quote($string) {
 			return $this->pdo->quote($string);
 		}
-		
+
 		function query($query, $unbuffered = false) {
 			$result = $this->pdo->query($query);
 			$this->error = "";
@@ -42,11 +36,11 @@ if (extension_loaded('pdo')) {
 			$this->store_result($result);
 			return $result;
 		}
-		
+
 		function multi_query($query) {
 			return $this->_result = $this->query($query);
 		}
-		
+
 		function store_result($result = null) {
 			if (!$result) {
 				$result = $this->_result;
@@ -61,7 +55,7 @@ if (extension_loaded('pdo')) {
 			$this->affected_rows = $result->rowCount();
 			return true;
 		}
-		
+
 		function next_result() {
 			if (!$this->_result) {
 				return false;
@@ -69,7 +63,7 @@ if (extension_loaded('pdo')) {
 			$this->_result->_offset = 0;
 			return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it
 		}
-		
+
 		function result($query, $field = 0) {
 			$result = $this->query($query);
 			if (!$result) {
@@ -79,18 +73,18 @@ if (extension_loaded('pdo')) {
 			return $row[$field];
 		}
 	}
-	
-	class Min_PDOStatement extends PDOStatement {
+
+	class PdoDbStatement extends \PDOStatement {
 		var $_offset = 0, $num_rows;
-		
+
 		function fetch_assoc() {
-			return $this->fetch(PDO::FETCH_ASSOC);
+			return $this->fetch(\PDO::FETCH_ASSOC);
 		}
-		
+
 		function fetch_row() {
-			return $this->fetch(PDO::FETCH_NUM);
+			return $this->fetch(\PDO::FETCH_NUM);
 		}
-		
+
 		function fetch_field() {
 			$row = (object) $this->getColumnMeta($this->_offset++);
 			$row->orgtable = $row->table;
@@ -98,5 +92,11 @@ 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();
+			}
+		}
 	}
 }

adminer/include/tmpfile.inc.php

@@ -1,22 +1,22 @@
 <?php
+namespace Adminer;
 
 class TmpFile {
 	var $handler;
 	var $size;
-	
+
 	function __construct() {
 		$this->handler = tmpfile();
 	}
-	
+
 	function write($contents) {
 		$this->size += strlen($contents);
 		fwrite($this->handler, $contents);
 	}
-	
+
 	function send() {
 		fseek($this->handler, 0);
 		fpassthru($this->handler);
 		fclose($this->handler);
 	}
-	
 }

adminer/include/version.inc.php

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

adminer/include/xxtea.inc.php

@@ -1,4 +1,6 @@
 <?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,12 +7,11 @@
 * @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"];
 }
@@ -59,6 +58,8 @@ 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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE, true);
@@ -10,13 +12,15 @@ 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) {
@@ -33,27 +37,28 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 					$desc = $index["descs"][$key];
 					$set[] = idf_escape($column) . ($length ? "(" . (+$length) . ")" : "") . ($desc ? " DESC" : "");
 					$columns[] = $column;
-					$lengths[] = ($length ? $length : null);
+					$lengths[] = ($length ?: null);
 					$descs[] = $desc;
 				}
 			}
 
-			if ($columns) {
-				$existing = $indexes[$name];
-				if ($existing) {
-					ksort($existing["columns"]);
-					ksort($existing["lengths"]);
-					ksort($existing["descs"]);
-					if ($index["type"] == $existing["type"]
-						&& array_values($existing["columns"]) === $columns
-						&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
-						&& array_values($existing["descs"]) === $descs
-					) {
-						// skip existing index
-						unset($indexes[$name]);
-						continue;
-					}
+			$existing = $indexes[$name];
+			if ($existing) {
+				ksort($existing["columns"]);
+				ksort($existing["lengths"]);
+				ksort($existing["descs"]);
+				if (
+					$index["type"] == $existing["type"]
+					&& array_values($existing["columns"]) === $columns
+					&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
+					&& array_values($existing["descs"]) === $descs
+				) {
+					// skip existing index
+					unset($indexes[$name]);
+					continue;
 				}
+			}
+			if ($columns) {
 				$alter[] = array($index["type"], $name, $set);
 			}
 		}
@@ -91,14 +96,21 @@ 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 cellspacing="0" class="nowrap">
+<table class="nowrap">
 <thead><tr>
 <th id="label-type"><?php echo lang('Index Type'); ?>
-<th><input type="submit" class="wayoff"><?php echo lang('Column (length)'); ?>
+<th><input type="submit" class="wayoff"><?php
+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>
@@ -124,11 +136,12 @@ 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 ($jush == "sql" || $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
+			echo "<span class='idxopts" . ($show_options ? "" : " hidden") . "'>";
+			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>";
+			echo "</span> </span>";
 			$i++;
 		}
 

adminer/lang/ar.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
@@ -93,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'نوع المؤشر',
-	'Column (length)' => 'العمود (الطول)',
+	'length' => 'الطول',
 	'View has been dropped.' => 'تم مسح العرض.',
 	'View has been altered.' => 'تم تعديل العرض.',
 	'View has been created.' => 'تم إنشاء العرض.',

adminer/lang/bg.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Система',
@@ -22,10 +24,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесията е изтекла; моля, влезте отново.',
 	'%s version: %s through PHP extension %s' => '%s версия: %s през PHP разширение %s',
 	'Refresh' => 'Обновяване',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Права',
 	'Create user' => 'Създаване на потребител',
 	'User has been dropped.' => 'Потребителя беше премахнат.',
@@ -36,14 +38,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Осигуряване',
 	'Revoke' => 'Отнемане',
-	
+
 	'Process list' => 'Списък с процеси',
 	'%d process(es) have been killed.' => array('%d процес беше прекъснат.', '%d процеса бяха прекъснати.'),
 	'Kill' => 'Прекъсване',
-	
+
 	'Variables' => 'Променливи',
 	'Status' => 'Състояние',
-	
+
 	'SQL command' => 'SQL команда',
 	'%d query(s) executed OK.' => array('%d заявка е изпълнена.', '%d заявки са изпълнени.'),
 	'Query executed OK, %d row(s) affected.' => array('Заявката е изпълнена, %d ред е засегнат.', 'Заявката е изпълнена, %d редове са засегнати.'),
@@ -57,7 +59,7 @@ $translations = array(
 	'History' => 'Хронология',
 	'Clear' => 'Изчистване',
 	'Edit all' => 'Редактиране на всички',
-	
+
 	'File upload' => 'Прикачване на файл',
 	'From server' => 'От сървър',
 	'Webserver file %s' => 'Сървърен файл %s',
@@ -69,14 +71,14 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Изпратени са прекалено много данни. Намалете обема на данните или увеличете %s управляващата директива.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Можете да прикачите голям SQL файл чрез FTP и да го импортирате от сървъра.',
 	'You are offline.' => 'Вие сте офлайн.',
-	
+
 	'Export' => 'Експорт',
 	'Output' => 'Резултат',
 	'open' => 'показване',
 	'save' => 'запис',
 	'Format' => 'Формат',
 	'Data' => 'Данни',
-	
+
 	'Database' => 'База данни',
 	'Use' => 'Избор',
 	'Select database' => 'Избор на база данни',
@@ -89,10 +91,10 @@ $translations = array(
 	'Alter database' => 'Промяна на база данни',
 	'Create database' => 'Създаване на база данни',
 	'Database schema' => 'Схема на базата данни',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Постоянна препратка',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -115,7 +117,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиците бяха преместени.',
 	'Copy' => 'Копиране',
 	'Tables have been copied.' => 'Таблиците бяха копирани.',
-	
+
 	'Routines' => 'Процедури',
 	'Routine has been called, %d row(s) affected.' => array('Беше приложена процедура, %d ред е засегнат.', 'Беше приложена процедура, %d редове са засегнати.'),
 	'Call' => 'Прилагане',
@@ -128,7 +130,7 @@ $translations = array(
 	'Alter function' => 'Промяна на функция',
 	'Alter procedure' => 'Промяна на процедура',
 	'Return type' => 'Резултат',
-	
+
 	'Events' => 'Събития',
 	'Event has been dropped.' => 'Събитието беше премахнато.',
 	'Event has been altered.' => 'Събитието беше променено.',
@@ -141,7 +143,7 @@ $translations = array(
 	'Start' => 'Начало',
 	'End' => 'Край',
 	'On completion preserve' => 'Запазване след завършване',
-	
+
 	'Tables' => 'Таблици',
 	'Tables and views' => 'Таблици и изгледи',
 	'Table' => 'Таблица',
@@ -173,12 +175,12 @@ $translations = array(
 	'Move down' => 'Преместване надолу',
 	'Remove' => 'Премахване',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Максималния брой полета е превишен. Моля, увеличете %s.',
-	
+
 	'Partition by' => 'Разделяне на',
 	'Partitions' => 'Раздели',
 	'Partition name' => 'Име на раздела',
 	'Values' => 'Стойности',
-	
+
 	'View' => 'Изглед',
 	'Materialized view' => 'Запаметен изглед',
 	'View has been dropped.' => 'Изгледа беше премахнат.',
@@ -186,14 +188,14 @@ $translations = array(
 	'View has been created.' => 'Изгледа беше създаден.',
 	'Alter view' => 'Промяна на изглед',
 	'Create view' => 'Създаване на изглед',
-	
+
 	'Indexes' => 'Индекси',
 	'Indexes have been altered.' => 'Индексите бяха променени.',
 	'Alter indexes' => 'Промяна на индекси',
 	'Add next' => 'Добавяне на следващ',
 	'Index Type' => 'Вид на индекса',
-	'Column (length)' => 'Колона (дължина)',
-	
+	'length' => 'дължина',
+
 	'Foreign keys' => 'Препратки',
 	'Foreign key' => 'Препратка',
 	'Foreign key has been dropped.' => 'Препратката беше премахната.',
@@ -209,7 +211,7 @@ $translations = array(
 	'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.' => 'Колоните източник и цел трябва да са от еднакъв вид, трябва да има индекс на колоните приемник и да има въведени данни.',
-	
+
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Добавяне на тригер',
 	'Trigger has been dropped.' => 'Тригера беше премахнат.',
@@ -220,7 +222,7 @@ $translations = array(
 	'Time' => 'Време',
 	'Event' => 'Събитие',
 	'Name' => 'Име',
-	
+
 	'select' => 'показване',
 	'Select' => 'Показване',
 	'Select data' => 'Показване на данни',
@@ -246,16 +248,16 @@ $translations = array(
 	'Loading' => 'Зареждане',
 	'Whole result' => 'Пълен резултат',
 	'%d byte(s)' => array('%d байт', '%d байта'),
-	
+
 	'Import' => 'Импорт',
 	'%d row(s) have been imported.' => array('%d ред беше импортиран.', '%d реда бяха импортирани.'),
 	'File must be in UTF-8 encoding.' => 'Файла трябва да е с UTF-8 кодировка.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Промяна',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+щракване в стойността, за да я промените.',
 	'Use edit link to modify this value.' => 'Използвайте "редакция" за промяна на данните.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Елементи%s бяха вмъкнати.',
 	'Item has been deleted.' => 'Елемента беше изтрит.',
@@ -276,14 +278,14 @@ $translations = array(
 	'Clone' => 'Клониране',
 	'Delete' => 'Изтриване',
 	'You have no privileges to update this table.' => 'Нямате праве за обновяване на таблицата.',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'От',
 	'Subject' => 'Тема',
 	'Attachments' => 'Прикачени',
 	'Send' => 'Изпращане',
 	'%d e-mail(s) have been sent.' => array('%d писмо беше изпратено.', '%d писма бяха изпратени.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата и час',
@@ -293,7 +295,7 @@ $translations = array(
 	'Network' => 'Мрежа',
 	'Geometry' => 'Геометрия',
 	'Relations' => 'Зависимости',
-	
+
 	'Editor' => 'Редактор',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -304,11 +306,11 @@ $translations = array(
 	'now' => 'сега',
 	'yes' => 'да',
 	'no' => 'не',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файла вече съществува.',
 	'Please use one of the extensions %s.' => 'Моля, използвайте някое от разширенията %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Промяна на схемата',
 	'Create schema' => 'Създаване на схема',
@@ -317,7 +319,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схемата беше променена.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невалидна схема.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Последователности',
 	'Create sequence' => 'Създаване на последователност',
@@ -325,7 +327,7 @@ $translations = array(
 	'Sequence has been created.' => 'Последователността беше създадена.',
 	'Sequence has been altered.' => 'Последователността беше променена.',
 	'Alter sequence' => 'Промяна на последователност',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Видове потребители',
 	'Create type' => 'Създаване на вид',

adminer/lang/bn.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'লগইন',
 	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'অন ডিলিট',
 	'ON UPDATE' => 'অন আপডেট',
 	'Index Type' => 'সূচী-ধরণ',
-	'Column (length)' => 'কলাম (দৈর্ঘ্য)',
+	'length' => 'দৈর্ঘ্য',
 	'View has been dropped.' => 'ভিউ মুছে ফেলা হয়েছে।',
 	'View has been altered.' => 'ভিউ পরিবর্তন করা হয়েছে।',
 	'View has been created.' => 'ভিউ তৈরী করা হয়েছে।',

adminer/lang/bs.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -182,7 +184,7 @@ $translations = array(
 	'Alter indexes' => 'Ažuriraj indekse',
 	'Add next' => 'Dodaj slijedeći',
 	'Index Type' => 'Tip indeksa',
-	'Column (length)' => 'kolumna (dužina)',
+	'length' => 'dužina',
 
 	'Foreign keys' => 'Strani ključevi',
 	'Foreign key' => 'Strani ključ',

adminer/lang/ca.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipus d\'índex',
-	'Column (length)' => 'Columna (longitud)',
+	'length' => '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.',

adminer/lang/cs.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Systém',
@@ -29,10 +31,10 @@ $translations = array(
 	'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.',
 	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP rozšíření %s',
 	'Refresh' => 'Obnovit',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Oprávnění',
 	'Create user' => 'Vytvořit uživatele',
 	'User has been dropped.' => 'Uživatel byl odstraněn.',
@@ -43,14 +45,14 @@ $translations = array(
 	'Routine' => 'Procedura',
 	'Grant' => 'Povolit',
 	'Revoke' => 'Zakázat',
-	
+
 	'Process list' => 'Seznam procesů',
 	'%d process(es) have been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
 	'Kill' => 'Ukončit',
-	
+
 	'Variables' => 'Proměnné',
 	'Status' => 'Stav',
-	
+
 	'SQL command' => 'SQL příkaz',
 	'%d query(s) executed OK.' => array('%d příkaz proběhl v pořádku.', '%d příkazy proběhly v pořádku.', '%d příkazů proběhlo v pořádku.'),
 	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
@@ -67,7 +69,7 @@ $translations = array(
 	'History' => 'Historie',
 	'Clear' => 'Vyčistit',
 	'Edit all' => 'Upravit vše',
-	
+
 	'File upload' => 'Nahrání souboru',
 	'From server' => 'Ze serveru',
 	'Webserver file %s' => 'Soubor %s na webovém serveru',
@@ -79,14 +81,14 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Příliš velká POST data. Zmenšete data nebo zvyšte hodnotu konfigurační direktivy %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Velký SQL soubor můžete nahrát pomocí FTP a importovat ho ze serveru.',
 	'You are offline.' => 'Jste offline.',
-	
+
 	'Export' => 'Export',
 	'Output' => 'Výstup',
 	'open' => 'otevřít',
 	'save' => 'uložit',
 	'Format' => 'Formát',
 	'Data' => 'Data',
-	
+
 	'Database' => 'Databáze',
 	'DB' => 'DB',
 	'Use' => 'Vybrat',
@@ -100,10 +102,10 @@ $translations = array(
 	'Alter database' => 'Pozměnit databázi',
 	'Create database' => 'Vytvořit databázi',
 	'Database schema' => 'Schéma databáze',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Trvalý odkaz',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -127,7 +129,7 @@ $translations = array(
 	'Copy' => 'Zkopírovat',
 	'Tables have been copied.' => 'Tabulky byly zkopírovány.',
 	'overwrite' => 'přepsat',
-	
+
 	'Routines' => 'Procedury a funkce',
 	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
 	'Call' => 'Zavolat',
@@ -140,7 +142,7 @@ $translations = array(
 	'Alter function' => 'Změnit funkci',
 	'Alter procedure' => 'Změnit proceduru',
 	'Return type' => 'Návratový typ',
-	
+
 	'Events' => 'Události',
 	'Event has been dropped.' => 'Událost byla odstraněna.',
 	'Event has been altered.' => 'Událost byla změněna.',
@@ -153,7 +155,7 @@ $translations = array(
 	'Start' => 'Začátek',
 	'End' => 'Konec',
 	'On completion preserve' => 'Po dokončení zachovat',
-	
+
 	'Tables' => 'Tabulky',
 	'Tables and views' => 'Tabulky a pohledy',
 	'Table' => 'Tabulka',
@@ -186,12 +188,12 @@ $translations = array(
 	'Move down' => 'Přesunout dolů',
 	'Remove' => 'Odebrat',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s.',
-	
+
 	'Partition by' => 'Rozdělit podle',
 	'Partitions' => 'Oddíly',
 	'Partition name' => 'Název oddílu',
 	'Values' => 'Hodnoty',
-	
+
 	'View' => 'Pohled',
 	'Materialized view' => 'Materializovaný pohled',
 	'View has been dropped.' => 'Pohled byl odstraněn.',
@@ -199,14 +201,14 @@ $translations = array(
 	'View has been created.' => 'Pohled byl vytvořen.',
 	'Alter view' => 'Pozměnit pohled',
 	'Create view' => 'Vytvořit pohled',
-	
+
 	'Indexes' => 'Indexy',
 	'Indexes have been altered.' => 'Indexy byly změněny.',
 	'Alter indexes' => 'Pozměnit indexy',
 	'Add next' => 'Přidat další',
 	'Index Type' => 'Typ indexu',
-	'Column (length)' => 'Sloupec (délka)',
-	
+	'length' => 'délka',
+
 	'Foreign keys' => 'Cizí klíče',
 	'Foreign key' => 'Cizí klíč',
 	'Foreign key has been dropped.' => 'Cizí klíč byl odstraněn.',
@@ -222,7 +224,7 @@ $translations = array(
 	'ON DELETE' => 'Při smazání',
 	'ON UPDATE' => 'Při změně',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Zdrojové a cílové sloupce musí mít stejný datový typ, nad cílovými sloupci musí být definován index a odkazovaná data musí existovat.',
-	
+
 	'Triggers' => 'Triggery',
 	'Add trigger' => 'Přidat trigger',
 	'Trigger has been dropped.' => 'Trigger byl odstraněn.',
@@ -233,7 +235,7 @@ $translations = array(
 	'Time' => 'Čas',
 	'Event' => 'Událost',
 	'Name' => 'Název',
-	
+
 	'select' => 'vypsat',
 	'Select' => 'Vypsat',
 	'Select data' => 'Vypsat data',
@@ -259,16 +261,16 @@ $translations = array(
 	'Loading' => 'Načítá se',
 	'Whole result' => 'Celý výsledek',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
-	
+
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
 	'File must be in UTF-8 encoding.' => 'Soubor musí být v kódování UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Změnit',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+klikněte na políčko, které chcete změnit.',
 	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Položka%s byla vložena.',
 	'Item has been deleted.' => 'Položka byla smazána.',
@@ -289,14 +291,14 @@ $translations = array(
 	'Clone' => 'Klonovat',
 	'Delete' => 'Smazat',
 	'You have no privileges to update this table.' => 'Nemáte oprávnění editovat tuto tabulku.',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Odesílatel',
 	'Subject' => 'Předmět',
 	'Attachments' => 'Přílohy',
 	'Send' => 'Odeslat',
 	'%d e-mail(s) have been sent.' => array('Byl odeslán %d e-mail.', 'Byly odeslány %d e-maily.', 'Bylo odesláno %d e-mailů.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Čísla',
 	'Date and time' => 'Datum a čas',
@@ -306,7 +308,7 @@ $translations = array(
 	'Network' => 'Síť',
 	'Geometry' => 'Geometrie',
 	'Relations' => 'Vztahy',
-	
+
 	'Editor' => 'Editor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -317,11 +319,11 @@ $translations = array(
 	'now' => 'teď',
 	'yes' => 'ano',
 	'no' => 'ne',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Soubor existuje.',
 	'Please use one of the extensions %s.' => 'Prosím použijte jednu z koncovek %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Pozměnit schéma',
 	'Create schema' => 'Vytvořit schéma',
@@ -330,7 +332,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schéma bylo změněno.',
 	'Schema' => 'Schéma',
 	'Invalid schema.' => 'Nesprávné schéma.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Vytvořit sekvenci',
@@ -338,11 +340,19 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvence byla vytvořena.',
 	'Sequence has been altered.' => 'Sekvence byla změněna.',
 	'Alter sequence' => 'Pozměnit sekvenci',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Uživatelské typy',
 	'Create type' => 'Vytvořit typ',
 	'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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'System' => 'System',
 	'Server' => 'Server',
@@ -164,7 +166,7 @@ $translations = array(
 	'Alter indexes' => 'Ændre indekser',
 	'Add next' => 'Læg til næste',
 	'Index Type' => 'Indekstype',
-	'Column (length)' => 'Kolonne (længde)',
+	'length' => '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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
@@ -96,7 +98,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index-Typ',
-	'Column (length)' => 'Spalte (Länge)',
+	'length' => 'Länge',
 	'View has been dropped.' => 'View wurde entfernt.',
 	'View has been altered.' => 'View wurde geändert.',
 	'View has been created.' => 'View wurde erstellt.',

adminer/lang/el.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Σύστημα',
@@ -22,10 +24,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Η συνεδρία έληξε, παρακαλώ συνδεθείτε ξανά.',
 	'%s version: %s through PHP extension %s' => '%s έκδοση: %s μέσω επέκτασης PHP %s',
 	'Refresh' => 'Ανανέωση',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Δικαιώματα',
 	'Create user' => 'Δημιουργία Χρήστη',
 	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
@@ -36,14 +38,14 @@ $translations = array(
 	'Routine' => 'Ρουτίνα',
 	'Grant' => 'Παραχώρηση',
 	'Revoke' => 'Ανάκληση',
-	
+
 	'Process list' => 'Λίστα διεργασιών',
 	'%d process(es) have been killed.' => array('Τερματίστηκε %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
 	'Kill' => 'Τερματισμός',
-	
+
 	'Variables' => 'Μεταβλητές',
 	'Status' => 'Κατάσταση',
-	
+
 	'SQL command' => 'Εντολή SQL',
 	'%d query(s) executed OK.' => array('Το ερώτημα %d εκτελέστηκε ΟΚ.', 'Τα ερώτηματα %d εκτελέστηκαν ΟΚ.'),
 	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκαν %d σειρές.'),
@@ -57,7 +59,7 @@ $translations = array(
 	'History' => 'Ιστορικό',
 	'Clear' => 'Καθαρισμός',
 	'Edit all' => 'Επεξεργασία όλων',
-	
+
 	'File upload' => 'Μεταφόρτωση αρχείου',
 	'From server' => 'Από διακομιστή',
 	'Webserver file %s' => 'Αρχείο %s από διακομιστή web',
@@ -69,7 +71,7 @@ $translations = array(
 	'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 are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
-	
+
 	'Export' => 'Εξαγωγή',
 	'Output' => 'Αποτέλεσμα',
 	'open' => 'άνοιγμα',
@@ -77,7 +79,7 @@ $translations = array(
 	'Saving' => 'Γίνεται Αποθήκευση',
 	'Format' => 'Μορφή',
 	'Data' => 'Δεδομένα',
-	
+
 	'Database' => 'Β. Δεδομένων',
 	'Use' => 'χρήση',
 	'Select database' => 'Επιλέξτε Β.Δ.',
@@ -90,10 +92,10 @@ $translations = array(
 	'Alter database' => 'Τροποποίηση Β.Δ.',
 	'Create database' => 'Δημιουργία Β.Δ.',
 	'Database schema' => 'Σχήμα Β.Δ.',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Μόνιμος Σύνδεσμος',
-	
+
 	// thousands separator - must contain single byte
 	',' => '.',
 	'0123456789' => '0123456789',
@@ -116,7 +118,7 @@ $translations = array(
 	'Tables have been moved.' => 'Οι πίνακες μεταφέρθηκαν.',
 	'Copy' => 'Αντιγραφή',
 	'Tables have been copied.' => 'Οι πίνακες αντιγράφηκαν.',
-	
+
 	'Routines' => 'Ρουτίνες',
 	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επηρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επηρεάστηκαν %d σειρές.'),
 	'Call' => 'Εκτέλεση',
@@ -129,7 +131,7 @@ $translations = array(
 	'Alter function' => 'Τροποποίηση λειτουργίας',
 	'Alter procedure' => 'Τροποποίηση διαδικασίας',
 	'Return type' => 'Επιστρεφόμενος τύπος',
-	
+
 	'Events' => 'Γεγονός',
 	'Event has been dropped.' => 'Το γεγονός διαγράφηκε.',
 	'Event has been altered.' => 'Το γεγονός τροποποιήθηκε.',
@@ -142,7 +144,7 @@ $translations = array(
 	'Start' => 'Έναρξη',
 	'End' => 'Λήξη',
 	'On completion preserve' => 'Κατά την ολοκλήρωση διατήρησε',
-	
+
 	'Tables' => 'Πίνακες',
 	'Tables and views' => 'Πίνακες και Προβολές',
 	'Table' => 'Πίνακας',
@@ -174,12 +176,12 @@ $translations = array(
 	'Move down' => 'Μετακίνηση προς τα κάτω',
 	'Remove' => 'Αφαίρεση',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Υπέρβαση μέγιστου επιτρεπόμενου αριθμού πεδίων. Παρακαλώ αυξήστε %s.',
-	
+
 	'Partition by' => 'Τμηματοποίηση ανά',
 	'Partitions' => 'Τμήματα',
 	'Partition name' => 'Όνομα Τμήματος',
 	'Values' => 'Τιμές',
-	
+
 	'View' => 'Προβολή',
 	'Materialized view' => 'Υλοποιημένη προβολή',
 	'View has been dropped.' => 'Η προβολή διαγράφηκε.',
@@ -187,14 +189,14 @@ $translations = array(
 	'View has been created.' => 'Η προβολή δημιουργήθηκε.',
 	'Alter view' => 'Τροποποίηση προβολής',
 	'Create view' => 'Δημιουργία προβολής',
-	
+
 	'Indexes' => 'Δείκτες',
 	'Indexes have been altered.' => 'Οι δείκτες τροποποιήθηκαν.',
 	'Alter indexes' => 'Τροποποίηση δεικτών',
 	'Add next' => 'Προσθήκη επόμενου',
 	'Index Type' => 'Τύπος δείκτη',
-	'Column (length)' => 'Στήλη (μήκος)',
-	
+	'length' => 'μήκος',
+
 	'Foreign keys' => 'Εξαρτημένα κλειδιά',
 	'Foreign key' => 'Εξαρτημένο κλειδί',
 	'Foreign key has been dropped.' => 'Το εξαρτημένο κλειδί διαγράφηκε.',
@@ -210,7 +212,7 @@ $translations = array(
 	'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.' => 'Οι στήλες στην πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
-	
+
 	'Triggers' => 'Εναύσματα',
 	'Add trigger' => 'Προσθήκη εναύσματος',
 	'Trigger has been dropped.' => 'Το έναυσμα διαγράφηκε.',
@@ -221,7 +223,7 @@ $translations = array(
 	'Time' => 'Ώρα',
 	'Event' => 'Γεγονός',
 	'Name' => 'Όνομα',
-	
+
 	'select' => 'επιλογή',
 	'Select' => 'Επιλογή',
 	'Select data' => 'Επιλέξτε δεδομένα',
@@ -247,16 +249,16 @@ $translations = array(
 	'Loading' => 'Φορτώνει',
 	'Whole result' => 'Όλο το αποτέλεσμα',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
-	
+
 	'Import' => 'Εισαγωγή',
 	'%d row(s) have been imported.' => array('$d σειρά εισήχθη.', '%d σειρές εισήχθησαν.'),
 	'File must be in UTF-8 encoding.' => 'Το αρχείο πρέπει να έχει κωδικοποίηση UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Τροποποίηση',
 	'Ctrl+click on a value to modify it.' => 'Πιέστε Ctrl+click σε μια τιμή για να την τροποποιήσετε.',
 	'Use edit link to modify this value.' => 'Χρησιμοποιήστε το σύνδεσμο επεξεργασία για να τροποποιήσετε την τιμή.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Η εγγραφή%s εισήχθη.',
 	'Item has been deleted.' => 'Η εγγραφή διαγράφηκε.',
@@ -276,14 +278,14 @@ $translations = array(
 	'Clone' => 'Κλωνοποίηση',
 	'Delete' => 'Διαγραφή',
 	'You have no privileges to update this table.' => 'Δεν έχετε δικαίωμα να τροποποιήσετε αυτό τον πίνακα.',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Από',
 	'Subject' => 'Θέμα',
 	'Attachments' => 'Συνημμένα',
 	'Send' => 'Αποστολή',
 	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλη.', '%d e-mail απεστάλησαν.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Αριθμοί',
 	'Date and time' => 'Ημερομηνία και ώρα',
@@ -293,7 +295,7 @@ $translations = array(
 	'Network' => 'Δίκτυο',
 	'Geometry' => 'Γεωμετρία',
 	'Relations' => 'Συσχετήσεις',
-	
+
 	'Editor' => 'Επεξεργαστής',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5/$3/$1',
@@ -304,11 +306,11 @@ $translations = array(
 	'now' => 'τώρα',
 	'yes' => 'ναι',
 	'no' => 'όχι',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Το αρχείο υπάρχει.',
 	'Please use one of the extensions %s.' => 'Παρακαλώ χρησιμοποιείστε μια από τις επεκτάσεις %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Τροποποίηση σχήματος',
 	'Create schema' => 'Δημιουργία σχήματος',
@@ -317,7 +319,7 @@ $translations = array(
 	'Schema has been altered.' => 'Το σχήμα τροποποιήθηκε.',
 	'Schema' => 'Σχήμα',
 	'Invalid schema.' => 'Άκυρο σχήμα.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Αλληλουχία',
 	'Create sequence' => 'Δημιουργία αλληλουχίας',
@@ -325,7 +327,7 @@ $translations = array(
 	'Sequence has been created.' => 'Η αλληλουχία δημιουργήθηκε.',
 	'Sequence has been altered.' => 'Η αλληλουχία τροποποιήθηκε.',
 	'Alter sequence' => 'Τροποποίηση αλληλουχίας',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Τύποι χρήστη',
 	'Create type' => 'Δημιουργία τύπου',

adminer/lang/en.inc.php

@@ -1,4 +1,6 @@
 <?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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'AL BORRAR',
 	'ON UPDATE' => 'AL ACTUALIZAR',
 	'Index Type' => 'Tipo de índice',
-	'Column (length)' => 'Columna (longitud)',
+	'length' => '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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Indeksi tüüp',
-	'Column (length)' => 'Veerg (pikkus)',
+	'length' => '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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'سیستم',
@@ -21,10 +23,10 @@ $translations = array(
 	'Session expired, please login again.' => 'نشست پایان یافته، لطفا دوباره وارد شوید.',
 	'%s version: %s through PHP extension %s' => 'نسخه %s : %s توسعه پی اچ پی %s',
 	'Refresh' => 'بازیابی',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'rtl',
-	
+
 	'Privileges' => 'امتیازات',
 	'Create user' => 'ایجاد کاربر',
 	'User has been dropped.' => 'کاربر حذف شد.',
@@ -35,14 +37,14 @@ $translations = array(
 	'Routine' => 'روتین',
 	'Grant' => 'اعطا',
 	'Revoke' => 'لغو کردن',
-	
+
 	'Process list' => 'لیست فرآیند',
 	'%d process(es) have been killed.' => '%d فرآیند متوقف شد.',
 	'Kill' => 'حذف فرآیند',
-	
+
 	'Variables' => 'متغیرها',
 	'Status' => 'وضعیت',
-	
+
 	'SQL command' => 'دستور SQL',
 	'%d query(s) executed OK.' => '%d کوئری اجرا شد.',
 	'Query executed OK, %d row(s) affected.' => 'کوئری اجرا شد. %d سطر تغیر کرد.',
@@ -56,7 +58,7 @@ $translations = array(
 	'History' => 'تاریخ',
 	'Clear' => 'پاک کردن',
 	'Edit all' => 'ویرایش همه',
-	
+
 	'File upload' => 'بارگذاری فایل',
 	'From server' => 'از سرور',
 	'Webserver file %s' => '%s فایل وب سرور',
@@ -75,7 +77,7 @@ $translations = array(
 	'save' => 'ذخیره',
 	'Format' => 'حذف',
 	'Data' => 'داده',
-	
+
 	'Database' => 'پایگاه داده',
 	'Use' => 'استفاده',
 	'Select database' => 'انتخاب پایگاه داده',
@@ -88,10 +90,10 @@ $translations = array(
 	'Alter database' => 'ویرایش پایگاه داده',
 	'Create database' => 'ایجاد پایگاه داده',
 	'Database schema' => 'ساختار پایگاه داده',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'ارتباط دائم',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '۰۱۲۳۴۵۶۷۸۹',
@@ -114,7 +116,7 @@ $translations = array(
 	'Tables have been moved.' => 'جدولها انتقال داده شدند.',
 	'Copy' => 'کپی کردن',
 	'Tables have been copied.' => 'جدولها کپی شدند.',
-	
+
 	'Routines' => 'روالها',
 	'Routine has been called, %d row(s) affected.' => array('روال فراخوانی شد %d سطر متاثر شد.', 'روال فراخوانی شد %d سطر متاثر شد.'),
 	'Call' => 'صدا زدن',
@@ -127,7 +129,7 @@ $translations = array(
 	'Alter function' => 'ویرایش تابع',
 	'Alter procedure' => 'ویرایش زیربرنامه',
 	'Return type' => 'برگرداندن نوع',
-	
+
 	'Events' => 'رویدادها',
 	'Event has been dropped.' => 'رویداد حذف شد.',
 	'Event has been altered.' => 'رویداد ویرایش شد.',
@@ -140,7 +142,7 @@ $translations = array(
 	'Start' => 'آغاز',
 	'End' => 'پایان',
 	'On completion preserve' => 'تکمیل حفاظت فعال است',
-	
+
 	'Tables' => 'جدولها',
 	'Tables and views' => 'جدولها و نمایه ها',
 	'Table' => 'جدول',
@@ -172,12 +174,12 @@ $translations = array(
 	'Move down' => 'انتقال به پایین',
 	'Remove' => 'حذف',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر تعداد فیلدهای مجاز اشباع شد. لطفا %s را افزایش دهید.',
-	
+
 	'Partition by' => 'بخشبندی توسط',
 	'Partitions' => 'بخشبندیها',
 	'Partition name' => 'نام بخش',
 	'Values' => 'مقادیر',
-	
+
 	'View' => 'نمایش',
 	'Materialized view' => 'نمایه مادی',
 	'View has been dropped.' => 'نمایش حذف شد.',
@@ -185,14 +187,14 @@ $translations = array(
 	'View has been created.' => 'نمایش ایجاد شد.',
 	'Alter view' => 'حذف نمایش',
 	'Create view' => 'ایجاد نمایش',
-	
+
 	'Indexes' => 'ایندکسها',
 	'Indexes have been altered.' => 'ایندکسها ویرایش شدند.',
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
-	'Column (length)' => 'ستون (طول)',
-	
+	'length' => 'طول',
+
 	'Foreign keys' => 'کلیدهای خارجی',
 	'Foreign key' => 'کلید خارجی',
 	'Foreign key has been dropped.' => 'کلید خارجی حذف شد.',
@@ -208,7 +210,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => '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.' => 'داده مبدا و مقصد ستونها بایستی شبیه هم باشند.',
-	
+
 	'Triggers' => 'تریگرها',
 	'Add trigger' => 'افزودن تریگر',
 	'Trigger has been dropped.' => 'تریگر حذف شد.',
@@ -219,7 +221,7 @@ $translations = array(
 	'Time' => 'زمان',
 	'Event' => 'رویداد',
 	'Name' => 'نام',
-	
+
 	'select' => 'انتخاب',
 	'Select' => 'انتخاب',
 	'Select data' => 'انتخاب داده',
@@ -245,16 +247,16 @@ $translations = array(
 	'Loading' => 'در حال بارگزاری',
 	'Whole result' => 'همه نتایج',
 	'%d byte(s)' => array('%d بایت', '%d بایت'),
-	
+
 	'Import' => 'وارد کردن',
 	'%d row(s) have been imported.' => array('%d سطر وارد شد.', '%d سطر وارد شد.'),
 	'File must be in UTF-8 encoding.' => 'فرمت فایل باید UTF-8 باشید.',
-	
+
 	// in-place editing in select
 	'Modify' => 'ویرایش',
 	'Ctrl+click on a value to modify it.' => 'برای ویرایش بر روی مقدار ctrl+click کنید.',
 	'Use edit link to modify this value.' => 'از لینک ویرایش برای ویرایش این مقدار استفاده کنید.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '%s آیتم درج شد.',
 	'Item has been deleted.' => 'آیتم حذف شد.',
@@ -274,14 +276,14 @@ $translations = array(
 	'Clone' => 'تکثیر',
 	'Delete' => 'حذف',
 	'You have no privileges to update this table.' => 'شما اختیار ویرایش این جدول را ندارید.',
-	
+
 	'E-mail' => 'پست الکترونیک',
 	'From' => 'فرستنده',
 	'Subject' => 'موضوع',
 	'Attachments' => 'پیوست ها',
 	'Send' => 'ارسال',
 	'%d e-mail(s) have been sent.' => array('%d ایمیل ارسال شد.', '%d ایمیل ارسال شد.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'اعداد',
 	'Date and time' => 'تاریخ و زمان',
@@ -291,7 +293,7 @@ $translations = array(
 	'Network' => 'شبکه',
 	'Geometry' => 'هندسه',
 	'Relations' => 'رابطه ها',
-	
+
 	'Editor' => 'ویرایشگر',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -306,7 +308,7 @@ $translations = array(
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'فایل موجود است.',
 	'Please use one of the extensions %s.' => 'لطفا یکی از پسوندها را انتخاب نمائید %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'ویرایش ساختار',
 	'Create schema' => 'ایجاد ساختار',
@@ -315,7 +317,7 @@ $translations = array(
 	'Schema has been altered.' => 'ساختار ویرایش شد.',
 	'Schema' => 'ساختار',
 	'Invalid schema.' => 'ساختار نامعتبر.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'صف ها',
 	'Create sequence' => 'ایجاد صف',
@@ -323,7 +325,7 @@ $translations = array(
 	'Sequence has been created.' => 'صف ایجاد شد.',
 	'Sequence has been altered.' => 'صف ویرایش شد.',
 	'Alter sequence' => 'ویرایش صف',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'انواع کاربر',
 	'Create type' => 'ایجاد نوع',

adminer/lang/fi.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Järjestelmä',
@@ -22,10 +24,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Istunto vanhentunut, kirjaudu uudelleen.',
 	'%s version: %s through PHP extension %s' => '%s versio: %s PHP-laajennuksella %s',
 	'Refresh' => 'Virkistä',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Oikeudet',
 	'Create user' => 'Luo käyttäjä',
 	'User has been dropped.' => 'Käyttäjä poistettiin.',
@@ -36,14 +38,14 @@ $translations = array(
 	'Routine' => 'Rutiini',
 	'Grant' => 'Myönnä',
 	'Revoke' => 'Kiellä',
-	
+
 	'Process list' => 'Prosessilista',
 	'%d process(es) have been killed.' => array('%d prosessi lopetettu.', '%d prosessia lopetettu..'),
 	'Kill' => 'Lopeta',
-	
+
 	'Variables' => 'Muuttujat',
 	'Status' => 'Tila',
-	
+
 	'SQL command' => 'SQL-komento',
 	'%d query(s) executed OK.' => array('%d kysely onnistui.', '%d kyselyä onnistui.'),
 	'Query executed OK, %d row(s) affected.' => array('Kysely onnistui, kohdistui %d riviin.', 'Kysely onnistui, kohdistui %d riviin.'),
@@ -57,7 +59,7 @@ $translations = array(
 	'History' => 'Historia',
 	'Clear' => 'Tyhjennä',
 	'Edit all' => 'Muokkaa kaikkia',
-	
+
 	'File upload' => 'Tiedoston lataus palvelimelle',
 	'From server' => 'Verkkopalvelimella Adminer-kansiossa oleva tiedosto',
 	'Webserver file %s' => 'Verkkopalvelintiedosto %s',
@@ -69,7 +71,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Liian suuri POST-datamäärä. Pienennä dataa tai kasvata arvoa %s konfigurointitiedostossa.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Voit ladata suuren SQL-tiedoston FTP:n kautta ja tuoda sen sitten palvelimelta.',
 	'You are offline.' => 'Olet offline-tilassa.',
-	
+
 	'Export' => 'Vienti',
 	'Output' => 'Tulos',
 	'open' => 'avaa',
@@ -77,7 +79,7 @@ $translations = array(
 	'Saving' => 'Tallennetaan',
 	'Format' => 'Muoto',
 	'Data' => 'Data',
-	
+
 	'Database' => 'Tietokanta',
 	'Use' => 'Käytä',
 	'Select database' => 'Valitse tietokanta',
@@ -90,10 +92,10 @@ $translations = array(
 	'Alter database' => 'Muuta tietokantaa',
 	'Create database' => 'Luo tietokanta',
 	'Database schema' => 'Tietokantakaava',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Pysyvä linkki',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -116,7 +118,7 @@ $translations = array(
 	'Tables have been moved.' => 'Taulut on siirretty.',
 	'Copy' => 'Kopioi',
 	'Tables have been copied.' => 'Taulut on kopioitu.',
-	
+
 	'Routines' => 'Rutiinit',
 	'Routine has been called, %d row(s) affected.' => array('Rutiini kutsuttu, kohdistui %d riviin.', 'Rutiini kutsuttu, kohdistui %d riviin.'),
 	'Call' => 'Kutsua',
@@ -129,7 +131,7 @@ $translations = array(
 	'Alter function' => 'Muuta funktiota',
 	'Alter procedure' => 'Muuta proseduuria',
 	'Return type' => 'Palautustyyppi',
-	
+
 	'Events' => 'Tapahtumat',
 	'Event has been dropped.' => 'Tapahtuma on poistettu.',
 	'Event has been altered.' => 'Tapahtumaa on muutettu.',
@@ -142,7 +144,7 @@ $translations = array(
 	'Start' => 'Aloitus',
 	'End' => 'Lopetus',
 	'On completion preserve' => 'Säilytä, kun valmis',
-	
+
 	'Tables' => 'Taulut',
 	'Tables and views' => 'Taulut ja näkymät',
 	'Table' => 'Taulu',
@@ -174,12 +176,12 @@ $translations = array(
 	'Move down' => 'Siirrä alas',
 	'Remove' => 'Poista',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Kenttien sallittu enimmäismäärä ylitetty. Kasvata arvoa %s.',
-	
+
 	'Partition by' => 'Osioi arvolla',
 	'Partitions' => 'Osiot',
 	'Partition name' => 'Osion nimi',
 	'Values' => 'Arvot',
-	
+
 	'View' => 'Näkymä',
 	'Materialized view' => 'Materialisoitunut näkymä',
 	'View has been dropped.' => 'Näkymä on poistettu.',
@@ -187,14 +189,14 @@ $translations = array(
 	'View has been created.' => 'Näkymä on luotu.',
 	'Alter view' => 'Muuta näkymää',
 	'Create view' => 'Luo näkymä',
-	
+
 	'Indexes' => 'Indeksit',
 	'Indexes have been altered.' => 'Indeksejä on muutettu.',
 	'Alter indexes' => 'Muuta indeksejä',
 	'Add next' => 'Lisää seuraava',
 	'Index Type' => 'Indeksityyppi',
-	'Column (length)' => 'Sarake (pituus)',
-	
+	'length' => 'pituus',
+
 	'Foreign keys' => 'Vieraat avaimet',
 	'Foreign key' => 'Vieras avain',
 	'Foreign key has been dropped.' => 'Vieras avain on poistettu.',
@@ -210,7 +212,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => '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.' => 'Lähde- ja kohdesarakkeiden tulee olla samaa tietotyyppiä, kohdesarakkeisiin tulee olla indeksi ja dataa, johon viitataan, täytyy olla.',
-	
+
 	'Triggers' => 'Liipaisimet',
 	'Add trigger' => 'Lisää liipaisin',
 	'Trigger has been dropped.' => 'Liipaisin on poistettu.',
@@ -221,7 +223,7 @@ $translations = array(
 	'Time' => 'Aika',
 	'Event' => 'Tapahtuma',
 	'Name' => 'Nimi',
-	
+
 	'select' => 'valitse',
 	'Select' => 'Valitse',
 	'Select data' => 'Valitse data',
@@ -247,16 +249,16 @@ $translations = array(
 	'Loading' => 'Ladataan',
 	'Whole result' => 'Koko tulos',
 	'%d byte(s)' => array('%d tavu', '%d tavua'),
-	
+
 	'Import' => 'Tuonti',
 	'%d row(s) have been imported.' => array('%d rivi tuotiin.', '%d riviä tuotiin.'),
 	'File must be in UTF-8 encoding.' => 'Tiedoston täytyy olla UTF-8-muodossa.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Muuta',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+napsauta arvoa muuttaaksesi.',
 	'Use edit link to modify this value.' => 'Käytä muokkaa-linkkiä muuttaaksesi tätä arvoa.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Tietue%s lisättiin.',
 	'Item has been deleted.' => 'Tietue poistettiin.',
@@ -276,14 +278,14 @@ $translations = array(
 	'Clone' => 'Kloonaa',
 	'Delete' => 'Poista',
 	'You have no privileges to update this table.' => 'Sinulla ei ole oikeutta päivittää tätä taulua.',
-	
+
 	'E-mail' => 'S-posti',
 	'From' => 'Lähettäjä',
 	'Subject' => 'Aihe',
 	'Attachments' => 'Liitteet',
 	'Send' => 'Lähetä',
 	'%d e-mail(s) have been sent.' => array('% sähköpostiviestiä lähetetty.', '% sähköpostiviestiä lähetetty.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Numerot',
 	'Date and time' => 'Päiväys ja aika',
@@ -293,7 +295,7 @@ $translations = array(
 	'Network' => 'Verkko',
 	'Geometry' => 'Geometria',
 	'Relations' => 'Suhteet',
-	
+
 	'Editor' => 'Editori',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5.$3.$1',
@@ -304,11 +306,11 @@ $translations = array(
 	'now' => 'nyt',
 	'yes' => 'kyllä',
 	'no' => 'ei',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Tiedosto on olemassa.',
 	'Please use one of the extensions %s.' => 'Käytä jotain %s-laajennuksista.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Muuta kaavaa',
 	'Create schema' => 'Luo kaava',
@@ -317,7 +319,7 @@ $translations = array(
 	'Schema has been altered.' => 'Kaavaa muutettiin.',
 	'Schema' => 'Kaava',
 	'Invalid schema.' => 'Kaava ei kelpaa.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvenssit',
 	'Create sequence' => 'Luo sekvenssi',
@@ -325,7 +327,7 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvenssi on luotu.',
 	'Sequence has been altered.' => 'Sekvenssiä on muutettu.',
 	'Alter sequence' => 'Muuta sekvenssiä',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Käyttäjän tyypit',
 	'Create type' => 'Luo tyyppi',

adminer/lang/fr.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
@@ -93,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Type d\'index',
-	'Column (length)' => 'Colonne (longueur)',
+	'length' => '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.',

adminer/lang/gl.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Conectar',
 	'Logout successful.' => 'Pechouse a sesión con éxito.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'AO BORRAR (ON DELETE)',
 	'ON UPDATE' => 'AO ACTUALIZAR (ON UPDATE)',
 	'Index Type' => 'Tipo de índice',
-	'Column (length)' => 'Columna (lonxitude)',
+	'length' => 'lonxitude',
 	'View has been dropped.' => 'Eliminouse a vista.',
 	'View has been altered.' => 'Modificouse a vista.',
 	'View has been created.' => 'Creouse a vista.',

adminer/lang/he.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
@@ -93,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'בעת מחיקה',
 	'ON UPDATE' => 'בעת עידכון',
 	'Index Type' => 'סוג אינדקס',
-	'Column (length)' => 'עמודה (אורך)',
+	'length' => 'אורך',
 	'View has been dropped.' => 'התצוגה הושלכה',
 	'View has been altered.' => 'התצוגה שונתה',
 	'View has been created.' => 'התצוגה נוצרה',

adminer/lang/hu.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Belépés',
 	'Logout successful.' => 'Sikeres kilépés.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'törléskor',
 	'ON UPDATE' => 'frissítéskor',
 	'Index Type' => 'Index típusa',
-	'Column (length)' => 'Oszop (méret)',
+	'length' => '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.',

adminer/lang/id.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -182,7 +184,7 @@ $translations = array(
 	'Alter indexes' => 'Ubah indeks',
 	'Add next' => 'Tambah setelahnya',
 	'Index Type' => 'Jenis Indeks',
-	'Column (length)' => 'Kolom (panjang)',
+	'length' => 'panjang',
 
 	'Foreign keys' => 'Kunci asing',
 	'Foreign key' => 'Kunci asing',

adminer/lang/it.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Autenticazione',
 	'Logout successful.' => 'Uscita effettuata con successo.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo indice',
-	'Column (length)' => 'Colonna (lunghezza)',
+	'length' => 'lunghezza',
 	'View has been dropped.' => 'Vista eliminata.',
 	'View has been altered.' => 'Vista modificata.',
 	'View has been created.' => 'Vista creata.',

adminer/lang/ja.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
@@ -94,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => '索引の型',
-	'Column (length)' => '列（長さ）',
+	'length' => '長さ',
 	'View has been dropped.' => 'ビューを削除しました',
 	'View has been altered.' => 'ビューを変更しました',
 	'View has been created.' => 'ビューを作成しました',

adminer/lang/ka.inc.php

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

adminer/lang/ko.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'$1-$3-$5' => '$1-$3-$5',
 	'%.3f s' => '%.3f 초',
@@ -46,7 +48,7 @@ $translations = array(
 	'Clone' => '복제',
 	'collation' => '정렬',
 	'Collation' => '정렬',
-	'Column (length)' => '열 (길이)',
+	'length' => '길이',
 	'Column name' => '열 이름',
 	'Column' => '열',
 	'Comment' => '주석',

adminer/lang/lt.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistema',
@@ -19,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Sesijos galiojimas baigėsi. Prisijunkite iš naujo.',
 	'%s version: %s through PHP extension %s' => '%s versija: %s per PHP plėtinį %s',
 	'Refresh' => 'Atnaujinti',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Privilegijos',
 	'Create user' => 'Sukurti vartotoją',
 	'User has been dropped.' => 'Vartotojas ištrintas.',
@@ -33,14 +35,14 @@ $translations = array(
 	'Routine' => 'Procedūra',
 	'Grant' => 'Suteikti',
 	'Revoke' => 'Atšaukti',
-	
+
 	'Process list' => 'Procesų sąrašas',
 	'%d process(es) have been killed.' => array('%d procesas nutrauktas.', '%d procesai nutraukti.', '%d procesų nutraukta.'),
 	'Kill' => 'Nutraukti',
-	
+
 	'Variables' => 'Kintamieji',
 	'Status' => 'Būsena',
-	
+
 	'SQL command' => 'SQL užklausa',
 	'%d query(s) executed OK.' => array('%d užklausa įvykdyta.', '%d užklausos įvykdytos.', '%d užklausų įvykdyta.'),
 	'Query executed OK, %d row(s) affected.' => array('Užklausa įvykdyta. Pakeistas %d įrašas.', 'Užklausa įvykdyta. Pakeisti %d įrašai.', 'Užklausa įvykdyta. Pakeista %d įrašų.'),
@@ -54,7 +56,7 @@ $translations = array(
 	'History' => 'Istorija',
 	'Clear' => 'Išvalyti',
 	'Edit all' => 'Redaguoti visus',
-	
+
 	'File upload' => 'Failo įkėlimas',
 	'From server' => 'Iš serverio',
 	'Webserver file %s' => 'Failas %s iš serverio',
@@ -64,14 +66,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Nepavyko įkelti failo.',
 	'Maximum allowed file size is %sB.' => 'Maksimalus failo dydis - %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Per daug POST duomenų. Sumažinkite duomenų kiekį arba padidinkite konfigūracijos nustatymą %s.',
-	
+
 	'Export' => 'Eksportas',
 	'Output' => 'Išvestis',
 	'open' => 'atidaryti',
 	'save' => 'išsaugoti',
 	'Format' => 'Formatas',
 	'Data' => 'Duomenys',
-	
+
 	'Database' => 'Duomenų bazė',
 	'Use' => 'Naudoti',
 	'Select database' => 'Pasirinkti duomenų bazę',
@@ -84,10 +86,10 @@ $translations = array(
 	'Alter database' => 'Redaguoti duomenų bazę',
 	'Create database' => 'Sukurti duomenų bazę',
 	'Database schema' => 'Duomenų bazės schema',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Pastovi nuoroda',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -109,7 +111,7 @@ $translations = array(
 	'Tables have been moved.' => 'Lentelės perkeltos.',
 	'Copy' => 'Kopijuoti',
 	'Tables have been copied.' => 'Lentelės nukopijuotos.',
-	
+
 	'Routines' => 'Procedūros',
 	'Routine has been called, %d row(s) affected.' => array('Procedūra įvykdyta. %d įrašas pakeistas.', 'Procedūra įvykdyta. %d įrašai pakeisti.', 'Procedūra įvykdyta. %d įrašų pakeista.'),
 	'Call' => 'Vykdyti',
@@ -122,7 +124,7 @@ $translations = array(
 	'Alter function' => 'Keisti funkciją',
 	'Alter procedure' => 'Keiskti procedūrą',
 	'Return type' => 'Grąžinimo tipas',
-	
+
 	'Events' => 'Įvykiai',
 	'Event has been dropped.' => 'Įvykis pašalintas.',
 	'Event has been altered.' => 'Įvykis pakeistas.',
@@ -135,7 +137,7 @@ $translations = array(
 	'Start' => 'Pradžia',
 	'End' => 'Pabaiga',
 	'On completion preserve' => 'Įvykdžius išsaugoti',
-	
+
 	'Tables' => 'Lentelės',
 	'Tables and views' => 'Lentelės ir vaizdai',
 	'Table' => 'Lentelė',
@@ -163,26 +165,26 @@ $translations = array(
 	'Move down' => 'Perkelti žemyn',
 	'Remove' => 'Pašalinti',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s.',
-	
+
 	'Partition by' => 'Skirstyti pagal',
 	'Partitions' => 'Skirsniai',
 	'Partition name' => 'Skirsnio pavadinimas',
 	'Values' => 'Reikšmės',
-	
+
 	'View' => 'Vaizdas',
 	'View has been dropped.' => 'Vaizdas pašalintas.',
 	'View has been altered.' => 'Vaizdas pakeistas.',
 	'View has been created.' => 'Vaizdas sukurtas.',
 	'Alter view' => 'Redaguoti vaizdą',
 	'Create view' => 'Sukurti vaizdą',
-	
+
 	'Indexes' => 'Indeksai',
 	'Indexes have been altered.' => 'Indeksai pakeisti.',
 	'Alter indexes' => 'Redaguoti indeksus',
 	'Add next' => 'Pridėti kitą',
 	'Index Type' => 'Indekso tipas',
-	'Column (length)' => 'Stulpelis (ilgis)',
-	
+	'length' => 'ilgis',
+
 	'Foreign keys' => 'Išoriniai raktai',
 	'Foreign key' => 'Išorinis raktas',
 	'Foreign key has been dropped.' => 'Išorinis raktas pašalintas.',
@@ -198,7 +200,7 @@ $translations = array(
 	'ON DELETE' => 'Ištrinant',
 	'ON UPDATE' => 'Atnaujinant',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Šaltinio ir tikslinis stulpelis turi būti to paties tipo, tiksliniame stulpelyje turi būti naudojamas indeksas ir duomenys turi egzistuoti.',
-	
+
 	'Triggers' => 'Trigeriai',
 	'Add trigger' => 'Pridėti trigerį',
 	'Trigger has been dropped.' => 'Trigeris pašalintas.',
@@ -209,7 +211,7 @@ $translations = array(
 	'Time' => 'Laikas',
 	'Event' => 'Įvykis',
 	'Name' => 'Pavadinimas',
-	
+
 	'select' => 'atrinkti',
 	'Select' => 'Atrinkti',
 	'Select data' => 'Atrinkti duomenis',
@@ -230,13 +232,13 @@ $translations = array(
 	'last' => 'paskutinis',
 	'Whole result' => 'Visas rezultatas',
 	'%d byte(s)' => array('%d baitas', '%d baigai', '%d baitų'),
-	
+
 	'Import' => 'Importas',
 	'%d row(s) have been imported.' => array('%d įrašas įkelta.', '%d įrašai įkelti.', '%d įrašų įkelta.'),
-	
+
 	// in-place editing in select
 	'Use edit link to modify this value.' => 'Norėdami redaguoti reikšmę naudokite redagavimo nuorodą.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Įrašas%s sukurtas.',
 	'Item has been deleted.' => 'Įrašas ištrintas.',
@@ -254,14 +256,14 @@ $translations = array(
 	'Save and insert next' => 'Išsaugoti ir įrašyti kitą',
 	'Clone' => 'Klonuoti',
 	'Delete' => 'Trinti',
-	
+
 	'E-mail' => 'El. paštas',
 	'From' => 'Nuo',
 	'Subject' => 'Antraštė',
 	'Attachments' => 'Priedai',
 	'Send' => 'Siųsti',
 	'%d e-mail(s) have been sent.' => array('Išsiųstas %d laiškas.', 'Išsiųsti %d laiškai.', 'Išsiųsta %d laiškų.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Skaičiai',
 	'Date and time' => 'Data ir laikas',
@@ -271,7 +273,7 @@ $translations = array(
 	'Network' => 'Tinklas',
 	'Geometry' => 'Geometrija',
 	'Relations' => 'Ryšiai',
-	
+
 	'Editor' => 'Redaktorius',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -280,11 +282,11 @@ $translations = array(
 	// hint for time format - use language equivalents for hour, minute and second shortcuts
 	'HH:MM:SS' => 'HH:MM:SS',
 	'now' => 'dabar',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Failas egzistuoja.',
 	'Please use one of the extensions %s.' => 'Naudokite vieną iš plėtinių %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Keisti schemą',
 	'Create schema' => 'Sukurti schemą',
@@ -293,7 +295,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schema pakeista.',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Neteisinga schema.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekos',
 	'Create sequence' => 'Sukurti seką',
@@ -301,7 +303,7 @@ $translations = array(
 	'Sequence has been created.' => 'Seka sukurta.',
 	'Sequence has been altered.' => 'Seka pakeista.',
 	'Alter sequence' => 'Keisti seką',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Vartotojų tipai',
 	'Create type' => 'Sukurti tipą',

adminer/lang/lv.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Ieiet',
 	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'Pie dzēšanas',
 	'ON UPDATE' => 'Pie atjaunošanas',
 	'Index Type' => 'Indeksa tips',
-	'Column (length)' => 'Lauks (garums)',
+	'length' => 'garums',
 	'View has been dropped.' => 'Skats dzēsts.',
 	'View has been altered.' => 'Skats izmainīts.',
 	'View has been created.' => 'Skats izveidots.',

adminer/lang/ms.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -197,7 +199,7 @@ $translations = array(
 	'Alter indexes' => 'Ubah indeks',
 	'Add next' => 'Tambah yang seterusnya',
 	'Index Type' => 'Jenis Indeks',
-	'Column (length)' => 'Kolum (kepanjangan)',
+	'length' => 'kepanjangan',
 
 	'Foreign keys' => 'Kunci asing',
 	'Foreign key' => 'Kunci asing',

adminer/lang/nl.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Aanmelden',
 	'Logout successful.' => 'Successvol afgemeld.',
@@ -96,7 +98,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index type',
-	'Column (length)' => 'Kolom (lengte)',
+	'length' => 'lengte',
 	'View has been dropped.' => 'View verwijderd.',
 	'View has been altered.' => 'View aangepast.',
 	'View has been created.' => 'View aangemaakt.',

adminer/lang/no.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'System' => 'System',
 	'Server' => 'Server',
@@ -164,7 +166,7 @@ $translations = array(
 	'Alter indexes' => 'Endre indekser',
 	'Add next' => 'Legg til neste',
 	'Index Type' => 'Indekstype',
-	'Column (length)' => 'Kolonne (lengde)',
+	'length' => 'lengde',
 	'Foreign keys' => 'Fremmednøkler',
 	'Foreign key' => 'Fremmednøkkel',
 	'Foreign key has been dropped.' => 'Fremmednøkkelen er slettet.',

adminer/lang/pl.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Rodzaj bazy',
@@ -42,10 +44,10 @@ $translations = array(
 	'Process list' => 'Lista procesów',
 	'%d process(es) have been killed.' => array('Przerwano %d wątek.', 'Przerwano %d wątki.', 'Przerwano %d wątków.'),
 	'Kill' => 'Przerwij wykonywanie',
-	
+
 	'Variables' => 'Zmienne',
 	'Status' => 'Status',
-	
+
 	'SQL command' => 'Zapytanie SQL',
 	'%d query(s) executed OK.' => array('Pomyślnie wykonano %d zapytanie.', 'Pomyślnie wykonano %d zapytania.', 'Pomyślnie wykonano %d zapytań.'),
 	'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.'),
@@ -60,7 +62,7 @@ $translations = array(
 	'History' => 'Historia',
 	'Clear' => 'Wyczyść',
 	'Edit all' => 'Edytuj wszystkie',
-	
+
 	'File upload' => 'Wgranie pliku',
 	'From server' => 'Z serwera',
 	'Webserver file %s' => 'Plik %s na serwerze',
@@ -72,14 +74,14 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Przesłano zbyt dużo danych. Zmniejsz objętość danych lub zwiększ zmienną konfiguracyjną %s.',
 	'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' => 'Eksport',
 	'Output' => 'Rezultat',
 	'open' => 'otwórz',
 	'save' => 'zapisz',
 	'Format' => 'Format',
 	'Data' => 'Dane',
-	
+
 	'Database' => 'Baza danych',
 	'Use' => 'Wybierz',
 	'Select database' => 'Wybierz bazę danych',
@@ -92,10 +94,10 @@ $translations = array(
 	'Alter database' => 'Zmień bazę danych',
 	'Create database' => 'Utwórz bazę danych',
 	'Database schema' => 'Schemat bazy danych',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Trwały link',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -118,7 +120,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele zostały przeniesione.',
 	'Copy' => 'Kopiuj',
 	'Tables have been copied.' => 'Tabele zostały skopiowane.',
-	
+
 	'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.'),
 	'Call' => 'Uruchom',
@@ -131,7 +133,7 @@ $translations = array(
 	'Alter function' => 'Zmień funkcję',
 	'Alter procedure' => 'Zmień procedurę',
 	'Return type' => 'Zwracany typ',
-	
+
 	'Events' => 'Wydarzenia',
 	'Event has been dropped.' => 'Wydarzenie zostało usunięte.',
 	'Event has been altered.' => 'Wydarzenie zostało zmienione.',
@@ -144,7 +146,7 @@ $translations = array(
 	'Start' => 'Początek',
 	'End' => 'Koniec',
 	'On completion preserve' => 'Nie kasuj wydarzenia po przeterminowaniu',
-	
+
 	'Tables' => 'Tabele',
 	'Tables and views' => 'Tabele i perspektywy',
 	'Table' => 'Tabela',
@@ -177,12 +179,12 @@ $translations = array(
 	'Move down' => 'Przesuń w dół',
 	'Remove' => 'Usuń',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s.',
-	
+
 	'Partition by' => 'Partycjonowanie',
 	'Partitions' => 'Partycje',
 	'Partition name' => 'Nazwa partycji',
 	'Values' => 'Wartości',
-	
+
 	'View' => 'Perspektywa',
 	'Materialized view' => 'Zmaterializowana perspektywa',
 	'View has been dropped.' => 'Perspektywa została usunięta.',
@@ -190,14 +192,14 @@ $translations = array(
 	'View has been created.' => 'Perspektywa została utworzona.',
 	'Alter view' => 'Zmień perspektywę',
 	'Create view' => 'Utwórz perspektywę',
-	
+
 	'Indexes' => 'Indeksy',
 	'Indexes have been altered.' => 'Indeksy zostały zmienione.',
 	'Alter indexes' => 'Zmień indeksy',
 	'Add next' => 'Dodaj następny',
 	'Index Type' => 'Typ indeksu',
-	'Column (length)' => 'Kolumna (długość)',
-	
+	'length' => 'długość',
+
 	'Foreign keys' => 'Klucze obce',
 	'Foreign key' => 'Klucz obcy',
 	'Foreign key has been dropped.' => 'Klucz obcy został usunięty.',
@@ -213,7 +215,7 @@ $translations = array(
 	'ON DELETE' => 'W przypadku usunięcia',
 	'ON UPDATE' => 'W przypadku zmiany',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Źródłowa i docelowa kolumna muszą być tego samego typu, powinien istnieć indeks na docelowej kolumnie oraz muszą istnieć dane referencyjne.',
-	
+
 	'Triggers' => 'Wyzwalacze',
 	'Add trigger' => 'Dodaj wyzwalacz',
 	'Trigger has been dropped.' => 'Wyzwalacz został usunięty.',
@@ -224,7 +226,7 @@ $translations = array(
 	'Time' => 'Czas',
 	'Event' => 'Wydarzenie',
 	'Name' => 'Nazwa',
-	
+
 	'select' => 'przeglądaj',
 	'Select' => 'pokaż',
 	'Select data' => 'Pokaż dane',
@@ -250,16 +252,16 @@ $translations = array(
 	'Loading' => 'Wczytywanie',
 	'Whole result' => 'Wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
-	
+
 	'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ść.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Rekord%s został dodany.',
 	'Item has been deleted.' => 'Rekord został usunięty.',
@@ -280,14 +282,14 @@ $translations = array(
 	'Clone' => 'Duplikuj',
 	'Delete' => 'Usuń',
 	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Nadawca',
 	'Subject' => 'Temat',
 	'Attachments' => 'Załączniki',
 	'Send' => 'Wyślij',
 	'%d e-mail(s) have been sent.' => array('Wysłano %d e-mail.', 'Wysłano %d e-maile.', 'Wysłano %d e-maili.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Numeryczne',
 	'Date and time' => 'Data i czas',
@@ -297,7 +299,7 @@ $translations = array(
 	'Network' => 'Sieć',
 	'Geometry' => 'Geometria',
 	'Relations' => 'Relacje',
-	
+
 	'Editor' => 'Edytor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -308,11 +310,11 @@ $translations = array(
 	'now' => 'teraz',
 	'yes' => 'tak',
 	'no' => 'nie',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Plik już istnieje.',
 	'Please use one of the extensions %s.' => 'Proszę użyć jednego z rozszerzeń: %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Zmień schemat',
 	'Create schema' => 'Utwórz schemat',
@@ -321,7 +323,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schemat został zmieniony.',
 	'Schema' => 'Schemat',
 	'Invalid schema.' => 'Nieprawidłowy schemat.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekwencje',
 	'Create sequence' => 'Utwórz sekwencję',
@@ -329,7 +331,7 @@ $translations = array(
 	'Sequence has been created.' => 'Sekwencja została utworzona.',
 	'Sequence has been altered.' => 'Sekwencja została zmieniona.',
 	'Alter sequence' => 'Zmień sekwencję',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Typy użytkownika',
 	'Create type' => 'Utwórz typ',

adminer/lang/pt-br.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'Column (length)' => 'Coluna (tamanho)',
+	'length' => '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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Sessão terminada com sucesso.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'Column (length)' => 'coluna (tamanho)',
+	'length' => '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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Intră',
 	'Logout successful.' => 'Ați ieșit cu succes.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'La ștergere',
 	'ON UPDATE' => 'La modificare',
 	'Index Type' => 'Tipul indexului',
-	'Column (length)' => 'Coloană (lungimea)',
+	'length' => '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ă.',

adminer/lang/ru.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'При стирании',
 	'ON UPDATE' => 'При обновлении',
 	'Index Type' => 'Тип индекса',
-	'Column (length)' => 'Поле (длина)',
+	'length' => 'длина',
 	'View has been dropped.' => 'Представление было удалено.',
 	'View has been altered.' => 'Представление было изменено.',
 	'View has been created.' => 'Представление было создано.',

adminer/lang/sk.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'Prihlásiť sa',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
@@ -96,7 +98,7 @@ $translations = array(
 	'ON DELETE' => 'Pri zmazaní',
 	'ON UPDATE' => 'Pri aktualizácii',
 	'Index Type' => 'Typ indexu',
-	'Column (length)' => 'Stĺpec (dĺžka)',
+	'length' => '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ý.',
@@ -287,7 +289,7 @@ $translations = array(
 	'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.',
+	'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ť',

adminer/lang/sl.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -19,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Seja je potekla. Prosimo, ponovno se prijavite.',
 	'%s version: %s through PHP extension %s' => 'Verzija %s: %s preko dodatka za PHP %s',
 	'Refresh' => 'Osveži',
-	
+
 	// text direction
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Pravice',
 	'Create user' => 'Ustvari uporabnika',
 	'User has been dropped.' => 'Uporabnik je odstranjen.',
@@ -33,14 +35,14 @@ $translations = array(
 	'Routine' => 'Postopek',
 	'Grant' => 'Dovoli',
 	'Revoke' => 'Odvzemi',
-	
+
 	'Process list' => 'Seznam procesov',
 	'%d process(es) have been killed.' => array('Končan je %d proces.', 'Končana sta %d procesa.', 'Končani so %d procesi.', 'Končanih je %d procesov.'),
 	'Kill' => 'Končaj',
-	
+
 	'Variables' => 'Spremenljivke',
 	'Status' => 'Stanje',
-	
+
 	'SQL command' => 'Ukaz SQL',
 	'%d query(s) executed OK.' => array('Uspešno se je končala %d poizvedba.', 'Uspešno sta se končali %d poizvedbi.', 'Uspešno so se končale %d poizvedbe.', 'Uspešno se je končalo %d poizvedb.'),
 	'Query executed OK, %d row(s) affected.' => array('Poizvedba se je uspešno izvedla, spremenjena je %d vrstica.', 'Poizvedba se je uspešno izvedla, spremenjeni sta %d vrstici.', 'Poizvedba se je uspešno izvedla, spremenjene so %d vrstice.', 'Poizvedba se je uspešno izvedla, spremenjenih je %d vrstic.'),
@@ -53,7 +55,7 @@ $translations = array(
 	'%.3f s' => '%.3f s',
 	'History' => 'Zgodovina',
 	'Clear' => 'Počisti',
-	
+
 	'File upload' => 'Naloži datoteko',
 	'From server' => 'z strežnika',
 	'Webserver file %s' => 'Datoteka na spletnem strežniku %s',
@@ -63,14 +65,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Ne morem naložiti datoteke.',
 	'Maximum allowed file size is %sB.' => 'Največja velikost datoteke je %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Preveliko podatkov za POST. Zmanjšajte število podatkov ali povečajte nastavitev za %s.',
-	
+
 	'Export' => 'Izvozi',
 	'Output' => 'Izhod rezultata',
 	'open' => 'odpri',
 	'save' => 'shrani',
 	'Format' => 'Format',
 	'Data' => 'Podatki',
-	
+
 	'Database' => 'Baza',
 	'Use' => 'Uporabi',
 	'Select database' => 'Izberi bazo',
@@ -83,7 +85,7 @@ $translations = array(
 	'Alter database' => 'Spremeni bazo',
 	'Create database' => 'Ustvari bazo',
 	'Database schema' => 'Shema baze',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -105,7 +107,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele so premaknjene.',
 	'Copy' => 'Kopiraj',
 	'Tables have been copied.' => 'Tabele so kopirane.',
-	
+
 	'Routines' => 'Postopki',
 	'Routine has been called, %d row(s) affected.' => array('Klican je bil postopek, spremenjena je %d vrstica.', 'Klican je bil postopek, spremenjeni sta %d vrstici.', 'Klican je bil postopek, spremenjene so %d vrstice.', 'Klican je bil postopek, spremenjenih je %d vrstic.'),
 	'Call' => 'Pokliči',
@@ -118,7 +120,7 @@ $translations = array(
 	'Alter function' => 'Spremeni funkcijo',
 	'Alter procedure' => 'Spremeni postopek',
 	'Return type' => 'Vračalni tip',
-	
+
 	'Events' => 'Dogodki',
 	'Event has been dropped.' => 'Dogodek je zavržen.',
 	'Event has been altered.' => 'Dogodek je spremenjen.',
@@ -131,7 +133,7 @@ $translations = array(
 	'Start' => 'Začetek',
 	'End' => 'Konec',
 	'On completion preserve' => 'Po zaključku ohrani',
-	
+
 	'Tables' => 'Tabele',
 	'Tables and views' => 'Tabele in pogledi',
 	'Table' => 'Tabela',
@@ -159,26 +161,26 @@ $translations = array(
 	'Move down' => 'Premakni dol',
 	'Remove' => 'Odstrani',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s.',
-	
+
 	'Partition by' => 'Porazdeli po',
 	'Partitions' => 'Porazdelitve',
 	'Partition name' => 'Ime porazdelitve',
 	'Values' => 'Vrednosti',
-	
+
 	'View' => 'Pogledi',
 	'View has been dropped.' => 'Pogled je zavržen.',
 	'View has been altered.' => 'Pogled je spremenjen.',
 	'View has been created.' => 'Pogled je ustvarjen.',
 	'Alter view' => 'Spremeni pogled',
 	'Create view' => 'Ustvari pogled',
-	
+
 	'Indexes' => 'Indeksi',
 	'Indexes have been altered.' => 'Indeksi so spremenjeni.',
 	'Alter indexes' => 'Spremeni indekse',
 	'Add next' => 'Dodaj naslednjega',
 	'Index Type' => 'Tip indeksa',
-	'Column (length)' => 'Stolpec (dolžina)',
-	
+	'length' => 'dolžina',
+
 	'Foreign keys' => 'Tuji ključi',
 	'Foreign key' => 'Tuj ključ',
 	'Foreign key has been dropped.' => 'Tuj ključ je zavržen.',
@@ -194,7 +196,7 @@ $translations = array(
 	'ON DELETE' => 'pri brisanju',
 	'ON UPDATE' => 'pri posodabljanju',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Izvorni in ciljni stolpec mora imeti isti podatkovni tip. Obstajati mora indeks na ciljnih stolpcih in obstajati morajo referenčni podatki.',
-	
+
 	'Triggers' => 'Sprožilniki',
 	'Add trigger' => 'Dodaj sprožilnik',
 	'Trigger has been dropped.' => 'Sprožilnik je odstranjen.',
@@ -205,7 +207,7 @@ $translations = array(
 	'Time' => 'Čas',
 	'Event' => 'Dogodek',
 	'Name' => 'Naziv',
-	
+
 	'select' => 'izberi',
 	'Select' => 'Izberi',
 	'Select data' => 'Izberi podatke',
@@ -226,14 +228,14 @@ $translations = array(
 	'last' => 'Zadnja',
 	'Whole result' => 'Cel razultat',
 	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajti', '%d bajtov'),
-	
+
 	'Import' => 'Uvozi',
 	'%d row(s) have been imported.' => array('Uvožena je %d vrstica.', 'Uvoženi sta %d vrstici.', 'Uvožene so %d vrstice.', 'Uvoženih je %d vrstic.'),
-	
+
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+klik na vrednost za urejanje.',
 	'Use edit link to modify this value.' => 'Uporabite urejanje povezave za spreminjanje te vrednosti.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Predmet%s je vstavljen.',
 	'Item has been deleted.' => 'Predmet je izbrisan.',
@@ -251,14 +253,14 @@ $translations = array(
 	'Save and insert next' => 'Shrani in vstavi tekst',
 	'Clone' => 'Kloniraj',
 	'Delete' => 'Izbriši',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Od',
 	'Subject' => 'Zadeva',
 	'Attachments' => 'Priponke',
 	'Send' => 'Pošlji',
 	'%d e-mail(s) have been sent.' => array('Poslan je %d e-mail.', 'Poslana sta %d e-maila.', 'Poslani so %d e-maili.', 'Poslanih je %d e-mailov.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Števila',
 	'Date and time' => 'Datum in čas',
@@ -268,18 +270,18 @@ $translations = array(
 	'Network' => 'Mrežni',
 	'Geometry' => 'Geometrčni',
 	'Relations' => 'Relacijski',
-	
+
 	'Editor' => 'Urejevalnik',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
 	// hint for date format - use language equivalents for day, month and year shortcuts
 	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
 	'now' => 'zdaj',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Datoteka obstaja.',
 	'Please use one of the extensions %s.' => 'Prosim, uporabite enega od dodatkov %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Spremeni shemo',
 	'Create schema' => 'Ustvari shemo',
@@ -288,7 +290,7 @@ $translations = array(
 	'Schema has been altered.' => 'Shema je spremenjena.',
 	'Schema' => 'Shema',
 	'Invalid schema.' => 'Neveljavna shema.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Ustvari sekvenco',
@@ -296,7 +298,7 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvence je ustvarjena.',
 	'Sequence has been altered.' => 'Sekvence je spremenjena.',
 	'Alter sequence' => 'Spremni sekvenco',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Uporabniški tipi',
 	'Create type' => 'Ustvari tip',

adminer/lang/sr.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Систем',
@@ -182,7 +184,7 @@ $translations = array(
 	'Alter indexes' => 'Уреди индексе',
 	'Add next' => 'Додај следећи',
 	'Index Type' => 'Тип индекса',
-	'Column (length)' => 'Колона (дужина)',
+	'length' => 'дужина',
 
 	'Foreign keys' => 'Страни кључеви',
 	'Foreign key' => 'Страни кључ',

adminer/lang/sv.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'System',
@@ -206,7 +208,7 @@ $translations = array(
 	'Alter indexes' => 'Ändra index',
 	'Add next' => 'Lägg till nästa',
 	'Index Type' => 'Indextyp',
-	'Column (length)' => 'Kolumn (längd)',
+	'length' => 'längd',
 
 	'Foreign keys' => 'Främmande nycklar',
 	'Foreign key' => 'Främmande nyckel',

adminer/lang/ta.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'நுழை',
 	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
@@ -93,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'அக‌வ‌ரிசை வ‌கை (Index Type)',
-	'Column (length)' => 'நெடுவ‌ரிசை (நீள‌ம்)',
+	'length' => 'நீள‌ம்',
 	'View has been dropped.' => 'தோற்ற‌ம் நீக்க‌ப்ப‌ட்ட‌து.',
 	'View has been altered.' => 'தோற்றம் மாற்றப்ப‌ட்ட‌து.',
 	'View has been created.' => 'தோற்ற‌ம் உருவாக்க‌ப்ப‌ட்ட‌து.',

adminer/lang/th.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	'Login' => 'เข้าสู่ระบบ',
 	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
@@ -95,7 +97,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'ชนิดของดัชนี',
-	'Column (length)' => 'คอลัมน์ (ความยาว)',
+	'length' => 'ความยาว',
 	'View has been dropped.' => 'วิวถูกลบแล้ว.',
 	'View has been altered.' => 'วิวถูกเปลี่ยนแปลงแล้ว.',
 	'View has been created.' => 'วิวถูกสร้างแล้ว.',

adminer/lang/tr.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Sistem',
@@ -200,7 +202,7 @@ $translations = array(
 	'Alter indexes' => 'İndeksleri değiştir',
 	'Add next' => 'Bundan sonra ekle',
 	'Index Type' => 'İndex Türü',
-	'Column (length)' => 'Kolon (uzunluğu)',
+	'length' => 'uzunluğu',
 
 	'Foreign keys' => 'Dış anahtarlar',
 	'Foreign key' => 'Dış anahtar',

adminer/lang/uk.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Система Бази Даних',
@@ -19,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесія закінчилась, будь ласка, увійдіть в систему знову.',
 	'%s version: %s through PHP extension %s' => 'Версія %s: %s з PHP-розширенням %s',
 	'Refresh' => 'Оновити',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Привілеї',
 	'Create user' => 'Створити користувача',
 	'User has been dropped.' => 'Користувача було видалено.',
@@ -33,14 +35,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Дозволити',
 	'Revoke' => 'Заборонити',
-	
+
 	'Process list' => 'Перелік процесів',
 	'%d process(es) have been killed.' => array('Було завершено %d процес.', 'Було завершено %d процеси.', 'Було завершёно %d процесів.'),
 	'Kill' => 'Завершити процес',
-	
+
 	'Variables' => 'Змінні',
 	'Status' => 'Статус',
-	
+
 	'SQL command' => 'SQL запит',
 	'%d query(s) executed OK.' => array('%d запит виконано успішно.', '%d запити виконано успішно.', '%d запитів виконано успішно.'),
 	'Query executed OK, %d row(s) affected.' => array('Запит виконано успішно, змінено %d рядок.', 'Запит виконано успішно, змінено %d рядки.', 'Запит виконано успішно, змінено %d рядків.'),
@@ -54,7 +56,7 @@ $translations = array(
 	'History' => 'Історія',
 	'Clear' => 'Очистити',
 	'Edit all' => 'Редагувати все',
-	
+
 	'File upload' => 'Завантажити файл',
 	'From server' => 'З сервера',
 	'Webserver file %s' => 'Файл %s на вебсервері',
@@ -64,14 +66,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Неможливо завантажити файл.',
 	'Maximum allowed file size is %sB.' => 'Максимально допустимий розмір файлу %sБ.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Занадто великий об\'єм POST-даних. Зменшіть об\'єм або збільшіть параметр директиви %s конфигурації.',
-	
+
 	'Export' => 'Експорт',
 	'Output' => 'Вихідні дані',
 	'open' => 'відкрити',
 	'save' => 'зберегти',
 	'Format' => 'Формат',
 	'Data' => 'Дані',
-	
+
 	'Database' => 'База даних',
 	'Use' => 'Обрати',
 	'Select database' => 'Обрати базу даних',
@@ -84,10 +86,10 @@ $translations = array(
 	'Alter database' => 'Змінити базу даних',
 	'Create database' => 'Створити базу даних',
 	'Database schema' => 'Схема бази даних',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Постійне посилання',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -109,7 +111,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиці було перенесено.',
 	'Copy' => 'копіювати',
 	'Tables have been copied.' => 'Таблиці було зкопійовано.',
-	
+
 	'Routines' => 'Збережені процедури',
 	'Routine has been called, %d row(s) affected.' => array('Була викликана процедура, %d запис було змінено.', 'Була викликана процедура, %d записи було змінено.', 'Була викликана процедура, %d записів було змінено.'),
 	'Call' => 'Викликати',
@@ -122,7 +124,7 @@ $translations = array(
 	'Alter function' => 'Змінити функцію',
 	'Alter procedure' => 'Змінити процедуру',
 	'Return type' => 'Тип, що повернеться',
-	
+
 	'Events' => 'Події',
 	'Event has been dropped.' => 'Подію було видалено.',
 	'Event has been altered.' => 'Подію було змінено.',
@@ -135,7 +137,7 @@ $translations = array(
 	'Start' => 'Початок',
 	'End' => 'Кінець',
 	'On completion preserve' => 'Після завершення зберегти',
-	
+
 	'Tables' => 'Таблиці',
 	'Tables and views' => 'Таблиці і вигляди',
 	'Table' => 'Таблиця',
@@ -164,26 +166,26 @@ $translations = array(
 	'Move down' => 'Пересунути вниз',
 	'Remove' => 'Видалити',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
-	
+
 	'Partition by' => 'Розділити по',
 	'Partitions' => 'Розділи',
 	'Partition name' => 'Назва розділу',
 	'Values' => 'Значення',
-	
+
 	'View' => 'Вигляд',
 	'View has been dropped.' => 'Вигляд було видалено.',
 	'View has been altered.' => 'Вигляд було змінено.',
 	'View has been created.' => 'Вигляд було створено.',
 	'Alter view' => 'Змінити вигляд',
 	'Create view' => 'Створити вигляд',
-	
+
 	'Indexes' => 'Індекси',
 	'Indexes have been altered.' => 'Індексування було змінено.',
 	'Alter indexes' => 'Змінити індексування',
 	'Add next' => 'Додати ще',
 	'Index Type' => 'Тип індексу',
-	'Column (length)' => 'Стовпець (довжина)',
-	
+	'length' => 'довжина',
+
 	'Foreign keys' => 'Зовнішні ключі',
 	'Foreign key' => 'Зовнішній ключ',
 	'Foreign key has been dropped.' => 'Зовнішній ключ було видалено.',
@@ -199,7 +201,7 @@ $translations = array(
 	'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.' => 'Стовпці повинні мати той самий тип даних, цільові стовпці повинні бути проіндексовані і дані, на які посилаються повинні існувати.',
-	
+
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Додати тригер',
 	'Trigger has been dropped.' => 'Тригер було видалено.',
@@ -210,7 +212,7 @@ $translations = array(
 	'Time' => 'Час',
 	'Event' => 'Подія',
 	'Name' => 'Назва',
-	
+
 	'select' => 'вибрати',
 	'Select' => 'Вибрати',
 	'Select data' => 'Вибрати дані',
@@ -231,14 +233,14 @@ $translations = array(
 	'last' => 'остання',
 	'Whole result' => 'Весь результат',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
-	
+
 	'Import' => 'Імпортувати',
 	'%d row(s) have been imported.' => array('%d рядок було імпортовано.', '%d рядки було імпортовано.', '%d рядків було імпортовано.'),
-	
+
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+клікніть на значенні щоб змінити його.',
 	'Use edit link to modify this value.' => 'Використовуйте посилання щоб змінити це значення.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Запис%s було вставлено.',
 	'Item has been deleted.' => 'Запис було видалено.',
@@ -256,14 +258,14 @@ $translations = array(
 	'Save and insert next' => 'Зберегти і вставити знову',
 	'Clone' => 'Клонувати',
 	'Delete' => 'Видалити',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Від',
 	'Subject' => 'Заголовок',
 	'Attachments' => 'Додатки',
 	'Send' => 'Надіслати',
 	'%d e-mail(s) have been sent.' => array('Було надіслано %d повідомлення.', 'Було надіслано %d повідомлення.', 'Було надіслано %d повідомлень.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата і час',
@@ -273,7 +275,7 @@ $translations = array(
 	'Network' => 'Мережа',
 	'Geometry' => 'Геометрія',
 	'Relations' => 'Зв\'язки',
-	
+
 	'Editor' => 'Редактор',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5.$3.$1',
@@ -284,11 +286,11 @@ $translations = array(
 	'now' => 'зараз',
 	'yes' => 'так',
 	'no' => 'ні',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файл існує.',
 	'Please use one of the extensions %s.' => 'Будь ласка, використовуйте одне з розширень %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Змінити схему',
 	'Create schema' => 'Створити схему',
@@ -297,7 +299,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схему було змінено.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невірна схема.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Послідовності',
 	'Create sequence' => 'Створити послідовність',
@@ -305,7 +307,7 @@ $translations = array(
 	'Sequence has been created.' => 'Послідовність було створено.',
 	'Sequence has been altered.' => 'Послідовність було змінено.',
 	'Alter sequence' => 'Змінити послідовність',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Типи користувачів',
 	'Create type' => 'Створити тип',

adminer/lang/vi.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Hệ thống',
@@ -21,10 +23,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Phiên làm việc đã hết, hãy đăng nhập lại.',
 	'%s version: %s through PHP extension %s' => 'Phiên bản %s: %s (PHP extension: %s)',
 	'Refresh' => 'Làm mới',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Quyền truy cập',
 	'Create user' => 'Tạo người dùng',
 	'User has been dropped.' => 'Đã xoá người dùng.',
@@ -35,14 +37,14 @@ $translations = array(
 	'Routine' => 'Hàm tích hợp',
 	'Grant' => 'Cấp quyền',
 	'Revoke' => 'Tước quyền',
-	
+
 	'Process list' => 'Danh sách tiến trình',
 	'%d process(es) have been killed.' => '%d tiến trình đã dừng.',
 	'Kill' => 'Dừng',
-	
+
 	'Variables' => 'Biến',
 	'Status' => 'Trạng thái',
-	
+
 	'SQL command' => 'Câu lệnh SQL',
 	'%d query(s) executed OK.' => '%d câu lệnh đã chạy thành công.',
 	'Query executed OK, %d row(s) affected.' => 'Đã thực hiện xong, ảnh hưởng đến %d dòng.',
@@ -56,7 +58,7 @@ $translations = array(
 	'History' => 'Lịch sử',
 	'Clear' => 'Xoá',
 	'Edit all' => 'Sửa tất cả',
-	
+
 	'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ủ',
@@ -67,14 +69,14 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Kích thước tệp tối đa là %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Dữ liệu tải lên/POST quá lớn. Hãy giảm kích thước tệp hoặc tăng cấu hình (hiện tại %s).',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Bạn có thể tải tệp lên dùng FTP và nhập vào cơ sở dữ liệu.',
-	
+
 	'Export' => 'Xuất',
 	'Output' => 'Kết quả',
 	'open' => 'xem',
 	'save' => 'lưu',
 	'Format' => 'Định dạng',
 	'Data' => 'Dữ liệu',
-	
+
 	'Database' => 'Cơ sở dữ liệu',
 	'Use' => 'Sử dụng',
 	'Select database' => 'Chọn CSDL',
@@ -87,10 +89,10 @@ $translations = array(
 	'Alter database' => 'Thay đổi CSDL',
 	'Create database' => 'Tạo CSDL',
 	'Database schema' => 'Cấu trúc CSDL',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Liên kết cố định',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -113,7 +115,7 @@ $translations = array(
 	'Tables have been moved.' => 'Bảng.',
 	'Copy' => 'Sao chép',
 	'Tables have been copied.' => 'Bảng đã được sao chép.',
-	
+
 	'Routines' => 'Routines',
 	'Routine has been called, %d row(s) affected.' => 'Đã chạy routine, thay đổi %d dòng.',
 	'Call' => 'Gọi',
@@ -138,7 +140,7 @@ $translations = array(
 	'Start' => 'Bắt đầu',
 	'End' => 'Kết thúc',
 	'On completion preserve' => 'Khi kết thúc, duy trì',
-	
+
 	'Tables' => 'Các bảng',
 	'Tables and views' => 'Bảng và khung nhìn',
 	'Table' => 'Bảng',
@@ -169,26 +171,26 @@ $translations = array(
 	'Move down' => 'Chuyển xuống dưới',
 	'Remove' => 'Xoá',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Thiết lập %s cần tăng thêm. (Đã vượt giới hạnố trường tối đa cho phép trong một biểu mẫu).',
-	
+
 	'Partition by' => 'Phân chia bằng',
 	'Partitions' => 'Phân hoạch',
 	'Partition name' => 'Tên phân hoạch',
 	'Values' => 'Giá trị',
-	
+
 	'View' => 'Khung nhìn',
 	'View has been dropped.' => 'Khung nhìn đã bị xoá.',
 	'View has been altered.' => 'Khung nhìn đã được sửa.',
 	'View has been created.' => 'Khung nhìn đã được tạo.',
 	'Alter view' => 'Sửa khung nhìn',
 	'Create view' => 'Tạo khung nhìn',
-	
+
 	'Indexes' => 'Chỉ mục',
 	'Indexes have been altered.' => 'Chỉ mục đã được sửa.',
 	'Alter indexes' => 'Sửa chỉ mục',
 	'Add next' => 'Thêm tiếp',
 	'Index Type' => 'Loại chỉ mục',
-	'Column (length)' => 'Cột (độ dài)',
-	
+	'length' => 'độ dài',
+
 	'Foreign keys' => 'Các khoá ngoại',
 	'Foreign key' => 'Khoá ngoại',
 	'Foreign key has been dropped.' => 'Khoá ngoại đã bị xoá.',
@@ -204,7 +206,7 @@ $translations = array(
 	'ON DELETE' => 'Khi xoá',
 	'ON UPDATE' => 'Khi cập nhật',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Cột gốc và cột đích phải cùng kiểu, phải đặt chỉ mục trong cột đích và dữ liệu tham chiếu phải tồn tại.',
-	
+
 	'Triggers' => 'Phản xạ',
 	'Add trigger' => 'Thêm phản xạ',
 	'Trigger has been dropped.' => 'Đã xoá phản xạ.',
@@ -215,7 +217,7 @@ $translations = array(
 	'Time' => 'Thời gian',
 	'Event' => 'Sự kiện',
 	'Name' => 'Tên',
-	
+
 	'select' => 'xem',
 	'Select' => 'Xem',
 	'Select data' => 'Xem dữ liệu',
@@ -239,16 +241,16 @@ $translations = array(
 	'Loading' => 'Đang nạp',
 	'Whole result' => 'Toàn bộ kết quả',
 	'%d byte(s)' => '%d byte(s)',
-	
+
 	'Import' => 'Nhập khẩu',
 	'%d row(s) have been imported.' => 'Đã nhập % dòng dữ liệu.',
 	'File must be in UTF-8 encoding.' => 'Tệp phải mã hoá bằng chuẩn UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Sửa',
 	'Ctrl+click on a value to modify it.' => 'Nhấn Ctrl và bấm vào giá trị để sửa.',
 	'Use edit link to modify this value.' => 'Dùng nút sửa để thay đổi giá trị này.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Đã thêm%s.',
 	'Item has been deleted.' => 'Đã xoá.',
@@ -268,14 +270,14 @@ $translations = array(
 	'Clone' => 'Sao chép',
 	'Delete' => 'Xoá',
 	'You have no privileges to update this table.' => 'Bạn không có quyền sửa bảng này.',
-	
+
 	'E-mail' => 'Địa chỉ email',
 	'From' => 'Người gửi',
 	'Subject' => 'Chủ đề',
 	'Attachments' => 'Đính kèm',
 	'Send' => 'Gửi',
 	'%d e-mail(s) have been sent.' => '%d thư đã gửi.',
-	
+
 	// data type descriptions
 	'Numbers' => 'Số',
 	'Date and time' => 'Ngày giờ',
@@ -285,7 +287,7 @@ $translations = array(
 	'Network' => 'Mạng',
 	'Geometry' => 'Toạ độ',
 	'Relations' => 'Quan hệ',
-	
+
 	'Editor' => 'Biên tập',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -296,11 +298,11 @@ $translations = array(
 	'now' => 'hiện tại',
 	'yes' => 'có',
 	'no' => 'không',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Tệp đã có rồi.',
 	'Please use one of the extensions %s.' => 'Cần phải dùng một trong các phần mở rộng sau: %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Thay đổi schema',
 	'Create schema' => 'Tạo schema',
@@ -309,7 +311,7 @@ $translations = array(
 	'Schema has been altered.' => 'Đã thay đổi schema.',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Schema không hợp lệ.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Dãy số',
 	'Create sequence' => 'Tạo dãy số',
@@ -317,7 +319,7 @@ $translations = array(
 	'Sequence has been created.' => 'Đã tạo dãy số.',
 	'Sequence has been altered.' => 'Đã sửa dãy số.',
 	'Alter sequence' => 'Thay đổi dãy số',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Kiểu tự định nghĩa',
 	'Create type' => 'Tạo kiểu',

adminer/lang/xx.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => 'Xx',
@@ -29,10 +31,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => 'Xx.',
 	'%s version: %s through PHP extension %s' => '%s xx: %s xx %s',
 	'Refresh' => 'Xx',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'xx',
-	
+
 	'Privileges' => 'Xx',
 	'Create user' => 'Xx',
 	'User has been dropped.' => 'Xx.',
@@ -43,14 +45,14 @@ $translations = array(
 	'Routine' => 'Xx',
 	'Grant' => 'Xx',
 	'Revoke' => 'Xx',
-	
+
 	'Process list' => 'Xx',
 	'%d process(es) have been killed.' => array('%d xx.', '%d xx.'),
 	'Kill' => 'Xx',
-	
+
 	'Variables' => 'Xx',
 	'Status' => 'Xx',
-	
+
 	'SQL command' => 'Xx',
 	'%d query(s) executed OK.' => array('%d xx.', '%d xx.'),
 	'Query executed OK, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
@@ -67,7 +69,7 @@ $translations = array(
 	'History' => 'Xx',
 	'Clear' => 'Xx',
 	'Edit all' => 'Xx',
-	
+
 	'File upload' => 'Xx',
 	'From server' => 'Xx',
 	'Webserver file %s' => 'Xx %s',
@@ -79,7 +81,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Xx %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Xx.',
 	'You are offline.' => 'Xx.',
-	
+
 	'Export' => 'Xx',
 	'Output' => 'Xx',
 	'open' => 'xx',
@@ -87,7 +89,7 @@ $translations = array(
 	'Saving' => 'Xx',
 	'Format' => 'Xx',
 	'Data' => 'Xx',
-	
+
 	'Database' => 'Xx',
 	'DB' => 'XX',
 	'Use' => 'Xx',
@@ -101,10 +103,10 @@ $translations = array(
 	'Alter database' => 'Xx',
 	'Create database' => 'Xx',
 	'Database schema' => 'Xx',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Xx',
-	
+
 	// thousands separator - must contain single byte
 	',' => 'x',
 	'0123456789' => 'xxxxxxxxxx',
@@ -128,7 +130,7 @@ $translations = array(
 	'Copy' => 'Xx',
 	'Tables have been copied.' => 'Xx.',
 	'overwrite' => 'xx',
-	
+
 	'Routines' => 'Xx',
 	'Routine has been called, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'Call' => 'Xx',
@@ -141,7 +143,7 @@ $translations = array(
 	'Alter function' => 'Xx',
 	'Alter procedure' => 'Xx',
 	'Return type' => 'Xx',
-	
+
 	'Events' => 'Xx',
 	'Event has been dropped.' => 'Xx.',
 	'Event has been altered.' => 'Xx.',
@@ -154,7 +156,7 @@ $translations = array(
 	'Start' => 'Xx',
 	'End' => 'Xx',
 	'On completion preserve' => 'Xx',
-	
+
 	'Tables' => 'Xx',
 	'Tables and views' => 'Xx',
 	'Table' => 'Xx',
@@ -187,12 +189,12 @@ $translations = array(
 	'Move down' => 'Xx',
 	'Remove' => 'Xx',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx %s.',
-	
+
 	'Partition by' => 'Xx',
 	'Partitions' => 'Xx',
 	'Partition name' => 'Xx',
 	'Values' => 'Xx',
-	
+
 	'View' => 'Xx',
 	'Materialized view' => 'Xx',
 	'View has been dropped.' => 'Xx.',
@@ -200,14 +202,14 @@ $translations = array(
 	'View has been created.' => 'Xx.',
 	'Alter view' => 'Xx',
 	'Create view' => 'Xx',
-	
+
 	'Indexes' => 'Xx',
 	'Indexes have been altered.' => 'Xx.',
 	'Alter indexes' => 'Xx',
 	'Add next' => 'Xx',
 	'Index Type' => 'Xx',
-	'Column (length)' => 'Xx',
-	
+	'length' => 'xx',
+
 	'Foreign keys' => 'Xx',
 	'Foreign key' => 'Xx',
 	'Foreign key has been dropped.' => 'Xx.',
@@ -223,7 +225,7 @@ $translations = array(
 	'ON DELETE' => 'Xx',
 	'ON UPDATE' => 'Xx',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Xx.',
-	
+
 	'Triggers' => 'Xx',
 	'Add trigger' => 'Xx',
 	'Trigger has been dropped.' => 'Xx.',
@@ -234,7 +236,7 @@ $translations = array(
 	'Time' => 'Xx',
 	'Event' => 'Xx',
 	'Name' => 'Xx',
-	
+
 	'select' => 'xx',
 	'Select' => 'Xx',
 	'Select data' => 'Xx',
@@ -260,16 +262,16 @@ $translations = array(
 	'Loading' => 'Xx',
 	'Whole result' => 'Xx',
 	'%d byte(s)' => array('%d xx', '%d xx'),
-	
+
 	'Import' => 'Xx',
 	'%d row(s) have been imported.' => array('%d xx.', '%d xx.'),
 	'File must be in UTF-8 encoding.' => 'Xx.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Xx',
 	'Ctrl+click on a value to modify it.' => 'Xx.',
 	'Use edit link to modify this value.' => 'Xx.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
@@ -289,14 +291,14 @@ $translations = array(
 	'Clone' => 'Xx',
 	'Delete' => 'Xx',
 	'You have no privileges to update this table.' => 'Xx.',
-	
+
 	'E-mail' => 'Xx',
 	'From' => 'Xx',
 	'Subject' => 'Xx',
 	'Attachments' => 'Xx',
 	'Send' => 'Xx',
 	'%d e-mail(s) have been sent.' => array('%d xx.', '%d xx.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Xx',
 	'Date and time' => 'Xx',
@@ -306,7 +308,7 @@ $translations = array(
 	'Network' => 'Xx',
 	'Geometry' => 'Xx',
 	'Relations' => 'Xx',
-	
+
 	'Editor' => 'Xx',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => 'xx',
@@ -317,11 +319,11 @@ $translations = array(
 	'now' => 'xx',
 	'yes' => 'xx',
 	'no' => 'xx',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Xx.',
 	'Please use one of the extensions %s.' => 'Xx %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Xx',
 	'Create schema' => 'Xx',
@@ -330,7 +332,7 @@ $translations = array(
 	'Schema has been altered.' => 'Xx.',
 	'Schema' => 'Xx',
 	'Invalid schema.' => 'Xx.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Xx',
 	'Create sequence' => 'Xx',
@@ -338,11 +340,19 @@ $translations = array(
 	'Sequence has been created.' => 'Xx.',
 	'Sequence has been altered.' => 'Xx.',
 	'Alter sequence' => 'Xx',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Xx',
 	'Create type' => 'Xx',
 	'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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => '資料庫系統',
@@ -29,10 +31,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => '此操作將在成功使用相同的憑據登錄後執行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s 透過 PHP 擴充模組 %s',
 	'Refresh' => '重新載入',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => '權限',
 	'Create user' => '建立使用者',
 	'User has been dropped.' => '已刪除使用者。',
@@ -43,14 +45,14 @@ $translations = array(
 	'Routine' => '程序',
 	'Grant' => '授權',
 	'Revoke' => '廢除',
-	
+
 	'Process list' => '處理程序列表',
 	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
-	
+
 	'Variables' => '變數',
 	'Status' => '狀態',
-	
+
 	'SQL command' => 'SQL 命令',
 	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
 	'Query executed OK, %d row(s) affected.' => '執行查詢 OK，%d 行受影響。',
@@ -67,7 +69,7 @@ $translations = array(
 	'History' => '紀錄',
 	'Clear' => '清除',
 	'Edit all' => '編輯全部',
-	
+
 	'File upload' => '檔案上傳',
 	'From server' => '從伺服器',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
@@ -79,7 +81,7 @@ $translations = array(
 	'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.' => '您離線了。',
-	
+
 	'Export' => '匯出',
 	'Output' => '輸出',
 	'open' => '打開',
@@ -87,7 +89,7 @@ $translations = array(
 	'Saving' => '保存中',
 	'Format' => '格式',
 	'Data' => '資料',
-	
+
 	'Database' => '資料庫',
 	'DB' => '資料庫',
 	'Use' => '使用',
@@ -101,10 +103,10 @@ $translations = array(
 	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
 	'Database schema' => '資料庫結構',
-	
+
 	// link to current database schema layout
 	'Permanent link' => '永久連結',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -128,7 +130,7 @@ $translations = array(
 	'Copy' => '複製',
 	'Tables have been copied.' => '資料表已經複製',
 	'overwrite' => '覆蓋',
-	
+
 	'Routines' => '程序',
 	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響',
 	'Call' => '呼叫',
@@ -141,7 +143,7 @@ $translations = array(
 	'Alter function' => '修改函式',
 	'Alter procedure' => '修改預存程序',
 	'Return type' => '回傳類型',
-	
+
 	'Events' => '事件',
 	'Event has been dropped.' => '已刪除事件。',
 	'Event has been altered.' => '已修改事件。',
@@ -154,7 +156,7 @@ $translations = array(
 	'Start' => '開始',
 	'End' => '結束',
 	'On completion preserve' => '在完成後儲存',
-	
+
 	'Tables' => '資料表',
 	'Tables and views' => '資料表和檢視表',
 	'Table' => '資料表',
@@ -187,12 +189,12 @@ $translations = array(
 	'Move down' => '下移',
 	'Remove' => '移除',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加 %s。',
-	
+
 	'Partition by' => '分區類型',
 	'Partitions' => '分區',
 	'Partition name' => '分區名稱',
 	'Values' => '值',
-	
+
 	'View' => '檢視表',
 	'Materialized view' => '物化視圖',
 	'View has been dropped.' => '已刪除檢視表。',
@@ -200,14 +202,14 @@ $translations = array(
 	'View has been created.' => '已建立檢視表。',
 	'Alter view' => '修改檢視表',
 	'Create view' => '建立檢視表',
-	
+
 	'Indexes' => '索引',
 	'Indexes have been altered.' => '已修改索引。',
 	'Alter indexes' => '修改索引',
 	'Add next' => '新增下一筆',
 	'Index Type' => '索引類型',
-	'Column (length)' => '欄位（長度）',
-	
+	'length' => '長度',
+
 	'Foreign keys' => '外來鍵',
 	'Foreign key' => '外來鍵',
 	'Foreign key has been dropped.' => '已刪除外來鍵。',
@@ -223,7 +225,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => '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.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
-	
+
 	'Triggers' => '觸發器',
 	'Add trigger' => '建立觸發器',
 	'Trigger has been dropped.' => '已刪除觸發器。',
@@ -234,7 +236,7 @@ $translations = array(
 	'Time' => '時間',
 	'Event' => '事件',
 	'Name' => '名稱',
-	
+
 	'select' => '選擇',
 	'Select' => '選擇',
 	'Select data' => '選擇資料',
@@ -260,16 +262,16 @@ $translations = array(
 	'Loading' => '載入中',
 	'Whole result' => '所有結果',
 	'%d byte(s)' => '%d byte(s)',
-	
+
 	'Import' => '匯入',
 	'%d row(s) have been imported.' => '已匯入 %d 行。',
 	'File must be in UTF-8 encoding.' => '檔必須使用UTF-8編碼。',
-	
+
 	// in-place editing in select
 	'Modify' => '修改',
 	'Ctrl+click on a value to modify it.' => '按住Ctrl並按一下某個值進行修改。',
 	'Use edit link to modify this value.' => '使用編輯連結來修改。',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '已新增項目 %s。',
 	'Item has been deleted.' => '該項目已被刪除',
@@ -289,14 +291,14 @@ $translations = array(
 	'Clone' => '複製',
 	'Delete' => '刪除',
 	'You have no privileges to update this table.' => '您沒有許可權更新這個資料表。',
-	
+
 	'E-mail' => '電子郵件',
 	'From' => '來自',
 	'Subject' => '主旨',
 	'Attachments' => '附件',
 	'Send' => '寄出',
 	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
-	
+
 	// data type descriptions
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',
@@ -306,7 +308,7 @@ $translations = array(
 	'Network' => '網路',
 	'Geometry' => '幾何',
 	'Relations' => '關聯',
-	
+
 	'Editor' => '編輯器',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1.$3.$5',
@@ -317,11 +319,11 @@ $translations = array(
 	'now' => '現在',
 	'yes' => '是',
 	'no' => '否',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => '檔案已存在。',
 	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => '修改資料表結構',
 	'Create schema' => '建立資料表結構',
@@ -330,7 +332,7 @@ $translations = array(
 	'Schema has been altered.' => '已修改資料表結構。',
 	'Schema' => '資料表結構',
 	'Invalid schema.' => '無效的資料表結構。',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => '序列',
 	'Create sequence' => '建立序列',
@@ -338,7 +340,7 @@ $translations = array(
 	'Sequence has been created.' => '已建立序列。',
 	'Sequence has been altered.' => '已修改序列。',
 	'Alter sequence' => '修改序列',
-	
+
 	// PostgreSQL user types support
 	'User types' => '使用者類型',
 	'Create type' => '建立類型',

adminer/lang/zh.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
 	'System' => '系统',
@@ -29,7 +31,7 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => '此操作将在成功使用相同的凭据登录后执行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s， 使用PHP扩展 %s',
 	'Refresh' => '刷新',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
 

adminer/plugin.php

@@ -20,9 +20,7 @@ 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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 page_header(lang('Privileges'));
 
 echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";
@@ -14,15 +16,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 cellspacing='0'>\n";
+echo "<table class='odds'>\n";
 echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th></thead>\n";
 
 while ($row = $result->fetch_assoc()) {
-	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";
+	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";
 }
 
 if (!$grant || DB != "") {
-	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 "<tr><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,5 +1,7 @@
 <?php
-$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["procedure"]);
+namespace Adminer;
+
+$PROCEDURE = ($_GET["name"] ?: $_GET["procedure"]);
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 $row = $_POST;
 $row["fields"] = (array) $row["fields"];
@@ -39,12 +41,12 @@ $routine_languages = routine_languages();
 <?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 cellspacing="0" class="nowrap">
+<table 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>
@@ -53,6 +55,8 @@ if (isset($_GET["function"])) {
 <p><?php textarea("definition", $row["definition"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?><?php } ?>
+<?php if ($PROCEDURE != "") { ?>
+<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,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if (support("kill")) {
 	if ($_POST && !$error) {
 		$killed = 0;
@@ -16,13 +18,12 @@ page_header(lang('Process list'), $error);
 
 <form action="" method="post">
 <div class="scrollable">
-<table cellspacing="0" class="nowrap checkable">
+<table class="nowrap checkable odds">
 <?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) {
@@ -34,13 +35,13 @@ foreach (process_list() as $i => $row) {
 		}
 		echo "</thead>\n";
 	}
-	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
+	echo "<tr>" . (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 == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
-			($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>'
+			(JUSH == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
+			(JUSH == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
+			(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>'
 			: h($val)
 		);
 	}

adminer/schema.inc.php

@@ -1,9 +1,11 @@
 <?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"] ? $_GET["schema"] : $_COOKIE["adminer_schema-" . str_replace(".", "_", DB)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
+$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]);
@@ -26,7 +28,7 @@ foreach (table_status('', true) as $table => $table_status) {
 		$field["pos"] = $pos;
 		$schema[$table]["fields"][$name] = $field;
 	}
-	$schema[$table]["pos"] = ($table_pos[$table] ? $table_pos[$table] : array($top, 0));
+	$schema[$table]["pos"] = ($table_pos[$table] ?: array($top, 0));
 	foreach ($adminer->foreignKeys($table) as $val) {
 		if (!$val["db"]) {
 			$left = $base_left;
@@ -61,12 +63,12 @@ foreach ($schema as $name => $table) {
 	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;'>";
 	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><b>' . h($name) . "</b></a>";
 	echo script("qsl('div').onmousedown = schemaMousedown;");
-	
+
 	foreach ($table["fields"] as $field) {
 		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';
 		echo "<br>" . ($field["primary"] ? "<i>$val</i>" : $val);
 	}
-	
+
 	foreach ((array) $table["references"] as $target_name => $refs) {
 		foreach ($refs as $left => $ref) {
 			$left1 = $left - $table_pos[$name][1];
@@ -76,17 +78,20 @@ foreach ($schema as $name => $table) {
 			}
 		}
 	}
-	
+
 	foreach ((array) $referenced[$name] as $target_name => $refs) {
 		foreach ($refs as $left => $columns) {
 			$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;'><div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>";
+				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>"
+				;
 			}
 		}
 	}
-	
+
 	echo "\n</div>\n";
 }
 

adminer/scheme.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $row = $_POST;
 
 if ($_POST && !$error) {

adminer/script.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 header("Content-Type: text/javascript; charset=utf-8");
 
 if ($_GET["script"] == "db") {
@@ -12,10 +14,12 @@ 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]);
-					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($jush == "pgsql" ? "table" : "InnoDB")
-						? "~ $val"
-						: $val
-					));
+					if ($val >= 0) {
+						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);

adminer/select.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["select"];
 $table_status = table_status1($TABLE);
 $indexes = indexes($TABLE);
@@ -22,6 +24,8 @@ foreach ($fields as $key => $field) {
 }
 
 list($select, $group) = $adminer->selectColumnsProcess($columns, $indexes);
+$select = array_unique($select);
+$group = array_unique($group);
 $is_group = count($group) < count($select);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
@@ -31,7 +35,7 @@ if ($_GET["val"] && is_ajax()) {
 	header("Content-Type: text/plain; charset=utf-8");
 	foreach ($_GET["val"] as $unique_idf => $row) {
 		$as = convert_field($fields[key($row)]);
-		$select = array($as ? $as : idf_escape(key($row)));
+		$select = array($as ?: idf_escape(key($row)));
 		$where[] = where_check($unique_idf, $fields);
 		$return = $driver->select($TABLE, $select, $where, $select);
 		if ($return) {
@@ -97,7 +101,7 @@ if ($_POST && !$error) {
 			$affected = 0;
 			$set = array();
 			if (!$_POST["delete"]) {
-				foreach ($columns as $name => $val) { //! should check also for edit or insert privileges
+				foreach ($_POST["fields"] as $name => $val) {
 					$val = process_input($fields[$name]);
 					if ($val !== null && ($_POST["clone"] || $val !== false)) {
 						$set[idf_escape($name)] = ($val !== false ? $val : idf_escape($name));
@@ -144,7 +148,8 @@ if ($_POST && !$error) {
 			}
 			queries_redirect(remove_from_uri($_POST["all"] && $_POST["delete"] ? "page" : ""), $message, $result);
 			if (!$_POST["delete"]) {
-				edit_form($TABLE, $fields, (array) $_POST["fields"], !$_POST["clone"]);
+				$post_fields = (array) $_POST["fields"];
+				edit_form($TABLE, array_intersect_key($fields, $post_fields), $post_fields, !$_POST["clone"]);
 				page_footer();
 				exit;
 			}
@@ -198,14 +203,14 @@ if ($_POST && !$error) {
 				} else {
 					$set = array();
 					foreach ($matches2[1] as $i => $col) {
-						$set[idf_escape($cols[$i])] = ($col == "" && $fields[$cols[$i]]["null"] ? "NULL" : q(str_replace('""', '"', preg_replace('~^"|"$~', '', $col))));
+						$set[idf_escape($cols[$i])] = ($col == "" && $fields[$cols[$i]]["null"] ? "NULL" : q(preg_match('~^".*"$~s', $col) ? str_replace('""', '"', substr($col, 1, -1)) : $col));
 					}
 					$rows[] = $set;
 				}
 			}
 			$result = (!$rows || $driver->insertUpdate($TABLE, $rows, $primary));
 			if ($result) {
-				$result = $driver->commit();
+				$driver->commit();
 			}
 			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
 			$driver->rollback(); // after queries_redirect() to not overwrite error
@@ -226,9 +231,10 @@ $set = null;
 if (isset($rights["insert"]) || !support("table")) {
 	$params = array();
 	foreach ((array) $_GET["where"] as $val) {
-		if (isset($foreign_keys[$val["col"]]) && count($foreign_keys[$val["col"]]) == 1
-			&& ($val["op"] == "=" || (!$val["op"] && (is_array($val["val"]) || !preg_match('~[_%]~', $val["val"]))) // LIKE in Editor
-		)) {
+		if (
+			isset($foreign_keys[$val["col"]]) && count($foreign_keys[$val["col"]]) == 1
+			&& ($val["op"] == "=" || (!$val["op"] && (is_array($val["val"]) || !preg_match('~[_%]~', $val["val"])))) // LIKE in Editor
+		) {
 			$params["set" . "[" . bracket_escape($val["col"]) . "]"] = $val["val"];
 		}
 	}
@@ -288,21 +294,21 @@ if (!$columns && support("table")) {
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
-		if ($jush == "mssql" && $page) {
+		if (JUSH == "mssql" && $page) {
 			$result->seek($limit * $page);
 		}
 		$email_fields = array();
 		echo "<form action='' method='post' enctype='multipart/form-data'>\n";
 		$rows = array();
 		while ($row = $result->fetch_assoc()) {
-			if ($page && $jush == "oracle") {
+			if ($page && JUSH == "oracle") {
 				unset($row["RNUM"]);
 			}
 			$rows[] = $row;
 		}
 
 		// use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
-		if ($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql") {
+		if ($_GET["page"] != "last" && $limit != "" && $group && $is_group && JUSH == "sql") {
 			$found_rows = $connection->result(" SELECT FOUND_ROWS()"); // space to allow mysql.trace_mode
 		}
 
@@ -312,7 +318,7 @@ if (!$columns && support("table")) {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
 
 			echo "<div class='scrollable'>";
-			echo "<table id='table' cellspacing='0' class='nowrap checkable'>";
+			echo "<table id='table' class='nowrap checkable odds'>";
 			echo script("mixin(qs('#table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true), onkeydown: editingKeydown});");
 			echo "<thead><tr>" . (!$group && $select
 				? ""
@@ -361,9 +367,6 @@ if (!$columns && support("table")) {
 			echo ($backward_keys ? "<th>" . lang('Relations') : "") . "</thead>\n";
 
 			if (is_ajax()) {
-				if ($limit % 2 == 1 && $page % 2 == 1) {
-					odd();
-				}
 				ob_end_clean();
 			}
 
@@ -379,14 +382,14 @@ if (!$columns && support("table")) {
 				}
 				$unique_idf = "";
 				foreach ($unique_array as $key => $val) {
-					if (($jush == "sql" || $jush == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && strlen($val) > 64) {
+					if ((JUSH == "sql" || JUSH == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && strlen($val) > 64) {
 						$key = (strpos($key, '(') ? $key : idf_escape($key)); //! columns looking like functions
-						$key = "MD5(" . ($jush != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
+						$key = "MD5(" . (JUSH != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
 						$val = md5($val);
 					}
 					$unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val === false ? "f" : $val) : "null%5B%5D=" . urlencode($key));
 				}
-				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>"
+				echo "<tr>" . (!$group && $select ? "" : "<td>"
 					. checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]))
 					. ($is_group || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "' class='edit'>" . lang('edit') . "</a>")
 				);
@@ -436,7 +439,7 @@ if (!$columns && support("table")) {
 						$val = select_value($val, $link, $field, $text_length);
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
-						$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
+						$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key] && !$field["generated"];
 						$text = preg_match('~text|lob~', $field["type"]);
 						echo "<td id='$id'";
 						if (($_GET["modify"] && $editable) || $value !== null) {
@@ -446,7 +449,7 @@ if (!$columns && support("table")) {
 							$long = strpos($val, "<i>…</i>");
 							echo " data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
 								. ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'")
-								. ">$val</td>"
+								. ">$val"
 							;
 						}
 					}
@@ -472,7 +475,7 @@ if (!$columns && support("table")) {
 				if ($_GET["page"] != "last") {
 					if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) {
 						$found_rows = ($page ? $page * $limit : 0) + count($rows);
-					} elseif ($jush != "sql" || !$is_group) {
+					} elseif (JUSH != "sql" || !$is_group) {
 						$found_rows = ($is_group ? false : found_rows($table_status, $where));
 						if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
 							// slow with big tables
@@ -503,7 +506,7 @@ if (!$columns && support("table")) {
 						: floor(($found_rows - 1) / $limit)
 					);
 					echo "<fieldset>";
-					if ($jush != "simpledb") {
+					if (JUSH != "simpledb") {
 						echo "<legend><a href='" . h(remove_from_uri("page")) . "'>" . lang('Page') . "</a></legend>";
 						echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };");
 						echo pagination(0, $page) . ($page > 5 ? " …" : "");
@@ -529,7 +532,8 @@ if (!$columns && support("table")) {
 				echo "<fieldset>";
 				echo "<legend>" . lang('Whole result') . "</legend>";
 				$display_rows = ($exact_count ? "" : "~ ") . $found_rows;
-				echo checkbox("all", 1, 0, ($found_rows !== false ? ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) : ""), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
+				$onclick = "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);";
+				echo checkbox("all", 1, 0, ($found_rows !== false ? ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) : ""), $onclick) . "\n";
 				echo "</fieldset>\n";
 
 				if ($adminer->selectCommandPrint()) {
@@ -570,7 +574,7 @@ if (!$columns && support("table")) {
 				echo "<div>";
 				echo "<a href='#import'>" . lang('Import') . "</a>";
 				echo script("qsl('a').onclick = partial(toggle, 'import');", "");
-				echo "<span id='import' class='hidden'>: ";
+				echo "<span id='import'" . ($_POST["import"] ? "" : " class='hidden'") . ">: ";
 				echo "<input type='file' name='csv_file'> ";
 				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select
 				echo " <input type='submit' name='import' value='" . lang('Import') . "'>";

adminer/sequence.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $SEQUENCE = $_GET["sequence"];
 $row = $_POST;
 

adminer/sql.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 if (!$error && $_POST["export"]) {
 	dump_headers("sql");
 	$adminer->dumpTable("", "");
@@ -50,7 +52,7 @@ if (!$error && $_POST) {
 		$delimiter = ";";
 		$offset = 0;
 		$empty = true;
-		$connection2 = connect(); // connection for exploring indexes and EXPLAIN (to not replace FOUND_ROWS()) //! PDO - silent error
+		$connection2 = connect($adminer->credentials()); // connection for exploring indexes and EXPLAIN (to not replace FOUND_ROWS()) //! PDO - silent error
 		if (is_object($connection2) && DB != "") {
 			$connection2->select_db(DB);
 			if ($_GET["ns"] != "") {
@@ -59,7 +61,7 @@ if (!$error && $_POST) {
 		}
 		$commands = 0;
 		$errors = array();
-		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . ($jush == "pgsql" ? '|\$[^$]*\$' : '');
+		$parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : '');
 		$total_start = microtime(true);
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
 		$dump_format = $adminer->dumpFormat();
@@ -81,7 +83,7 @@ if (!$error && $_POST) {
 					$offset = $pos + strlen($found);
 
 					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
-						$c_style_escapes = is_c_style_escapes() || ($jush == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
+						$c_style_escapes = $driver->hasCStyleEscapes() || (JUSH == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
 
 						$pattern = ($found == '/*' ? '\*/'
 							: ($found == '[' ? ']'
@@ -105,8 +107,8 @@ if (!$error && $_POST) {
 						$empty = false;
 						$q = substr($query, 0, $pos);
 						$commands++;
-						$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
-						if ($jush == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
+						$print = "<pre id='sql-$commands'><code class='jush-" . JUSH . "'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
+						if (JUSH == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
 							// PHP doesn't support setting SQLITE_LIMIT_ATTACHED
 							echo $print;
 							echo "<p class='error'>" . lang('ATTACH queries are not supported.') . "\n";
@@ -233,7 +235,7 @@ if (!isset($_GET["import"])) {
 	echo script(($_POST ? "" : "qs('textarea').focus();\n") . "qs('#form').onsubmit = partial(sqlSubmit, qs('#form'), '" . js_escape(remove_from_uri("sql|limit|error_stops|only_errors|history")) . "');");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
-	
+
 } else {
 	echo "<fieldset><legend>" . lang('File upload') . "</legend><div>";
 	$gz = (extension_loaded("zlib") ? "[.gz]" : "");
@@ -263,7 +265,7 @@ if (!isset($_GET["import"]) && $history) {
 		list($q, $time, $elapsed) = $val;
 		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a>"
 			. " <span class='time' title='" . @date('Y-m-d', $time) . "'>" . @date("H:i:s", $time) . "</span>" // @ - time zone may be not set
-			. " <code class='jush-$jush'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>")
+			. " <code class='jush-" . JUSH . "'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>")
 			. ($elapsed ? " <span class='time'>($elapsed)</span>" : "")
 			. "<br>\n"
 		;

adminer/static/default.css

@@ -1,5 +1,5 @@
 /** @author Ondrej Valka, http://valka.info */
-body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; width: -moz-fit-content; width: fit-content; }
+body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; min-width: fit-content; }
 a { color: blue; text-decoration: none; }
 a:visited { color: navy; }
 a:link:hover, a:visited:hover { color: red; text-decoration: underline; }
@@ -22,10 +22,12 @@ td img { max-width: 200px; max-height: 200px; }
 code { background: #eee; }
 tbody tr:hover td, tbody tr:hover th { background: #eee; }
 pre { margin: 1em 0 0; }
+td pre { margin: 0; }
 pre, textarea { font: 100%/1.25 monospace; }
 pre.jush { background: #fff; }
 input, textarea { box-sizing: border-box; }
 input, select { vertical-align: middle; }
+input[type="radio"] { vertical-align: text-bottom; }
 input.default { box-shadow: 1px 1px 1px #777; }
 input.required { box-shadow: 1px 1px 1px red; }
 input.maxlength { box-shadow: 1px 1px 1px red; }
@@ -45,7 +47,7 @@ input.wayoff { left: -1000px; position: absolute; }
 .date { color: #7F007F; }
 .enum { color: #007F7F; }
 .binary { color: red; }
-.odd td { background: #F5F5F5; }
+.odds tbody tr:nth-child(2n) td { background: #F5F5F5; }
 .js .checkable .checked td, .js .checkable .checked th { background: #ddf; }
 .time { color: silver; font-size: 70%; }
 .function { text-align: right; }
@@ -59,7 +61,7 @@ input.wayoff { left: -1000px; position: absolute; }
 .explain { white-space: pre; }
 .icon { width: 18px; height: 18px; background-color: navy; }
 .icon:hover { background-color: red; }
-.size { width: 6ex; }
+.size { width: 7ex; }
 .help { cursor: help; }
 .footer { position: sticky; bottom: 0; margin-right: -20px; border-top: 20px solid rgba(255, 255, 255, .7); border-image: linear-gradient(rgba(255, 255, 255, .2), #fff) 100% 0; }
 .footer > div { background: #fff; padding: 0 0 .5em; }
@@ -68,18 +70,18 @@ input.wayoff { left: -1000px; position: absolute; }
 .logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
 .loadmore { margin-left: 1ex; }
 /* .edit used in designs */
-#menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
+#menu { position: absolute; margin: 10px 0 0; top: 2em; left: 0; width: 19em; }
 #menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
 #logins li, #tables li { list-style: none; }
 #dbs { overflow: hidden; }
 #logins, #tables { white-space: nowrap; overflow: hidden; }
 #logins a, #tables a, #tables span { background: #fff; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
-#lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; }
+#lang { position: absolute; top: -2.6em; left: 0; padding: .3em 1em; }
 #breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: #eee; height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; }
 #h1 { color: #777; text-decoration: none; font-style: italic; }
 #version { color: red; }
-#schema { margin-left: 60px; position: relative; -moz-user-select: none; -webkit-user-select: none; }
+#schema { margin-left: 60px; position: relative; user-select: none; -webkit-user-select: none; }
 #schema .table { border: 1px solid silver; padding: 0 2px; cursor: move; position: absolute; }
 #schema .references { position: absolute; }
 #help { position: absolute; border: 1px solid #999; background: #eee; padding: 5px; font-family: monospace; z-index: 1; }
@@ -96,9 +98,10 @@ input.wayoff { left: -1000px; position: absolute; }
 
 @media all and (max-width: 880px) {
 	.pages { left: auto; }
+	.logout { position: static; padding: 0 1em 1em; }
 	#menu { position: static; width: auto; }
 	#content { margin-left: 10px; }
-	#lang { position: static; border-top: 1px solid #999; }
+	#lang { position: static; }
 	#breadcrumb { left: auto; }
 	.rtl .pages { right: auto; }
 	.rtl #content { margin-right: 10px; }

adminer/static/editing.js

@@ -29,9 +29,9 @@ function bodyLoad(version, maria) {
 					}
 				}
 
-				obj[key] = (maria ? obj[key].replace('dev.mysql.com/doc/mysql/en/', 'mariadb.com/kb/en/') : obj[key]) // MariaDB
-					.replace('/doc/mysql/', '/doc/refman/' + version + '/') // MySQL
-					.replace('/docs/current/', '/docs/' + version) // PostgreSQL
+				obj[key] = (maria ? obj[key].replace('dev.mysql.com/doc/mysql', 'mariadb.com/kb') : obj[key]) // MariaDB
+					.replace('/doc/mysql', '/doc/refman/' + version) // MySQL
+					.replace('/docs/current', '/docs/' + version) // PostgreSQL
 				;
 			}
 		}
@@ -238,9 +238,13 @@ function editFields() {
 	els = qsa('[name$="[type]"]');
 	for (var i = 0; i < els.length; i++) {
 		mixin(els[i], {
-			onfocus: function () { lastType = selectValue(this); },
+			onfocus: function () {
+				lastType = selectValue(this);
+			},
 			onchange: editingTypeChange,
-			onmouseover: function (event) { helpMouseover.call(this, event, getTarget(event).value, 1) },
+			onmouseover: function (event) {
+				helpMouseover.call(this, event, getTarget(event).value, 1);
+			},
 			onmouseout: helpMouseout
 		});
 	}
@@ -286,7 +290,8 @@ function editingClick(event) {
 function editingInput(event) {
 	var el = getTarget(event);
 	if (/\[default]$/.test(el.name)) {
-		 el.previousSibling.checked = true;
+		 el.previousElementSibling.checked = true;
+		 el.previousElementSibling.selectedIndex = Math.max(el.previousElementSibling.selectedIndex, 1);
 	}
 }
 
@@ -355,8 +360,9 @@ function editingAddRow(focus) {
 		if (/\[(orig|field|comment|default)/.test(tags[i].name)) {
 			tags2[i].value = '';
 		}
-		if (/\[(has_default)/.test(tags[i].name)) {
+		if (/\[(generated)/.test(tags[i].name)) {
 			tags2[i].checked = false;
+			tags2[i].selectedIndex = 0;
 		}
 	}
 	tags[0].oninput = editingNameChange;
@@ -418,8 +424,9 @@ function editingTypeChange() {
 			}
 			el.oninput.apply(el);
 		}
-		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
+		if (lastType == 'timestamp' && el.name == name + '[generated]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
+			el.selectedIndex = 0;
 		}
 		if (el.name == name + '[collation]') {
 			alterClass(el, 'hidden', !/(char|text|enum|set)$/.test(text));
@@ -500,6 +507,16 @@ function columnShow(checked, column) {
 	}
 }
 
+/** Show or hide index column options
+* @param boolean
+*/
+function indexOptionsShow(checked) {
+	var options = qsa('.idxopts');
+	for (var i=0; i < options.length; i++) {
+		alterClass(options[i], 'hidden', !checked);
+	}
+}
+
 /** Display partition options
 * @this HTMLSelectElement
 */
@@ -682,7 +699,7 @@ var that, x, y; // em and tablePos defined in schema.inc.php
 * @this HTMLElement
 */
 function schemaMousedown(event) {
-	if ((event.which ? event.which : event.button) == 1) {
+	if ((event.which || event.button) == 1) {
 		that = this;
 		x = event.clientX - this.offsetLeft;
 		y = event.clientY - this.offsetTop;
@@ -701,7 +718,7 @@ function schemaMousemove(event) {
 		for (var i=0; i < divs.length; i++) {
 			if (divs[i].className == 'references') {
 				var div2 = qs('[id="' + (/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4) + '"]');
-				var ref = (tablePos[divs[i].title] ? tablePos[divs[i].title] : [ div2.parentNode.offsetTop / em, 0 ]);
+				var ref = (tablePos[divs[i].title] || [ div2.parentNode.offsetTop / em, 0 ]);
 				var left1 = -1;
 				var id = divs[i].id.replace(/^ref.(.+)-.+/, '$1');
 				if (divs[i].parentNode != div2.parentNode) {

adminer/static/functions.js

@@ -884,7 +884,8 @@ function addEvent(el, action, handler) {
 * @param HTMLElement
 */
 function focus(el) {
-	setTimeout(function () { // this has to be an anonymous function because Firefox passes some arguments to setTimeout callback
+	setTimeout(function () {
+		// this has to be an anonymous function because Firefox passes some arguments to setTimeout callback
 		el.focus();
 	}, 0);
 }

adminer/table.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["table"];
 $fields = fields($TABLE);
 if (!$fields) {
@@ -24,45 +26,64 @@ if ($fields) {
 	$adminer->tableStructurePrint($fields);
 }
 
-if (!is_view($table_status)) {
-	if (support("indexes")) {
-		echo "<h3 id='indexes'>" . lang('Indexes') . "</h3>\n";
-		$indexes = indexes($TABLE);
-		if ($indexes) {
-			$adminer->tableIndexesPrint($indexes);
-		}
-		echo '<p class="links"><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
+if (support("indexes") && $driver->supportsIndex($table_status)) {
+	echo "<h3 id='indexes'>" . lang('Indexes') . "</h3>\n";
+	$indexes = indexes($TABLE);
+	if ($indexes) {
+		$adminer->tableIndexesPrint($indexes);
 	}
+	echo '<p class="links"><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
+}
 
+if (!is_view($table_status)) {
 	if (fk_support($table_status)) {
 		echo "<h3 id='foreign-keys'>" . lang('Foreign keys') . "</h3>\n";
 		$foreign_keys = foreign_keys($TABLE);
 		if ($foreign_keys) {
-			echo "<table cellspacing='0'>\n";
+			echo "<table>\n";
 			echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td></thead>\n";
 			foreach ($foreign_keys as $name => $foreign_key) {
 				echo "<tr title='" . h($name) . "'>";
-				echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
+				echo "<th><i>" . implode("</i>, <i>", array_map('Adminer\h', $foreign_key["source"])) . "</i>";
 				echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ($foreign_key["ns"] != "" ? preg_replace('~ns=[^&]*~', "ns=" . urlencode($foreign_key["ns"]), ME) : ME)) . "table=" . urlencode($foreign_key["table"]) . "'>"
-					. ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . ($foreign_key["ns"] != "" ? "<b>" . h($foreign_key["ns"]) . "</b>." : "") . h($foreign_key["table"])
+					. ($foreign_key["db"] != "" && $foreign_key["db"] != DB ? "<b>" . h($foreign_key["db"]) . "</b>." : "")
+					. ($foreign_key["ns"] != "" && $foreign_key["ns"] != $_GET["ns"] ? "<b>" . h($foreign_key["ns"]) . "</b>." : "")
+					. h($foreign_key["table"])
 					. "</a>"
 				;
-				echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
-				echo "<td>" . h($foreign_key["on_delete"]) . "\n";
-				echo "<td>" . h($foreign_key["on_update"]) . "\n";
+				echo "(<i>" . implode("</i>, <i>", array_map('Adminer\h', $foreign_key["target"])) . "</i>)";
+				echo "<td>" . h($foreign_key["on_delete"]);
+				echo "<td>" . h($foreign_key["on_update"]);
 				echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
+				echo "\n";
 			}
 			echo "</table>\n";
 		}
 		echo '<p class="links"><a href="' . h(ME) . 'foreign=' . urlencode($TABLE) . '">' . lang('Add foreign key') . "</a>\n";
 	}
+
+	if (support("check")) {
+		echo "<h3 id='checks'>" . lang('Checks') . "</h3>\n";
+		$check_constraints = $driver->checkConstraints($TABLE);
+		if ($check_constraints) {
+			echo "<table>\n";
+			foreach ($check_constraints as $key => $val) {
+				echo "<tr title='" . h($key) . "'>";
+				echo "<td><code class='jush-" . JUSH . "'>" . h($val);
+				echo "<td><a href='" . h(ME . 'check=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>";
+				echo "\n";
+			}
+			echo "</table>\n";
+		}
+		echo '<p class="links"><a href="' . h(ME) . 'check=' . urlencode($TABLE) . '">' . lang('Create check') . "</a>\n";
+	}
 }
 
 if (support(is_view($table_status) ? "view_trigger" : "trigger")) {
 	echo "<h3 id='triggers'>" . lang('Triggers') . "</h3>\n";
 	$triggers = triggers($TABLE);
 	if ($triggers) {
-		echo "<table cellspacing='0'>\n";
+		echo "<table>\n";
 		foreach ($triggers as $key => $val) {
 			echo "<tr valign='top'><td>" . h($val[0]) . "<td>" . h($val[1]) . "<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
 		}

adminer/trigger.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TABLE = $_GET["trigger"];
 $name = $_GET["name"];
 $trigger_options = trigger_options();
@@ -8,7 +10,7 @@ if ($_POST) {
 	if (!$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_options["Event"]) && in_array($_POST["Type"], $trigger_options["Type"])) {
 		// don't use drop_create() because there may not be more triggers for the same action
 		$on = " ON " . table($TABLE);
-		$drop = "DROP TRIGGER " . idf_escape($name) . ($jush == "pgsql" ? $on : "");
+		$drop = "DROP TRIGGER " . idf_escape($name) . (JUSH == "pgsql" ? $on : "");
 		$location = ME . "table=" . urlencode($TABLE);
 		if ($_POST["drop"]) {
 			query_redirect($drop, $location, lang('Trigger has been dropped.'));
@@ -33,7 +35,7 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 ?>
 
 <form action="" method="post" id="form">
-<table cellspacing="0" class="layout">
+<table class="layout">
 <tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "triggerChange(/^" . preg_quote($TABLE, "/") . "_[ba][iud]$/, '" . js_escape($TABLE) . "', this.form);"); ?>
 <tr><th><?php echo lang('Event'); ?><td><?php echo html_select("Event", $trigger_options["Event"], $row["Event"], "this.form['Timing'].onchange();"); ?>
 <?php echo (in_array("UPDATE OF", $trigger_options["Event"]) ? " <input name='Of' value='" . h($row["Of"]) . "' class='hidden'>": ""); ?>
@@ -44,6 +46,8 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 <p><?php textarea("Statement", $row["Statement"]); ?>
 <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 } ?>
+<?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/type.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $TYPE = $_GET["type"];
 $row = $_POST;
 
@@ -22,9 +24,17 @@ if (!$row) {
 <p>
 <?php
 if ($TYPE != "") {
+	$types = $driver->types();
+	$enums = type_values($types[$TYPE]);
+	if ($enums) {
+		echo "<code class='jush-" . JUSH . "'>ENUM (" . h($enums) . ")</code>\n<p>";
+	}
 	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $TYPE)) . "\n";
 } else {
-	echo "<input name='name' value='" . h($row['name']) . "' autocapitalize='off'>\n";
+	echo lang('Name') . ": <input name='name' value='" . h($row['name']) . "' autocapitalize='off'>\n";
+	echo doc_link(array(
+		'pgsql' => "datatype-enum.html",
+	), "?");
 	textarea("as", $row["as"]);
 	echo "<p><input type='submit' value='" . lang('Save') . "'>\n";
 }

adminer/user.inc.php

@@ -1,4 +1,6 @@
 <?php
+namespace Adminer;
+
 $USER = $_GET["user"];
 $privileges = array("" => array("All privileges" => ""));
 foreach (get_rows("SHOW PRIVILEGES") as $row) {
@@ -84,10 +86,11 @@ if ($_POST && !$error) {
 					$grant = array_diff($grant, $old_grant);
 					unset($grants[$object]);
 				}
-				if (preg_match('~^(.+)\s*(\(.*\))?$~U', $object, $match) && (
+				if (
+					preg_match('~^(.+)\s*(\(.*\))?$~U', $object, $match) && (
 					!grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection
-					|| !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user")
-				)) {
+					|| !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user"))
+				) {
 					$error = true;
 					break;
 				}
@@ -131,17 +134,17 @@ if ($_POST) {
 
 ?>
 <form action="" method="post">
-<table cellspacing="0" class="layout">
+<table class="layout">
 <tr><th><?php echo lang('Server'); ?><td><input name="host" data-maxlength="60" value="<?php echo h($row["host"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Username'); ?><td><input name="user" data-maxlength="80" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>" autocomplete="new-password">
-<?php if (!$row["hashed"]) { echo script("typePassword(qs('#pass'));"); } ?>
+<?php echo ($row["hashed"] ? "" : script("typePassword(qs('#pass'));")); ?>
 <?php echo (min_version(8) ? "" : checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);")); ?>
 </table>
 
 <?php
 //! MAX_* limits, REQUIRE
-echo "<table cellspacing='0'>\n";
+echo "<table class='odds'>\n";
 echo "<thead><tr><th colspan='2'>" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level"));
 $i = 0;
 foreach ($grants as $object => $grant) {
@@ -150,16 +153,18 @@ foreach ($grants as $object => $grant) {
 }
 echo "</thead>\n";
 
-foreach (array(
-	"" => "",
-	"Server Admin" => lang('Server'),
-	"Databases" => lang('Database'),
-	"Tables" => lang('Table'),
-	"Columns" => lang('Column'),
-	"Procedures" => lang('Routine'),
-) as $context => $desc) {
+foreach (
+	array(
+		"" => "",
+		"Server Admin" => lang('Server'),
+		"Databases" => lang('Database'),
+		"Tables" => lang('Table'),
+		"Columns" => lang('Column'),
+		"Procedures" => lang('Routine'),
+	) as $context => $desc
+) {
 	foreach ((array) $privileges[$context] as $privilege => $comment) {
-		echo "<tr" . odd() . "><td" . ($desc ? ">$desc<td" : " colspan='2'") . ' lang="en" title="' . h($comment) . '">' . h($privilege);
+		echo "<tr><td" . ($desc ? ">$desc<td" : " colspan='2'") . ' lang="en" title="' . h($comment) . '">' . h($privilege);
 		$i = 0;
 		foreach ($grants as $object => $grant) {
 			$name = "'grants[$i][" . h(strtoupper($privilege)) . "]'";
@@ -184,6 +189,8 @@ echo "</table>\n";
 ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', "$USER@$_GET[host]")); ?><?php } ?>
+<?php if (isset($_GET["host"])) { ?>
+<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', "$USER@$_GET[host]")); ?>
+<?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>