beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use primary key instead of LIMIT 1 if available

Browse source
This commit is contained in:
Jakub Vrana 2018-02-05 11:21:19 +01:00
parent d2ed0f7810
commit 89ceb06208
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/drivers/sqlite.inc.php
View file

@ -246,7 +246,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
global $connection; global $connection;
return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')") return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
? limit($query, $where, 1, 0, $separator) ? limit($query, $where, 1, 0, $separator)
: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)" : " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)" //! use primary key in tables with WITHOUT rowid
); );
} }

2
adminer/include/version.inc.php
View file

@ -1,2 +1,2 @@
<?php <?php
$VERSION = "4.6.0"; $VERSION = "4.6.1-dev";

8
adminer/select.inc.php
View file

@ -54,7 +54,7 @@ foreach ($indexes as $index) {
break; break;
} }
} }
if ($oid && $unselected === null) { if ($oid && !$primary) {
$primary = $unselected = array($oid => 0); $primary = $unselected = array($oid => 0);
$indexes[] = array("type" => "PRIMARY", "columns" => array($oid)); $indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
} }
@ -77,7 +77,7 @@ if ($_POST && !$error) {
. convert_fields($columns, $fields, $select) . convert_fields($columns, $fields, $select)
. "\nFROM " . table($TABLE); . "\nFROM " . table($TABLE);
$group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : ""); $group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
if (!is_array($_POST["check"]) || $unselected === array()) { if (!is_array($_POST["check"]) || $primary) {
$query = "SELECT $from$where_check$group_by"; $query = "SELECT $from$where_check$group_by";
} else { } else {
$union = array(); $union = array();
@ -108,7 +108,7 @@ if ($_POST && !$error) {
if ($_POST["clone"]) { if ($_POST["clone"]) {
$query = "INTO " . table($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE); $query = "INTO " . table($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE);
} }
if ($_POST["all"] || ($unselected === array() && is_array($_POST["check"])) || $is_group) { if ($_POST["all"] || ($primary && is_array($_POST["check"])) || $is_group) {
$result = ($_POST["delete"] $result = ($_POST["delete"]
? $driver->delete($TABLE, $where_check) ? $driver->delete($TABLE, $where_check)
: ($_POST["clone"] : ($_POST["clone"]
@ -165,7 +165,7 @@ if ($_POST && !$error) {
$TABLE, $TABLE,
$set, $set,
" WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields), " WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields),
!($is_group || $unselected === array()), !$is_group && !$primary,
" " " "
); );
if (!$result) { if (!$result) {