diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php index 170c6f62..d5af5519 100644 --- a/adminer/drivers/sqlite.inc.php +++ b/adminer/drivers/sqlite.inc.php @@ -429,7 +429,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) { function alter_indexes($table, $alter) { foreach ($alter as $val) { - if (!queries(($val[2] ? "DROP INDEX" : "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)) . " $val[1]")) { //! primary key must be created in CREATE TABLE + if (!queries(($val[2] ? "DROP INDEX" : "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)) . " $val[1]")) { return false; } } diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php index 6a4de6af..cb9f5c10 100644 --- a/adminer/indexes.inc.php +++ b/adminer/indexes.inc.php @@ -6,6 +6,10 @@ if (ereg("MyISAM|Maria", $table_status["Engine"])) { $index_types[] = "FULLTEXT"; } $indexes = indexes($TABLE); +if ($jush == "sqlite") { // doesn't support primary key + unset($index_types[0]); + unset($indexes[""]); +} if ($_POST && !$error && !$_POST["add"]) { $alter = array(); foreach ($_POST["indexes"] as $index) { diff --git a/todo.txt b/todo.txt index 5d68a1de..96a3d046 100644 --- a/todo.txt +++ b/todo.txt @@ -26,6 +26,7 @@ Saving of MySQL 5 BIT data type - don't use quote() ? Geometry support SQLite: +ASC and DESC instead of text length in index Delimiter in export and SQL command Backward keys in Editor