From: <lpa...@us...> - 2011-02-19 13:48:50
|
Revision: 6969 http://planeshift.svn.sourceforge.net/planeshift/?rev=6969&view=rev Author: lpancallo Date: 2011-02-19 13:48:44 +0000 (Sat, 19 Feb 2011) Log Message: ----------- deleted unique_content table fixed player_id data type to be consistently INT(10) unsigned fixed skill_id data type to be consistently INT(10) unsigned Added proposed changes to upgrade_schema. Modified Paths: -------------- trunk/src/server/database/mysql/character_quests.sql trunk/src/server/database/mysql/character_relationships.sql trunk/src/server/database/mysql/characters.sql trunk/src/server/database/mysql/create_all.sql trunk/src/server/database/mysql/hunt_locations.sql trunk/src/server/database/mysql/skills.sql trunk/src/server/database/mysql/trainer_skills.sql trunk/src/server/database/mysql/upgrade_schema.sql Removed Paths: ------------- trunk/src/server/database/mysql/unique_content.sql Modified: trunk/src/server/database/mysql/character_quests.sql =================================================================== --- trunk/src/server/database/mysql/character_quests.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/character_quests.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -9,7 +9,7 @@ DROP TABLE IF EXISTS `character_quests`; CREATE TABLE `character_quests` ( - `player_id` int(10) NOT NULL default '0', + `player_id` int(10) unsigned NOT NULL default '0', `quest_id` int(10) unsigned NOT NULL default '0', `status` char(1) NOT NULL default 'O', `assigner_id` int(10) unsigned default '0', Modified: trunk/src/server/database/mysql/character_relationships.sql =================================================================== --- trunk/src/server/database/mysql/character_relationships.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/character_relationships.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -10,15 +10,16 @@ DROP TABLE IF EXISTS `character_relationships`; CREATE TABLE `character_relationships` ( - character_id int(11) NOT NULL default '0' COMMENT 'character id from the characters table' , - related_id int(11) NOT NULL default '0' COMMENT 'character id of the related character' , + character_id int(10) unsigned NOT NULL default '0' COMMENT 'character id from the characters table' , + related_id int(10) unsigned NOT NULL default '0' COMMENT 'character id of the related character' , relationship_type varchar(15) NOT NULL default '' COMMENT 'one of three values currently `familiar`, `buddy`, `spouse` or `exploration` ' , spousename varchar(30) default NULL COMMENT 'used for marriages, historical data in case of deletion' , PRIMARY KEY (`character_id`, `relationship_type`, `related_id` ), KEY ( `character_id` ), KEY (`related_id`, `relationship_type`) -); +) +COMMENT = 'relations of char to another char, ex. buddy'; INSERT INTO character_relationships VALUES( 2, 1, "buddy" , "" ); Modified: trunk/src/server/database/mysql/characters.sql =================================================================== --- trunk/src/server/database/mysql/characters.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/characters.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS `characters`; CREATE TABLE `characters` ( - `id` int(10) NOT NULL auto_increment, + `id` int(10) unsigned NOT NULL auto_increment, `name` varchar(30) NOT NULL default '', `lastname` varchar(30) NOT NULL default '', `old_lastname` varchar(30) NOT NULL default '', Modified: trunk/src/server/database/mysql/create_all.sql =================================================================== --- trunk/src/server/database/mysql/create_all.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/create_all.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -69,7 +69,6 @@ source tribes.sql; source tribe_members.sql; source tribe_needs.sql; -source unique_content.sql; source ways.sql; source trade_combinations.sql; source trade_patterns.sql; Modified: trunk/src/server/database/mysql/hunt_locations.sql =================================================================== --- trunk/src/server/database/mysql/hunt_locations.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/hunt_locations.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -20,7 +20,8 @@ `amount` int(10) unsigned NOT NULL default '1', `range` double(10,2) unsigned NOT NULL default '0.00', PRIMARY KEY (`id`) -); +) +COMMENT = 'Areas to spawn items, like apples or mushrooms'; # # Dumping data for table 'hunt_locations' Modified: trunk/src/server/database/mysql/skills.sql =================================================================== --- trunk/src/server/database/mysql/skills.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/skills.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -20,7 +20,7 @@ DROP TABLE IF EXISTS `skills`; CREATE TABLE `skills` ( - `skill_id` int(10) NOT NULL default '0', + `skill_id` int(10) unsigned NOT NULL default '0', `name` varchar(35) NOT NULL default '', `description` text, `practice_factor` int(8) NOT NULL default '100', Modified: trunk/src/server/database/mysql/trainer_skills.sql =================================================================== --- trunk/src/server/database/mysql/trainer_skills.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/trainer_skills.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -9,8 +9,8 @@ DROP TABLE IF EXISTS `trainer_skills`; CREATE TABLE trainer_skills ( - player_id int(8) unsigned NOT NULL DEFAULT '0' , - skill_id int(8) unsigned NOT NULL DEFAULT '0' , + player_id int(10) unsigned NOT NULL DEFAULT '0' , + skill_id int(10) unsigned NOT NULL DEFAULT '0' , min_rank int(8) unsigned NOT NULL DEFAULT '0' , max_rank int(8) unsigned NOT NULL DEFAULT '0' , min_faction float(10,2) NOT NULL DEFAULT '0.0', Deleted: trunk/src/server/database/mysql/unique_content.sql =================================================================== --- trunk/src/server/database/mysql/unique_content.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/unique_content.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -1,14 +0,0 @@ -DROP TABLE IF EXISTS unique_content; -CREATE TABLE `unique_content` ( - `id` int(10) unsigned NOT NULL auto_increment, - `content` text, - PRIMARY KEY (`id`) -); - -### Our book text for both writable and non-writable books - -INSERT INTO unique_content VALUES (1, 'The Ancient Tome of Test: Years ago, some guy was lame' ); -INSERT INTO unique_content VALUES (2, 'Bards tell that there are magical ways to fix bugs. The knowledge you have to obtain can be found in the Dark Way.' ); - - - Modified: trunk/src/server/database/mysql/upgrade_schema.sql =================================================================== --- trunk/src/server/database/mysql/upgrade_schema.sql 2011-02-19 11:58:07 UTC (rev 6968) +++ trunk/src/server/database/mysql/upgrade_schema.sql 2011-02-19 13:48:44 UTC (rev 6969) @@ -1556,8 +1556,17 @@ +# PROPOSED CHANGES TO IMPROVE DB CONSISTENCY +drop table accessrules; +drop table unique_content; +ALTER TABLE petitions modify column player int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE gm_command_log modify column gm int(10) unsigned NOT NULL DEFAULT '0', modify column player int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE trainer_skills modify column player_id int(10) unsigned NOT NULL DEFAULT '0' , modify column skill_id int(10) unsigned NOT NULL DEFAULT '0'; +ALTER TABLE characters modify column `id` int(10) unsigned NOT NULL auto_increment; +ALTER TABLE character_relationships modify column character_id int(10) unsigned NOT NULL default '0' COMMENT 'character id from the characters table', modify column related_id int(10) unsigned NOT NULL default '0' COMMENT 'character id of the related character'; +ALTER TABLE skills modify column skill_id int(10) unsigned NOT NULL default '0'; +ALTER TABLE character_quests modify column `player_id` int(10) unsigned NOT NULL default '0'; - # Insert your upgrade before this line. Remember when you set a new db_version # to update the server_options.sql file and update psserver.cpp as well. # This to ensure that everything is working if you use the create_all.sql to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |