GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Various fixes

Browse Source 
Fix OAuth and Realtime issues introduced in 9a515b9234

[DATABASE] Fix an empty default value mistake introduced in
fde929b151

[DATABASE][PostgreSQL] Avoid use of pg_constraint.consrc, which was removed in
PostgreSQL 12.

[DATABASE][MariaDB] Fix a typo introduced in aed2344bd4

[DAEMON] Wrap an assignment inside "switch":
a follow-up to adc689cb15
This commit is contained in:
Alexei Sorokin 2020-10-11 18:29:47 +03:00 committed by Diogo Peralta Cordeiro
parent a67953b840
commit ebfc248ff6
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Oauth_application.php
View File

@ -190,7 +190,7 @@ class Oauth_application extends Managed_DataObject
'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'), 'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'), 'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
'created' => array('type' => 'datetime', 'description' => 'date this record was created'), 'created' => array('type' => 'datetime', 'description' => 'date this record was created'),
'modified' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was modified'), 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
), ),
'primary key' => array('id'), 'primary key' => array('id'),
'unique keys' => array( 'unique keys' => array(

2
lib/database/mysqlschema.php
View File

@ -461,7 +461,7 @@ class MysqlSchema extends Schema
$phrase[] = "ENGINE '{$engine}'"; $phrase[] = "ENGINE '{$engine}'";
} }
if (strtolower($oldProps['TABLE_COLLATION']) !== "{$charset}_bin") { 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 CHARACTER SET '{$charset}'";
$phrase[] = "DEFAULT COLLATE '{$charset}_bin'"; $phrase[] = "DEFAULT COLLATE '{$charset}_bin'";
} }

3
lib/database/pgsqlschema.php
View File

@ -328,7 +328,8 @@ class PgsqlSchema extends Schema
{ {
$data = $this->fetchQueryData( $data = $this->fetchQueryData(
<<<END <<<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" FROM pg_constraint AS "con"
INNER JOIN pg_attribute AS "cols" INNER JOIN pg_attribute AS "cols"
ON "con"."conrelid" = "cols"."attrelid" ON "con"."conrelid" = "cols"."attrelid"

2
lib/database/schema.php
View File

@ -878,7 +878,7 @@ class Schema
{ {
// MDB2_Driver_Common::quote changes empty strings to "NULL". // MDB2_Driver_Common::quote changes empty strings to "NULL".
if ($val === '') { if ($val === '') {
return ''; return "''";
} }
return $this->conn->quote($val); return $this->conn->quote($val);
} }

2
lib/modules/Realtime/classes/Realtime_channel.php
View File

@ -85,7 +85,7 @@ class Realtime_channel extends Managed_DataObject
'created' => ['type' => 'datetime', 'created' => ['type' => 'datetime',
'not null' => true, 'not null' => true,
'description' => 'date this record was created'], 'description' => 'date this record was created'],
'modified' => ['type' => 'datetime', 'modified' => ['type' => 'timestamp',
'not null' => true, 'not null' => true,
'description' => 'date this record was modified'], 'description' => 'date this record was modified'],
], ],

4
lib/util/daemon.php
View File

@ -78,12 +78,12 @@ class Daemon
public function background() public function background()
{ {
// Database connection will likely get lost after forking // Database connection will be likely lost after forking.
$this->resetDb(); $this->resetDb();
// Double-forking. // Double-forking.
foreach (['single', 'double'] as $v) { foreach (['single', 'double'] as $v) {
switch ($pid = pcntl_fork()) { switch (($pid = pcntl_fork())) {
case -1: // error case -1: // error
common_log(LOG_ERR, 'Could not fork.'); common_log(LOG_ERR, 'Could not fork.');
return false; return false;

2
plugins/EmailSummary/classes/Email_summary_status.php
View File

@ -44,7 +44,7 @@ class Email_summary_status extends Managed_DataObject
public $send_summary; // bool not_null default_true public $send_summary; // bool not_null default_true
public $last_summary_id; // int(4) null public $last_summary_id; // int(4) null
public $created; // datetime not_null public $created; // datetime not_null
public $modified; // datetime not_null public $modified; // timestamp not_null
public static function schemaDef() public static function schemaDef()
{ {

2
plugins/Poll/classes/User_poll_prefs.php
View File

@ -41,7 +41,7 @@ class User_poll_prefs extends Managed_DataObject
public $user_id; // int id public $user_id; // int id
public $hide_responses; // bool public $hide_responses; // bool
public $created; // datetime public $created; // datetime
public $modified; // datetime public $modified; // timestamp
/** /**
* The One True Thingy that must be defined and declared. * The One True Thingy that must be defined and declared.