Merge pull request #7635 from cyberbrest/pull23

[Core/Currency] perfom saving all currencies to db and some cap fixes.

4 files changed, 38 insertions, 2 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 21d61d6796c..89294f5b92b 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -508,6 +508,31 @@ LOCK TABLES `character_battleground_random` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `character_currency`
+--
+
+DROP TABLE IF EXISTS `character_currency`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_currency` (
+  `guid` int(11) unsigned NOT NULL,
+  `currency` smallint(5) unsigned NOT NULL,
+  `total_count` int(11) unsigned NOT NULL,
+  `week_count` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`guid`,`currency`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_currency`
+--
+
+LOCK TABLES `character_currency` WRITE;
+/*!40000 ALTER TABLE `character_currency` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_currency` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `character_declinedname`
 --
 
@@ -1199,8 +1224,6 @@ CREATE TABLE `characters` (
   `zone` smallint(5) unsigned NOT NULL DEFAULT '0',
   `death_expire_time` int(10) unsigned NOT NULL DEFAULT '0',
   `taxi_path` text,
-  `conquestPoints` int(10) unsigned NOT NULL DEFAULT '0',
-  `totalHonorPoints` int(10) unsigned NOT NULL DEFAULT '0',
   `totalKills` int(10) unsigned NOT NULL DEFAULT '0',
   `todayKills` smallint(5) unsigned NOT NULL DEFAULT '0',
   `yesterdayKills` smallint(5) unsigned NOT NULL DEFAULT '0',
diff --git a/sql/updates/characters/2012_09_03_00_characters_currency.sql b/sql/updates/characters/2012_09_03_00_characters_currency.sql
new file mode 100644
index 00000000000..84c5690f1ac
--- /dev/null
+++ b/sql/updates/characters/2012_09_03_00_characters_currency.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS `character_currency`;
+CREATE TABLE `character_currency` (
+  `guid` int(11) unsigned NOT NULL,
+  `currency` smallint(5) unsigned NOT NULL,
+  `total_count` int(11) unsigned NOT NULL,
+  `week_count` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`guid`,`currency`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/sql/updates/characters/2012_09_03_01_characters_currency.sql b/sql/updates/characters/2012_09_03_01_characters_currency.sql
new file mode 100644
index 00000000000..308f0dfeafd
--- /dev/null
+++ b/sql/updates/characters/2012_09_03_01_characters_currency.sql
@@ -0,0 +1,3 @@
+-- porting from characters table
+insert into `character_currency` (`guid`, `currency`, `total_count`, `week_count`) SELECT characters.guid, 392, characters.totalHonorPoints, 0 FROM characters WHERE characters.totalHonorPoints > 0;
+insert into `character_currency` (`guid`, `currency`, `total_count`, `week_count`) SELECT characters.guid, 390, characters.conquestPoints, 0 FROM characters WHERE characters.conquestPoints > 0;
\ No newline at end of file
diff --git a/sql/updates/characters/2012_09_03_02_characters_characters.sql b/sql/updates/characters/2012_09_03_02_characters_characters.sql
new file mode 100644
index 00000000000..7dc811fe66d
--- /dev/null
+++ b/sql/updates/characters/2012_09_03_02_characters_characters.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `characters` DROP `conquestPoints`;
+ALTER TABLE `characters` DROP `totalHonorPoints`;
\ No newline at end of file