* Removed "()" from sql names because of an error in CMakeLists

* Updated CMakeLists for current names
* Changed some new sqls to proper names and directories
* Reverted changes in ba79b83e93dc - now working properly with fixed Character converter
* Some other cleaning

--HG--
branch : trunk

sql/TBC-WLK converter/TBC-WLK_characters.sql

@@ -373,9 +373,3 @@ UPDATE item_instance SET data= CONCAT(
   SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',60),' ',-60+30),' 0 ',
   SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',134),' ',-134+60))
 WHERE SUBSTRING_INDEX(data,' ',134) = data AND SUBSTRING_INDEX(data,' ',134-1) <> data;
-
-
-
-
-
-	

sql/updates/1237_mangos_7230_01_world_spell_bonus_data.sql

@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7230_01_mangos_spell_chain required_7230_02_mangos_spell_bonus_data bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7230_01_mangos_spell_chain required_7230_02_mangos_spell_bonus_data bit;*/
 
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (18220,18937,18938,27265,59092);
 INSERT INTO `spell_bonus_data` VALUES

sql/updates/875_mangos_7047_01_characters_character_spell.sql

@@ -1,6 +1,5 @@
 /*ALTER TABLE character_db_version CHANGE COLUMN required_6976_02_characters_character_db_version required_7047_01_characters_character_spell bit;*/
 
-/* ERROR 1136 (21S01) at line 4: Column count doesn't match value count at row 1 
 DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
 INSERT INTO character_spell SELECT characters.guid as guid, 28880, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 1;
 INSERT INTO character_spell SELECT characters.guid as guid, 59542, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 2;
@@ -9,14 +8,3 @@ INSERT INTO character_spell SELECT characters.guid as guid, 59544, 4294967295, 1
 INSERT INTO character_spell SELECT characters.guid as guid, 59545, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 6;
 INSERT INTO character_spell SELECT characters.guid as guid, 59547, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 7;
 INSERT INTO character_spell SELECT characters.guid as guid, 59548, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
-*/
-
-/* same query , without character_spell.slot*/
-DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
-INSERT INTO character_spell SELECT characters.guid as guid, 28880, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 1;
-INSERT INTO character_spell SELECT characters.guid as guid, 59542, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 2;
-INSERT INTO character_spell SELECT characters.guid as guid, 59543, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 3;
-INSERT INTO character_spell SELECT characters.guid as guid, 59544, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 5;
-INSERT INTO character_spell SELECT characters.guid as guid, 59545, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 6;
-INSERT INTO character_spell SELECT characters.guid as guid, 59547, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 7;
-INSERT INTO character_spell SELECT characters.guid as guid, 59548, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;

sql/updates/CMakeLists.txt

@@ -1,23 +1,25 @@
 INSTALL(FILES
 805_world_scripts
-875_(mangos_7047)_01_characters_character_spell.sql
+875_mangos_7047_01_characters_character_spell.sql
-875_(mangos_7059)_01_characters_pet_spell.sql
+875_mangos_7059_01_characters_pet_spell.sql
-1026_(mangos_7113)_01_characters_character_achievement_progress.sql
+1026_mangos_7113_01_characters_character_achievement_progress.sql
-1028_(mangos_7141)_01_world_instance_template.sql
+1028_mangos_7141_01_world_instance_template.sql
-1028_(mangos_7147)_01_world_creature_template.sql
+1028_mangos_7147_01_world_creature_template.sql
-1028_(mangos_7150)_01_world_playercreateinfo_spell.sql
+1028_mangos_7150_01_world_playercreateinfo_spell.sql
-1084_(mangos_7168)_01_world_command.sql
+1084_mangos_7168_01_world_command.sql
-1094_(mangos_7193)_01_world_trinity_string.sql
+1094_mangos_7193_01_world_trinity_string.sql
-1108_(mangos_7196)_02_world_spell_bonus_data.sql
+1108_mangos_7196_02_world_spell_bonus_data.sql
-1108_(mangos_7198)_01_characters_characters.sql
+1108_mangos_7198_01_characters_characters.sql
-1108_(mangos_7199)_01_world_spell_bonus_data.sql
+1108_mangos_7199_01_world_spell_bonus_data.sql
-1135_(mangos_7207)_01_world_creature.sql
+1135_mangos_7207_01_world_creature.sql
-1135_(mangos_7207)_02_world_gameobject.sql
+1135_mangos_7207_02_world_gameobject.sql
-1135_(mangos_7207)_03_characters_corpse.sql
+1135_mangos_7207_03_characters_corpse.sql
-1140_(mangos_7209)_01_world_spell_bonus_data.sql
+1140_mangos_7209_01_world_spell_bonus_data.sql
-1185_(mangos_7214)_01_world_command.sql
+1185_mangos_7214_01_world_command.sql
-1185_(mangos_7214)_02_world_trinity_string.sql
+1185_mangos_7214_02_world_trinity_string.sql
-1185_(mangos_7214)_03_mangos_spell_proc_event.sql
+1185_mangos_7214_03_world_spell_proc_event.sql
 1206_world_scripts.sql
 1207_world_scripts.sql
+1237_mangos_7230_01_world_spell_bonus_data
+1248_mangos_7235_01_world_command
 DESTINATION share/trinity/sql/updates)