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

SQLite: Limit rows in data manipulation without unique key

Browse source
This commit is contained in:
Jakub Vrana 2018-02-01 18:47:57 +01:00
parent e8e3ced948
commit 0866c79afb
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adminer/drivers/pgsql.inc.php
View file

@ -227,7 +227,10 @@ if (isset($_GET["pgsql"])) {
}
function limit1($table, $query, $where) {
return (preg_match('~^INTO~', $query) ? limit($query, $where, 1) : "$query WHERE ctid = (SELECT ctid FROM " . table($table) . "$where LIMIT 1)");
return (preg_match('~^INTO~', $query)
? limit($query, $where, 1)
: " $query WHERE ctid = (SELECT ctid FROM " . table($table) . "$where LIMIT 1)"
);
}
function db_collation($db, $collations) {

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

@ -244,7 +244,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
function limit1($table, $query, $where) {
global $connection;
return ($connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')") ? limit($query, $where, 1) : " $query$where"); //! limit
return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
? limit($query, $where, 1)
: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . "$where LIMIT 1)"
);
}
function db_collation($db, $collations) {

2
changes.txt
View file

@ -9,8 +9,8 @@ MySQL, PostgreSQL: Display warnings
MySQL: Add floor and ceil select functions
MySQL: Add FIND_IN_SET search operator
MariaDB: Support JSON since MariaDB 10.2
SQLite, PostgreSQL: Limit rows in data manipulation without unique key
PostgreSQL: Support routines
PostgreSQL: Limit rows in data manipulation without unique key
PostgreSQL: Allow editing views with uppercase letters (bug #467)
PostgreSQL: Allow now() as default value (bug #525)
SimpleDB: Document that allow_url_fopen is required