OSDN > ソフトウェアを探す > コミュニケーション > チャット > webchat > SCM > git > WebChat > コミット

webchat
Fork

WebChat: コミット

チャットシステム

name_hashは被る可能性があるので、primaryではなくindexを指定するようにした

--- a/configure.js

+++ b/configure.js

--- a/init.js

+++ b/init.js

		@@ -40,15 +40,17 @@ module.exports = function(callback){
40	40	}else{
41	41	throw "lastmodifiedが存在しません";
42	42	}
	43	+
	44	+ var Sequelize = require("sequelize");
	45	+ var pool = new Sequelize(config.db_name, config.db_user, config.db_password,{
	46	+ host:config.db_host,
	47	+ port:config.db_port
	48	+ });
	49	+
43	50	var fs = require("fs");
	51	+
44	52	async.waterfall([
45	53	function(next){
46		- var Sequelize = require("sequelize");
47		- var pool = new Sequelize(config.db_name, config.db_user, config.db_password,{
48		- host:config.db_host,
49		- port:config.db_port
50		- });
51		-
52	54	var query = GetCreateQuery(Sequelize,config.alias,"profilelist");
53	55	var profilelist = pool.define("profilelist",query);
54	56	module.exports.GetProfileColletion = profilelist;

		@@ -62,7 +64,6 @@ module.exports = function(callback){
62	64	type:{
63	65	type : "text",
64	66	length : 1,
65		- primary : true,
66	67	},
67	68	};
68	69	var query = GetCreateQuery(Sequelize,def,"ipbanlist");

		@@ -95,25 +96,33 @@ module.exports = function(callback){
95	96	},
96	97	function(exists,next){
97	98	if(exists)
98		- next(null);
	99	+ next(true);
99	100	else
100	101	fs.open("inited","a",function(err,fd){
101	102	fs.closeSync(fd);
102		-
103		- module.exports.GetProfileColletion.drop();
104		- module.exports.GetProfileColletion.sync();
105		-
106		- module.exports.GetIpBanColletion.drop();
107		- module.exports.GetIpBanColletion.sync();
108		-
109		- module.exports.GetRoomInfomation.drop();
110		- module.exports.GetRoomInfomation.sync();
111		-
112	103	next(null);
113	104	});
	105	+ },
	106	+ function(next){
	107	+ module.exports.GetProfileColletion.sync({force:true}).done(next);
	108	+ },
	109	+ function(result,next){
	110	+ pool.getQueryInterface().addIndex(
	111	+ module.exports.GetProfileColletion.tableName,
	112	+ ["name_hash"]
	113	+ ).done(next);
	114	+ },
	115	+ function(result,next){
	116	+ module.exports.GetIpBanColletion.sync({force:true}).done(next);
	117	+ },
	118	+ function(result,next){
	119	+ module.exports.GetRoomInfomation.sync({force:true}).done(next);
114	120	}
115	121	],function(err){
116		- callback(err);
	122	+ if(err)
	123	+ callback(null);
	124	+ else
	125	+ callback(err);
117	126	});
118	127	}
119	128

		@@ -156,7 +165,7 @@ function GetCreateQuery(Sequelize,def,tablename)
156	165	}
157	166	if(typeof(def[key].isnotempty) != "undefined" && def[key].isnotempty)
158	167	option["allowNull"] = true;
159		- else if(typeof(def[key].primary) != "undefined" && def[key].primary)
	168	+ if(typeof(def[key].primary) != "undefined" && def[key].primary)
160	169	option["primaryKey"] = true;
161	170	result[key] = option;
162	171	}

--- a/init.sql

+++ b/init.sql

		@@ -3,6 +3,7 @@ grant select,
3	3	delete,
4	4	create,
5	5	drop,
	6	+ index,
6	7	update on . to user identified by 'user';
7	8	flush privileges;
8	9	CREATE DATABASE IF NOT EXISTS webchat DEFAULT CHARSET=utf8;