diff options
| -rw-r--r-- | sql/characters.sql | 319 | ||||
| -rw-r--r-- | sql/updates/559_characters.sql | 2 |
2 files changed, 160 insertions, 161 deletions
diff --git a/sql/characters.sql b/sql/characters.sql index d67c7f02d27..4bb56a23297 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -45,7 +45,6 @@ INSERT INTO `character_db_version` VALUES UNLOCK TABLES; -- ->>>>>>> upstream/master:sql/characters.sql -- Table structure for table `arena_team` -- @@ -174,6 +173,62 @@ LOCK TABLES `bugreport` WRITE; UNLOCK TABLES; -- +-- Table structure for table `characters` +-- + +DROP TABLE IF EXISTS `characters`; +CREATE TABLE `characters` ( + `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier', + `account` int(11) unsigned NOT NULL default '0' COMMENT 'Account Identifier', + `data` longtext, + `name` varchar(12) NOT NULL default '', + `race` tinyint(3) unsigned NOT NULL default '0', + `class` tinyint(3) unsigned NOT NULL default '0', + `position_x` float NOT NULL default '0', + `position_y` float NOT NULL default '0', + `position_z` float NOT NULL default '0', + `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier', + `dungeon_difficulty` tinyint(1) unsigned NOT NULL DEFAULT '0', + `orientation` float NOT NULL default '0', + `taximask` longtext, + `online` tinyint(3) unsigned NOT NULL default '0', + `cinematic` tinyint(3) unsigned NOT NULL default '0', + `totaltime` int(11) unsigned NOT NULL default '0', + `leveltime` int(11) unsigned NOT NULL default '0', + `logout_time` bigint(20) unsigned NOT NULL default '0', + `is_logout_resting` tinyint(3) unsigned NOT NULL default '0', + `rest_bonus` float NOT NULL default '0', + `resettalents_cost` int(11) unsigned NOT NULL default '0', + `resettalents_time` bigint(20) unsigned NOT NULL default '0', + `trans_x` float NOT NULL default '0', + `trans_y` float NOT NULL default '0', + `trans_z` float NOT NULL default '0', + `trans_o` float NOT NULL default '0', + `transguid` bigint(20) unsigned NOT NULL default '0', + `extra_flags` int(11) unsigned NOT NULL default '0', + `stable_slots` tinyint(1) unsigned NOT NULL default '0', + `at_login` int(11) unsigned NOT NULL default '0', + `zone` int(11) unsigned NOT NULL default '0', + `death_expire_time` bigint(20) unsigned NOT NULL default '0', + `taxi_path` text, + `arena_pending_points` int(10) UNSIGNED NOT NULL default '0', + `latency` int(11) unsigned NOT NULL default '0', + PRIMARY KEY (`guid`), + KEY `idx_account` (`account`), + KEY `idx_online` (`online`), + KEY `idx_name` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System'; + +-- +-- Dumping data for table `characters` +-- + +LOCK TABLES `characters` WRITE; +/*!40000 ALTER TABLE `characters` DISABLE KEYS */; +/*!40000 ALTER TABLE `characters` ENABLE KEYS */; +UNLOCK TABLES; + +-- -- Table structure for table `character_action` -- @@ -396,7 +451,7 @@ CREATE TABLE `character_pet_declinedname` ( `instrumental` varchar(12) NOT NULL default '', `prepositional` varchar(12) NOT NULL default '', PRIMARY KEY (`id`), - KEY `owner_key` (`owner`) + KEY owner_key (`owner`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- @@ -493,7 +548,7 @@ CREATE TABLE `character_social` ( `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Character Global Unique Identifier', `friend` int(11) unsigned NOT NULL default '0' COMMENT 'Friend Global Unique Identifier', `flags` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Friend Flags', - `note` varchar(48) NOT NULL default '' COMMENT 'Friend Note', + `note` varchar(48) NOT NULL DEFAULT '' COMMENT 'Friend Note', PRIMARY KEY (`guid`,`friend`,`flags`), KEY `guid` (`guid`), KEY `friend` (`friend`), @@ -564,7 +619,7 @@ CREATE TABLE `character_ticket` ( `ticket_id` int(11) unsigned NOT NULL auto_increment, `guid` int(11) unsigned NOT NULL default '0', `ticket_text` text, - `ticket_lastchange` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `ticket_lastchange` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System'; @@ -594,7 +649,7 @@ CREATE TABLE `character_tutorial` ( `tut6` int(11) unsigned NOT NULL default '0', `tut7` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`account`,`realmid`), - KEY `acc_key` (`account`) + KEY acc_key (`account`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System'; -- @@ -607,62 +662,6 @@ LOCK TABLES `character_tutorial` WRITE; UNLOCK TABLES; -- --- Table structure for table `characters` --- - -DROP TABLE IF EXISTS `characters`; -CREATE TABLE `characters` ( - `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier', - `account` int(11) unsigned NOT NULL default '0' COMMENT 'Account Identifier', - `data` longtext, - `name` varchar(12) NOT NULL default '', - `race` tinyint(3) unsigned NOT NULL default '0', - `class` tinyint(3) unsigned NOT NULL default '0', - `position_x` float NOT NULL default '0', - `position_y` float NOT NULL default '0', - `position_z` float NOT NULL default '0', - `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier', - `dungeon_difficulty` tinyint(1) unsigned NOT NULL default '0', - `orientation` float NOT NULL default '0', - `taximask` longtext, - `online` tinyint(3) unsigned NOT NULL default '0', - `cinematic` tinyint(3) unsigned NOT NULL default '0', - `totaltime` int(11) unsigned NOT NULL default '0', - `leveltime` int(11) unsigned NOT NULL default '0', - `logout_time` bigint(20) unsigned NOT NULL default '0', - `is_logout_resting` tinyint(3) unsigned NOT NULL default '0', - `rest_bonus` float NOT NULL default '0', - `resettalents_cost` int(11) unsigned NOT NULL default '0', - `resettalents_time` bigint(20) unsigned NOT NULL default '0', - `trans_x` float NOT NULL default '0', - `trans_y` float NOT NULL default '0', - `trans_z` float NOT NULL default '0', - `trans_o` float NOT NULL default '0', - `transguid` bigint(20) unsigned NOT NULL default '0', - `extra_flags` tinyint(3) unsigned NOT NULL default '0', - `stable_slots` tinyint(1) unsigned NOT NULL default '0', - `at_login` int(11) unsigned NOT NULL default '0', - `zone` int(11) unsigned NOT NULL default '0', - `death_expire_time` bigint(20) unsigned NOT NULL default '0', - `taxi_path` text, - `arena_pending_points` int(10) UNSIGNED NOT NULL default '0', - `latency` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`guid`), - KEY `idx_account` (`account`), - KEY `idx_online` (`online`), - KEY `idx_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System'; - --- --- Dumping data for table `characters` --- - -LOCK TABLES `characters` WRITE; -/*!40000 ALTER TABLE `characters` DISABLE KEYS */; -/*!40000 ALTER TABLE `characters` ENABLE KEYS */; -UNLOCK TABLES; - --- -- Table structure for table `corpse` -- @@ -695,51 +694,42 @@ LOCK TABLES `corpse` WRITE; UNLOCK TABLES; -- --- Table structure for table `game_event_condition_save` --- - -DROP TABLE IF EXISTS `game_event_condition_save`; -CREATE TABLE `game_event_condition_save` ( - `event_id` mediumint(8) unsigned NOT NULL, - `condition_id` mediumint(8) unsigned NOT NULL default '0', - `done` float default '0', - PRIMARY KEY (`event_id`,`condition_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- --- Dumping data for table `game_event_condition_save` --- - -LOCK TABLES `game_event_condition_save` WRITE; -/*!40000 ALTER TABLE `game_event_condition_save` DISABLE KEYS */; -/*!40000 ALTER TABLE `game_event_condition_save` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `game_event_save` +-- Table structure for table `groups` -- -DROP TABLE IF EXISTS `game_event_save`; -CREATE TABLE `game_event_save` ( - `event_id` mediumint(8) unsigned NOT NULL, - `state` tinyint(3) unsigned NOT NULL default '1', - `next_start` timestamp NOT NULL default '0000-00-00 00:00:00', - PRIMARY KEY (`event_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +DROP TABLE IF EXISTS `groups`; +CREATE TABLE `groups` ( + `leaderGuid` int(11) unsigned NOT NULL, + `mainTank` int(11) unsigned NOT NULL, + `mainAssistant` int(11) unsigned NOT NULL, + `lootMethod` tinyint(4) unsigned NOT NULL, + `looterGuid` int(11) unsigned NOT NULL, + `lootThreshold` tinyint(4) unsigned NOT NULL, + `icon1` int(11) unsigned NOT NULL, + `icon2` int(11) unsigned NOT NULL, + `icon3` int(11) unsigned NOT NULL, + `icon4` int(11) unsigned NOT NULL, + `icon5` int(11) unsigned NOT NULL, + `icon6` int(11) unsigned NOT NULL, + `icon7` int(11) unsigned NOT NULL, + `icon8` int(11) unsigned NOT NULL, + `isRaid` tinyint(1) unsigned NOT NULL, + `difficulty` tinyint(3) unsigned NOT NULL default '0', + PRIMARY KEY (`leaderGuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups'; -- --- Dumping data for table `game_event_save` +-- Dumping data for table `groups` -- -LOCK TABLES `game_event_save` WRITE; -/*!40000 ALTER TABLE `game_event_save` DISABLE KEYS */; -/*!40000 ALTER TABLE `game_event_save` ENABLE KEYS */; +LOCK TABLES `groups` WRITE; +/*!40000 ALTER TABLE `groups` DISABLE KEYS */; +/*!40000 ALTER TABLE `groups` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `group_instance` --- - +-- ---------------------------- +-- Table structure for group_instance +-- ---------------------------- DROP TABLE IF EXISTS `group_instance`; CREATE TABLE `group_instance` ( `leaderGuid` int(11) unsigned NOT NULL default '0', @@ -781,40 +771,6 @@ LOCK TABLES `group_member` WRITE; UNLOCK TABLES; -- --- Table structure for table `groups` --- - -DROP TABLE IF EXISTS `groups`; -CREATE TABLE `groups` ( - `leaderGuid` int(11) unsigned NOT NULL, - `mainTank` int(11) unsigned NOT NULL, - `mainAssistant` int(11) unsigned NOT NULL, - `lootMethod` tinyint(4) unsigned NOT NULL, - `looterGuid` int(11) unsigned NOT NULL, - `lootThreshold` tinyint(4) unsigned NOT NULL, - `icon1` int(11) unsigned NOT NULL, - `icon2` int(11) unsigned NOT NULL, - `icon3` int(11) unsigned NOT NULL, - `icon4` int(11) unsigned NOT NULL, - `icon5` int(11) unsigned NOT NULL, - `icon6` int(11) unsigned NOT NULL, - `icon7` int(11) unsigned NOT NULL, - `icon8` int(11) unsigned NOT NULL, - `isRaid` tinyint(1) unsigned NOT NULL, - `difficulty` tinyint(3) unsigned NOT NULL default '0', - PRIMARY KEY (`leaderGuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups'; - --- --- Dumping data for table `groups` --- - -LOCK TABLES `groups` WRITE; -/*!40000 ALTER TABLE `groups` DISABLE KEYS */; -/*!40000 ALTER TABLE `groups` ENABLE KEYS */; -UNLOCK TABLES; - --- -- Table structure for table `guild` -- @@ -883,7 +839,7 @@ CREATE TABLE `guild_bank_item` ( `SlotId` tinyint(3) unsigned NOT NULL default '0', `item_guid` int(11) unsigned NOT NULL default '0', `item_entry` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`guildid`,`TabId`,`SlotId`), + PRIMARY KEY (`guildid`,`tabid`,`slotid`), KEY `guildid_key` (`guildid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -930,7 +886,7 @@ CREATE TABLE `guild_bank_tab` ( `TabId` tinyint(1) unsigned NOT NULL default '0', `TabName` varchar(100) NOT NULL default '', `TabIcon` varchar(100) NOT NULL default '', - `TabText` varchar(500) NOT NULL default '', + `TabText` text, PRIMARY KEY (`guildid`,`TabId`), KEY `guildid_key` (`guildid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -957,7 +913,7 @@ CREATE TABLE `guild_eventlog` ( `PlayerGuid2` int(11) NOT NULL COMMENT 'Player 2', `NewRank` tinyint(2) NOT NULL COMMENT 'New rank(in case promotion/demotion)', `TimeStamp` bigint(20) NOT NULL COMMENT 'Event UNIX time' -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Guild Eventlog'; +) ENGINE = InnoDB DEFAULT CHARSET = latin1 COMMENT 'Guild Eventlog'; -- -- Dumping data for table `guild_eventlog` @@ -1031,25 +987,6 @@ LOCK TABLES `guild_rank` WRITE; UNLOCK TABLES; -- --- Table structure for table `has_logged_in_before` --- - -DROP TABLE IF EXISTS `has_logged_in_before`; -CREATE TABLE `has_logged_in_before` ( - `guid` int(11) unsigned NOT NULL default '0', - PRIMARY KEY (`guid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='ImpConfig check'; - --- --- Dumping data for table `has_logged_in_before` --- - -LOCK TABLES `has_logged_in_before` WRITE; -/*!40000 ALTER TABLE `has_logged_in_before` DISABLE KEYS */; -/*!40000 ALTER TABLE `has_logged_in_before` ENABLE KEYS */; -UNLOCK TABLES; - --- -- Table structure for table `instance` -- @@ -1074,10 +1011,9 @@ LOCK TABLES `instance` WRITE; /*!40000 ALTER TABLE `instance` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `instance_reset` --- - +-- ---------------------------- +-- Table structure for instance_reset +-- ---------------------------- DROP TABLE IF EXISTS `instance_reset`; CREATE TABLE `instance_reset` ( `mapid` int(11) unsigned NOT NULL default '0', @@ -1298,7 +1234,6 @@ CREATE TABLE `petition_sign` ( `type` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`petitionguid`,`playerguid`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Guild System'; - -- -- Dumping data for table `petition_sign` -- @@ -1314,8 +1249,8 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `saved_variables`; CREATE TABLE `saved_variables` ( - `NextArenaPointDistributionTime` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves'; + `NextArenaPointDistributionTime` bigint(40) UNSIGNED NOT NULL DEFAULT '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves'; -- -- Dumping data for table `saved_variables` @@ -1325,6 +1260,68 @@ LOCK TABLES `saved_variables` WRITE; /*!40000 ALTER TABLE `saved_variables` DISABLE KEYS */; /*!40000 ALTER TABLE `saved_variables` ENABLE KEYS */; UNLOCK TABLES; + +-- +-- Table structure for table `game_event_condition_save` +-- + +DROP TABLE IF EXISTS `game_event_condition_save`; +CREATE TABLE `game_event_condition_save` ( + `event_id` mediumint(8) unsigned NOT NULL, + `condition_id` mediumint(8) unsigned NOT NULL default '0', + `done` float default '0', + PRIMARY KEY (`event_id`,`condition_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Dumping data for table `game_event_condition_save` +-- + +LOCK TABLES `game_event_condition_save` WRITE; +/*!40000 ALTER TABLE `game_event_condition_save` DISABLE KEYS */; +/*!40000 ALTER TABLE `game_event_condition_save` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `game_event_save` +-- + +DROP TABLE IF EXISTS `game_event_save`; +CREATE TABLE `game_event_save` ( + `event_id` mediumint(8) unsigned NOT NULL, + `state` tinyint(3) unsigned NOT NULL default '1', + `next_start` timestamp NOT NULL default '0000-00-00 00:00:00', + PRIMARY KEY (`event_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Dumping data for table `game_event_save` +-- + +LOCK TABLES `game_event_save` WRITE; +/*!40000 ALTER TABLE `game_event_save` DISABLE KEYS */; +/*!40000 ALTER TABLE `game_event_save` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `has_logged_in_before` +-- + +DROP TABLE IF EXISTS `has_logged_in_before`; +CREATE TABLE `has_logged_in_before` ( + `guid` int(11) unsigned NOT NULL default '0', + PRIMARY KEY (`guid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='ImpConfig check'; + +-- +-- Dumping data for table `has_logged_in_before` +-- + +LOCK TABLES `has_logged_in_before` WRITE; +/*!40000 ALTER TABLE `has_logged_in_before` DISABLE KEYS */; +/*!40000 ALTER TABLE `has_logged_in_before` ENABLE KEYS */; +UNLOCK TABLES; + /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; diff --git a/sql/updates/559_characters.sql b/sql/updates/559_characters.sql new file mode 100644 index 00000000000..15b99f2f4b0 --- /dev/null +++ b/sql/updates/559_characters.sql @@ -0,0 +1,2 @@ +ALTER TABLE characters + CHANGE COLUMN gmstate extra_flags int(11) unsigned NOT NULL default '0';
\ No newline at end of file |