Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

web: Fix issue caused by MariaDB 10.2 allowing column defaults to use 

functions but earlier versions and MySQL not allowing it
This commit is contained in:
Kevin Reed 2018-04-18 15:28:16 -05:00
parent ad28e831b6
commit 638f8284a7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/schema.sql
View File

@ -767,7 +767,7 @@ create table token (
token varchar(255) not null,
userid integer not null,
type char not null,
create_time integer not null default unix_timestamp(),
create_time integer not null,
expire_time integer,
primary key (token),
index token_userid (userid)

5
html/inc/boinc_db.inc
View File

@ -783,10 +783,11 @@ class BoincToken {
return $db->lookup('token', 'BoincToken', $clause);
}
static function lookup_valid_token($userid, $token) {
static function lookup_valid_token($userid, $token, $type) {
$db = BoincDb::get();
$token = BoincDb::escape_string($token);
return self::lookup("userid=$userid and token='$token' and expire_time > unix_timestamp()");
$type = BoincDb::escape_string($type);
return self::lookup("userid=$userid and token='$token' and expire_time > unix_timestamp() and type = '$type'");
}
static function enum($where_clause) {

9
html/ops/db_update.php
View File

@ -1080,7 +1080,7 @@ function update_4_5_2018() {
token varchar(255) not null,
userid integer not null,
type char not null,
create_time integer not null default unix_timestamp(),
create_time integer not null,
expire_time integer,
primary key (token),
index token_userid (userid)
@ -1096,6 +1096,12 @@ function update_4_6_2018() {
");
}
function update_4_18_2018() {
do_query("alter table token
modify column create_time integer not null
");
}
// Updates are done automatically if you use "upgrade".
//
// If you need to do updates manually,
@ -1151,6 +1157,7 @@ $db_updates = array (
array(27021, "update_3_8_2018"),
array(27022, "update_4_5_2018"),
array(27023, "update_4_6_2018"),
array(27024, "update_4_18_2018")
);
?>