Skip to content

Commit fb19178

Browse files
Merge pull request #7 from Aperture-Development/bugfix
Bugfix
2 parents 0e5d24c + 40856ff commit fb19178

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

msync/server/sv_mysql.lua

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,27 @@ function MSync.mysql.initialize()
2727
CREATE TABLE IF NOT EXISTS `tbl_msyncdb_version` ( `version` float NOT NULL );
2828
]] ))
2929

30+
initDatabase:addQuery(MSync.DBServer:query( [[
31+
CREATE TABLE IF NOT EXISTS `tbl_server_grp` (
32+
`p_group_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
33+
`group_name` VARCHAR(15) NOT NULL,
34+
UNIQUE INDEX `group_UNIQUE` (`group_name`)
35+
);
36+
]] ))
37+
3038
initDatabase:addQuery(MSync.DBServer:query( [[
3139
CREATE TABLE IF NOT EXISTS `tbl_msync_servers` (
3240
`p_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
33-
`server_name` VARCHAR(55) NOT NULL,
41+
`server_name` VARCHAR(75) NOT NULL,
3442
`options` VARCHAR(100) NOT NULL DEFAULT '[]',
3543
`ip` INT NOT NULL,
3644
`port` VARCHAR(5) NOT NULL,
37-
`server_group` VARCHAR(45),
45+
`server_group` INT UNSIGNED NOT NULL,
46+
FOREIGN KEY (server_group) REFERENCES tbl_server_grp(p_group_id),
3847
UNIQUE INDEX `server_UNIQUE` (`ip`, `port`)
3948
);
4049
]] ))
4150

42-
initDatabase:addQuery(MSync.DBServer:query( [[
43-
CREATE TABLE IF NOT EXISTS `tbl_server_grp` (
44-
`p_group_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
45-
`group_name` VARCHAR(15) NOT NULL,
46-
UNIQUE INDEX `group_UNIQUE` (`group_name`)
47-
);
48-
]] ))
49-
5051
initDatabase:addQuery(MSync.DBServer:query( [[
5152
CREATE TABLE IF NOT EXISTS `tbl_users` (
5253
`p_user_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -144,7 +145,13 @@ function MSync.mysql.saveServer()
144145
)
145146
ON DUPLICATE KEY UPDATE server_name=VALUES(server_name), server_group=VALUES(server_group);
146147
]] )
147-
addServer:setString(1, GetHostName())
148+
149+
local hostname = GetHostName()
150+
151+
if string.len(hostname) > 75 then
152+
hostname = string.sub( hostname, 1, 75 )
153+
end
154+
addServer:setString(1, hostname)
148155
addServer:setString(2, GetConVar( "hostip" ):GetString())
149156
addServer:setString(3, GetConVar( "hostport" ):GetString())
150157
addServer:setString(4, MSync.settings.data.serverGroup)
@@ -165,4 +172,4 @@ function MSync.mysql.saveServer()
165172
end
166173

167174
addServerGroup:start()
168-
end
175+
end

0 commit comments

Comments
 (0)