diff --git a/sql/characters.sql b/sql/characters.sql index d5d084f1d..ed139c646 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -434,7 +434,7 @@ DROP TABLE IF EXISTS `character_db_version`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `character_db_version` ( - `required_12774_01_characters_characters` bit(1) default NULL + `required_12712_01_characters_characters` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -444,7 +444,7 @@ CREATE TABLE `character_db_version` ( LOCK TABLES `character_db_version` WRITE; /*!40000 ALTER TABLE `character_db_version` DISABLE KEYS */; -INSERT INTO `character_db_version` (`required_12774_01_characters_characters`) VALUES +INSERT INTO `character_db_version` (`required_12712_01_characters_characters`) VALUES (NULL); /*!40000 ALTER TABLE `character_db_version` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/mangos.sql b/sql/mangos.sql index 41458c697..2d7212a5f 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -281,7 +281,7 @@ INSERT INTO `command` (`name`, `security`, `help`) VALUES ('account lock',0,'Syntax: .account lock [on|off]\r\n\r\nAllow login from account only from current used IP or remove this requirement.'), ('account onlinelist',4,'Syntax: .account onlinelist\r\n\r\nShow list of online accounts.'), ('account password',0,'Syntax: .account password $old_password $new_password $new_password\r\n\r\nChange your account password.'), -('account set addon',3,'Syntax: .account set addon [#accountId|$accountName] #addon\r\n\r\nSet user (possible targeted) expansion addon level allowed. Addon values: 0 - normal, 1 - tbc, 2 - wotlk.'), +('account set addon',3,'Syntax: .account set addon [#accountId|$accountName] #addon\r\n\r\nSet user (possible targeted) expansion addon level allowed. Addon values: 0 - normal, 1 - tbc, 2 - wotlk, 3 - cataclysm.'), ('account set gmlevel',4,'Syntax: .account set gmlevel [#accountId|$accountName] #level\r\n\r\nSet the security level for targeted player (can\'t be used at self) or for #accountId or $accountName to a level of #level.\r\n\r\n#level may range from 0 to 3.'), ('account set password',4,'Syntax: .account set password (#accountId|$accountName) $password $password\r\n\r\nSet password for account.'), ('achievement',3,'Syntax: .achievement $playername #achivementid\r\n\r\nShow state achievment #achivmentid (can be shift link) and list of achievement criteria with progress data for selected player in game or by player name.'), @@ -1430,7 +1430,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) DEFAULT NULL, `creature_ai_version` varchar(120) DEFAULT NULL, `cache_id` int(10) DEFAULT '0', - `required_12662_01_mangos_hotfix_data` bit(1) default NULL + `required_12712_02_mangos_command` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1440,7 +1440,7 @@ CREATE TABLE `db_version` ( LOCK TABLES `db_version` WRITE; /*!40000 ALTER TABLE `db_version` DISABLE KEYS */; -INSERT INTO `db_version` (`version`, `creature_ai_version`, `cache_id`, `required_12662_01_mangos_hotfix_data`) VALUES +INSERT INTO `db_version` (`version`, `creature_ai_version`, `cache_id`, `required_12712_02_mangos_command`) VALUES ('Mangos default database.','Creature EventAI not provided.',0,NULL); /*!40000 ALTER TABLE `db_version` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/12774_01_characters_characters.sql b/sql/updates/12712_01_characters_characters.sql similarity index 92% rename from sql/updates/12774_01_characters_characters.sql rename to sql/updates/12712_01_characters_characters.sql index 89434c7a6..e7eb8e25b 100644 --- a/sql/updates/12774_01_characters_characters.sql +++ b/sql/updates/12712_01_characters_characters.sql @@ -1,4 +1,4 @@ -ALTER TABLE character_db_version CHANGE COLUMN required_12697_01_characters_characters required_12774_01_characters_characters bit; +ALTER TABLE character_db_version CHANGE COLUMN required_12697_01_characters_characters required_12712_01_characters_characters bit; ALTER TABLE character_queststatus_daily DROP INDEX idx_guid; ALTER TABLE character_queststatus_monthly DROP INDEX idx_guid; diff --git a/sql/updates/12774_01_mangos.sql b/sql/updates/12712_01_mangos.sql similarity index 99% rename from sql/updates/12774_01_mangos.sql rename to sql/updates/12712_01_mangos.sql index 804830190..389053415 100644 --- a/sql/updates/12774_01_mangos.sql +++ b/sql/updates/12712_01_mangos.sql @@ -1,4 +1,4 @@ -ALTER TABLE db_version CHANGE COLUMN required_12662_01_mangos_hotfix_data required_12774_01_mangos bit; +ALTER TABLE db_version CHANGE COLUMN required_12662_01_mangos_hotfix_data required_12712_01_mangos bit; ALTER TABLE spell_template ADD COLUMN attr_ex3 int(11) unsigned NOT NULL DEFAULT '0' AFTER attr_ex2; diff --git a/sql/updates/12712_02_mangos_command.sql b/sql/updates/12712_02_mangos_command.sql new file mode 100644 index 000000000..f7c23d1ed --- /dev/null +++ b/sql/updates/12712_02_mangos_command.sql @@ -0,0 +1,3 @@ +ALTER TABLE db_version CHANGE COLUMN required_12712_01_mangos required_12712_02_mangos_command bit; + +UPDATE `command` SET `help`='Syntax: .account set addon [#accountId|$accountName] #addon\r\n\r\nSet user (possible targeted) expansion addon level allowed. Addon values: 0 - normal, 1 - tbc, 2 - wotlk, 3 - cataclysm.' WHERE `name`='account set addon'; diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 4d929503f..7398a4174 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ - #define REVISION_DB_CHARACTERS "required_12774_01_characters_characters" - #define REVISION_DB_MANGOS "required_12774_01_mangos" + #define REVISION_DB_CHARACTERS "required_12712_01_characters_characters" + #define REVISION_DB_MANGOS "required_12712_02_mangos_command" #define REVISION_DB_REALMD "required_c12484_02_realmd_account_access" #endif // __REVISION_SQL_H__