host/xiaowang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Kirby and Composer dependencies

Browse source
This commit is contained in:
Paul Nicoué 2022-03-22 15:39:39 +01:00
parent f5d3ea5e84
commit ec74d78ba9
382 changed files with 25077 additions and 4955 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kirby/src/Database/Sql/Mysql.php
View file

@ -10,7 +10,7 @@ use Kirby\Database\Sql;
* @package Kirby Database
* @author Bastian Allgeier <bastian@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class Mysql extends Sql

11
kirby/src/Database/Sql/Sqlite.php
View file

@ -10,7 +10,7 @@ use Kirby\Database\Sql;
* @package Kirby Database
* @author Bastian Allgeier <bastian@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://opensource.org/licenses/MIT
*/
class Sqlite extends Sql
@ -53,7 +53,7 @@ class Sqlite extends Sql
*
* @param $table string
* @param $column string
* @param $values boolean Whether the identifier is going to be used for a VALUES clause;
* @param $values bool Whether the identifier is going to be used for a VALUES clause;
* only relevant for SQLite
* @return string
*/
@ -82,9 +82,10 @@ class Sqlite extends Sql
$keys = [];
foreach ($inner['keys'] as $key => $columns) {
// quote each column name and make a list string out of the column names
$columns = implode(', ', array_map(function ($name) {
return $this->quoteIdentifier($name);
}, $columns));
$columns = implode(', ', array_map(
fn ($name) => $this->quoteIdentifier($name),
$columns
));
if ($key === 'primary') {
$inner['query'] .= ',' . PHP_EOL . 'PRIMARY KEY (' . $columns . ')';