hocusfokus/hocusfokus-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.6.0

Browse Source
This commit is contained in:
Bastian Allgeier
2021-11-16 14:53:37 +01:00
parent 7388fa4d24
commit 92b7a330fa
318 changed files with 20017 additions and 6878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kirby/src/Database/Query.php
View File

@@ -341,7 +341,7 @@ class Query
*/
public function innerJoin($table, $on)
{
return $this->join($table, $on, 'inner');
return $this->join($table, $on, 'inner join');
}
/**
@@ -710,7 +710,7 @@ class Query
$this->database->fail();
}
$result = $this->database->execute($sql['query'], $sql['bindings'], $params);
$result = $this->database->execute($sql['query'], $sql['bindings']);
$this->reset();
@@ -1009,9 +1009,8 @@ class Query
$key = $sql->columnName($this->table, $args[0]);
// ->where('username', 'in', ['myuser', 'myotheruser']);
$predicate = trim(strtoupper($args[1]));
if (is_array($args[2]) === true) {
$predicate = trim(strtoupper($args[1]));
if (in_array($predicate, ['IN', 'NOT IN']) === false) {
throw new InvalidArgumentException('Invalid predicate ' . $predicate);
}
@@ -1029,11 +1028,8 @@ class Query
// add that to the where clause in parenthesis
$result = $key . ' ' . $predicate . ' (' . implode(', ', $values) . ')';
$this->bindings($bindings);
// ->where('username', 'like', 'myuser');
} else {
$predicate = trim(strtoupper($args[1]));
$predicates = [
'=', '>=', '>', '<=', '<', '<>', '!=', '<=>',
'IS', 'IS NOT',
@@ -1051,9 +1047,8 @@ class Query
$bindings[$valueBinding] = $args[2];
$result = $key . ' ' . $predicate . ' ' . $valueBinding;
$this->bindings($bindings);
}
$this->bindings($bindings);
}
break;