MySQL: Descending indexes in MySQL 8 (bug #643)

vrana · vrana · commit 5bebb439a1c0 · 2018-10-27T20:05:04.000+02:00
diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php
@@ -662,7 +662,7 @@ function alter_indexes($table, $alter) {
 	}
 
 	function support($feature) {
-		return preg_match("~database|indexes~", $feature);
+		return preg_match("~database|indexes|descidx~", $feature);
 	}
 
 	function db_collation($db, $collations) {
diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
@@ -632,7 +632,7 @@ function unconvert_field($field, $return) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
+		return preg_match('~^(columns|database|drop_col|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
 	}
 
 	$jush = "mssql";
diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
@@ -1083,11 +1083,11 @@ function unconvert_field($field, $return) {
 	}
 
 	/** Check whether a feature is supported
-	* @param string "comment", "copy", "database", "drop_col", "dump", "event", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
+	* @param string "comment", "copy", "database", "descidx", "drop_col", "dump", "event", "indexes", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
 	* @return bool
 	*/
 	function support($feature) {
-		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . (min_version(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(5) ? "" : "|routine|trigger|view"))) . "~", $feature);
 	}
 
 	function kill_process($val) {
diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
@@ -398,7 +398,7 @@ function unconvert_field($field, $return) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|processlist|scheme|sql|status|table|variables|view|view_trigger)$~', $feature); //!
+		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view|view_trigger)$~', $feature); //!
 	}
 
 	$jush = "oracle";
diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
@@ -824,7 +824,7 @@ function unconvert_field($field, $return) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(database|table|columns|sql|indexes|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
+		return preg_match('~^(database|table|columns|sql|indexes|descidx|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
 	}
 
 	function kill_process($val) {
diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
@@ -770,7 +770,7 @@ function unconvert_field($field, $return) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|dump|indexes|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
+		return preg_match('~^(columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
 	}
 
 	$jush = "sqlite";
diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php
@@ -126,7 +126,7 @@
 				"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 ($jush != "sql" ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
+			echo (support("descidx") ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
 			echo " </span>";
 			$i++;
 		}
diff --git a/changes.txt b/changes.txt
@@ -10,6 +10,7 @@ Increase username maxlength to 80 (bug #623)
 Make maxlength in all fields a soft limit
 MySQL: Support foreign keys created with ANSI quotes (bug #620)
 MySQL: Recognize ON UPDATE current_timestamp() (bug #632, bug #638)
+MySQL: Descending indexes in MySQL 8 (bug #643)
 PostgreSQL: Quote array values in export (bug #621)
 PostgreSQL: Export DESC indexes (bug #639)
 PostgreSQL: Support GENERATED BY DEFAULT AS IDENTITY in PostgreSQL 10

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ function alter_indexes($table, $alter) {`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`function support($feature) {`
`665`		`- return preg_match("~database\|indexes~", $feature);`
	`665`	`+ return preg_match("~database\|indexes\|descidx~", $feature);`
`666`	`666`	`}`
`667`	`667`
`668`	`668`	`function db_collation($db, $collations) {`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ function unconvert_field($field, $return) {`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`function support($feature) {`
`635`		`- return preg_match('~^(columns\|database\|drop_col\|indexes\|scheme\|sql\|table\|trigger\|view\|view_trigger)$~', $feature); //! routine\|`
	`635`	`+ return preg_match('~^(columns\|database\|drop_col\|indexes\|descidx\|scheme\|sql\|table\|trigger\|view\|view_trigger)$~', $feature); //! routine\|`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`$jush = "mssql";`
Original file line number	Diff line number	Diff line change
`@@ -1083,11 +1083,11 @@ function unconvert_field($field, $return) {`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`	`1085`	`/** Check whether a feature is supported`
`1086`		`- * @param string "comment", "copy", "database", "drop_col", "dump", "event", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"`
	`1086`	`+ * @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"`
`1087`	`1087`	`* @return bool`
`1088`	`1088`	`*/`
`1089`	`1089`	`function support($feature) {`
`1090`		`- return !preg_match("~scheme\|sequence\|type\|view_trigger\|materializedview" . (min_version(5.1) ? "" : "\|event\|partitioning" . (min_version(5) ? "" : "\|routine\|trigger\|view")) . "~", $feature);`
	`1090`	`+ 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);`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`	`1093`	`function kill_process($val) {`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ function unconvert_field($field, $return) {`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`function support($feature) {`
`401`		`- return preg_match('~^(columns\|database\|drop_col\|indexes\|processlist\|scheme\|sql\|status\|table\|variables\|view\|view_trigger)$~', $feature); //!`
	`401`	`+ return preg_match('~^(columns\|database\|drop_col\|indexes\|descidx\|processlist\|scheme\|sql\|status\|table\|variables\|view\|view_trigger)$~', $feature); //!`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`$jush = "oracle";`
Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,7 @@ function unconvert_field($field, $return) {`
`824`	`824`	`}`
`825`	`825`
`826`	`826`	`function support($feature) {`
`827`		`- return preg_match('~^(database\|table\|columns\|sql\|indexes\|comment\|view\|' . (min_version(9.3) ? 'materializedview\|' : '') . 'scheme\|routine\|processlist\|sequence\|trigger\|type\|variables\|drop_col\|kill\|dump)$~', $feature);`
	`827`	`+ 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);`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`function kill_process($val) {`
Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ function unconvert_field($field, $return) {`
`770`	`770`	`}`
`771`	`771`
`772`	`772`	`function support($feature) {`
`773`		`- return preg_match('~^(columns\|database\|drop_col\|dump\|indexes\|move_col\|sql\|status\|table\|trigger\|variables\|view\|view_trigger)$~', $feature);`
	`773`	`+ return preg_match('~^(columns\|database\|drop_col\|dump\|indexes\|descidx\|move_col\|sql\|status\|table\|trigger\|variables\|view\|view_trigger)$~', $feature);`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`$jush = "sqlite";`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@`
`126`	`126`	`"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "')"`
`127`	`127`	`);`
`128`	`128`	`echo ($jush == "sql" \|\| $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");`
`129`		`- echo ($jush != "sql" ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");`
	`129`	`+ echo (support("descidx") ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");`
`130`	`130`	`echo " </span>";`
`131`	`131`	`$i++;`
`132`	`132`	`}`