archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-01-25 14:42:47 +00:00
Code Issues Projects Releases Wiki Activity

将DbSession里的数据库字段key改为cookie

Browse Source
This commit is contained in:
welefen 2015-07-14 18:12:12 +08:00
parent 08dd005a2e
commit edc32eb849
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Lib/Driver/Session/DbSession.js
View File

@ -5,11 +5,11 @@
* DROP TABLE IF EXISTS `think_session`;
CREATE TABLE `think_session` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`key` varchar(255) NOT NULL DEFAULT '',
`cookie` varchar(255) NOT NULL DEFAULT '',
`data` text,
`expire` bigint(11) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `cookie` (`key`),
UNIQUE KEY `cookie` (`cookie`),
KEY `expire` (`expire`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
*
@ -36,7 +36,7 @@ module.exports = Cache(function(){
*/
init: function(options){
this.super_('init', options);
this.key = this.options.cookie;
this.cookie = this.options.cookie;
this.data = {};
this.isChanged = false;
if (!model) {
@ -51,10 +51,10 @@ module.exports = Cache(function(){
initData: function(){
if (!this.promise) {
var self = this;
this.promise = model.where({key: this.key}).find().then(function(data){
this.promise = model.where({cookie: this.cookie}).find().then(function(data){
if (isEmpty(data)) {
return model.add({
key: self.key,
cookie: self.cookie,
expire: Date.now() + self.options.timeout * 1000
});
}
@ -119,7 +119,7 @@ module.exports = Cache(function(){
if (self.isChanged) {
data.data = JSON.stringify(self.data);
}
return model.where({key: self.key}).update(data);
return model.where({cookie: self.cookie}).update(data);
});
},
/**

22
test/Lib/Driver/Session/DbSession.js
View File

@ -23,16 +23,16 @@ describe('before', function(){
if (sql === 'SHOW COLUMNS FROM `think_session`') {
return getPromise([
{ Field: 'id',Type: 'int(11) unsigned',Null: 'NO',Key: 'PRI',Default: null,Extra: 'auto_increment' },
{ Field: 'key',Type: 'varchar(255)',Null: 'NO',Key: 'UNI',Default: '',Extra: '' },
{ Field: 'cookie',Type: 'varchar(255)',Null: 'NO',Key: 'UNI',Default: '',Extra: '' },
{ Field: 'data',Type: 'text',Null: 'YES',Key: '',Default: null,Extra: '' },
{ Field: 'expire',Type: 'bigint(11)',Null: 'NO',Key: 'MUL',Default: null,Extra: '' }
]);
}else if (sql === "SELECT * FROM `think_session` WHERE ( `key` = 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_' ) LIMIT 1") {
return getPromise([ { id: 1,key: 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_',data: '{"name":"suredy"}',expire: 1509896404697 } ])
}else if (sql === "SELECT * FROM `think_session` WHERE ( `key` = 'expired' ) LIMIT 1") {
return getPromise([ { id: 1,key: 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_',data: '{"name":"suredy"}',expire: 1309896404697 } ])
}else if (sql === "SELECT * FROM `think_session` WHERE ( `key` = 'dataempty' ) LIMIT 1") {
return getPromise([ { id: 1,key: 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_',data: '',expire: 1409896404697 } ])
}else if (sql === "SELECT * FROM `think_session` WHERE ( `cookie` = 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_' ) LIMIT 1") {
return getPromise([ { id: 1,cookie: 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_',data: '{"name":"suredy"}',expire: 1509896404697 } ])
}else if (sql === "SELECT * FROM `think_session` WHERE ( `cookie` = 'expired' ) LIMIT 1") {
return getPromise([ { id: 1,cookie: 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_',data: '{"name":"suredy"}',expire: 1309896404697 } ])
}else if (sql === "SELECT * FROM `think_session` WHERE ( `cookie` = 'dataempty' ) LIMIT 1") {
return getPromise([ { id: 1,cookie: 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_',data: '',expire: 1409896404697 } ])
}
return getPromise([]);
})
@ -42,12 +42,12 @@ describe('before', function(){
describe('DbSession', function(){
it('init', function(){
var instance = DbSession();
assert.equal(instance.key, undefined);
assert.equal(instance.cookie, undefined);
assert.equal(instance.isChanged, false)
})
it('init with cookie', function(){
var instance = DbSession({cookie: 'welefen'});
assert.equal(instance.key, 'welefen');
assert.equal(instance.cookie, 'welefen');
assert.equal(instance.isChanged, false)
})
it('initData', function(done){
@ -148,7 +148,7 @@ describe('DbSession', function(){
}
instance.flush().then(function(data){
var sql = instance.model.getLastSql().trim();
assert.equal(sql, "UPDATE `think_session` SET `expire`=1409859026812 WHERE ( `key` = 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_' )")
assert.equal(sql, "UPDATE `think_session` SET `expire`=1409859026812 WHERE ( `cookie` = 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_' )")
Date.now = now;
done();
})
@ -162,7 +162,7 @@ describe('DbSession', function(){
instance.isChanged = true;
instance.flush().then(function(data){
var sql = instance.model.getLastSql().trim();
var s = "UPDATE `think_session` SET `expire`=1409880626812,`data`='{\\\"name\\\":\\\"suredy\\\"}' WHERE ( `key` = 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_' )";
var s = "UPDATE `think_session` SET `expire`=1409880626812,`data`='{\\\"name\\\":\\\"suredy\\\"}' WHERE ( `cookie` = 'Nru4DV9uYy3jUP8_MDl4l-wbkVe-gQO_' )";
assert.equal(sql, s)
Date.now = now;
done();