Merge pull request #234 from Mibew/mysql_fix

Add support for MySQL 8 (fixes #232)
This commit is contained in:
Fedor A. Fetisov 2018-08-16 12:25:39 +03:00 committed by GitHub
commit e9b29737c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -104,7 +104,7 @@ requestcallback:
fields: fields:
callbackid: "int NOT NULL auto_increment PRIMARY KEY" callbackid: "int NOT NULL auto_increment PRIMARY KEY"
token: "varchar(64) NOT NULL DEFAULT ''" token: "varchar(64) NOT NULL DEFAULT ''"
function: "varchar(64) NOT NULL" func: "varchar(64) NOT NULL"
arguments: "varchar(1024)" arguments: "varchar(1024)"
indexes: indexes:
token: [token] token: [token]

View File

@ -485,7 +485,7 @@ abstract class AbstractProcessor
$db = Database::getInstance(); $db = Database::getInstance();
$query = "INSERT INTO {requestcallback} ( " $query = "INSERT INTO {requestcallback} ( "
. "token, function, arguments " . "token, func, arguments "
. ") VALUES ( " . ") VALUES ( "
. ":token, :function, :arguments" . ":token, :function, :arguments"
. ")"; . ")";
@ -526,7 +526,7 @@ abstract class AbstractProcessor
} }
return array( return array(
'function' => $callback['function'], 'function' => $callback['func'],
'arguments' => unserialize($callback['arguments']), 'arguments' => unserialize($callback['arguments']),
); );
} }