forked from GNUsocial/gnu-social
Various fixes
Fix OAuth and Realtime issues introduced in9a515b9234
[DATABASE] Fix an empty default value mistake introduced infde929b151
[DATABASE][PostgreSQL] Avoid use of pg_constraint.consrc, which was removed in PostgreSQL 12. [DATABASE][MariaDB] Fix a typo introduced inaed2344bd4
[DAEMON] Wrap an assignment inside "switch": a follow-up toadc689cb15
This commit is contained in:
@@ -461,7 +461,7 @@ class MysqlSchema extends Schema
|
||||
$phrase[] = "ENGINE '{$engine}'";
|
||||
}
|
||||
if (strtolower($oldProps['TABLE_COLLATION']) !== "{$charset}_bin") {
|
||||
$phrase[] = "CONVERT TO CHARACTER SET '{$charset} COLLATE '{$charset}_bin'";
|
||||
$phrase[] = "CONVERT TO CHARACTER SET '{$charset}' COLLATE '{$charset}_bin'";
|
||||
$phrase[] = "DEFAULT CHARACTER SET '{$charset}'";
|
||||
$phrase[] = "DEFAULT COLLATE '{$charset}_bin'";
|
||||
}
|
||||
|
@@ -328,7 +328,8 @@ class PgsqlSchema extends Schema
|
||||
{
|
||||
$data = $this->fetchQueryData(
|
||||
<<<END
|
||||
SELECT "cols"."attname" AS "col", "con"."consrc" AS "check"
|
||||
SELECT "cols"."attname" AS "col",
|
||||
pg_get_expr("con"."conbin", "con"."conrelid") AS "check"
|
||||
FROM pg_constraint AS "con"
|
||||
INNER JOIN pg_attribute AS "cols"
|
||||
ON "con"."conrelid" = "cols"."attrelid"
|
||||
|
@@ -878,7 +878,7 @@ class Schema
|
||||
{
|
||||
// MDB2_Driver_Common::quote changes empty strings to "NULL".
|
||||
if ($val === '') {
|
||||
return '';
|
||||
return "''";
|
||||
}
|
||||
return $this->conn->quote($val);
|
||||
}
|
||||
|
Reference in New Issue
Block a user