From 48b83ab3b412e47159e9cb19604f59be931ae754 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.silence@gmail.com>
Date: Tue, 16 Aug 2016 00:09:08 +0300
Subject: [PATCH] #120 Fix defaults in auth_tokens (pt.2)
---
db/stored/functions.sql | 4 ++--
db/structure/base.sql | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/db/stored/functions.sql b/db/stored/functions.sql
index d638079e5..f09984cff 100644
--- a/db/stored/functions.sql
+++ b/db/stored/functions.sql
@@ -2309,14 +2309,14 @@ BEGIN
DECLARE vSeed int(11) DEFAULT FLOOR(4294967296 * RAND(CURRENT_TIMESTAMP ^ LAST_INSERT_ID() ^ (pAccountID << 10)));
DECLARE vToken char(40) charset ascii DEFAULT SHA1(vSeed);
- WHILE NOT vCreated AND vCounter > 0 DO
+ WHILE NOT vCreated AND vCounter > 0 DO BEGIN
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET vCreated = FALSE;
SET vToken = SHA1(RAND());
INSERT INTO auth_tokens(Token, AccountID, Mask) VALUES (vToken, pAccountID, pRightMask);
SET vCreated = TRUE;
SET vCounter = vCounter - 1;
- END WHILE;
+ END; END WHILE;
RETURN IF(vCreated, vToken, '');
END//
diff --git a/db/structure/base.sql b/db/structure/base.sql
index 45e998558..ad2c4a47a 100644
--- a/db/structure/base.sql
+++ b/db/structure/base.sql
@@ -480,7 +480,7 @@ CREATE TABLE IF NOT EXISTS `auth_tokens` (
`Token` char(40) charset ascii NOT NULL,
`AccountID` int(11) NOT NULL,
`Created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- `Accessed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `Accessed` TIMESTAMP NOT NULL DEFAULT 0,
`Mask` int(11) NOT NULL DEFAULT 0,
UNIQUE KEY `Token` (`Token`),
KEY `AccountID` (`AccountID`)
--
GitLab