Corrections to 'Merge pull request #7635'

This commit is contained in:
Nay
2012-09-04 01:23:41 +01:00
parent 2a13eb3d0e
commit 3b02ea37ee
7 changed files with 16 additions and 16 deletions

View File

@@ -515,10 +515,10 @@ 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,
`guid` int(10) unsigned NOT NULL,
`currency` smallint(5) unsigned NOT NULL,
`total_count` int(11) unsigned NOT NULL,
`week_count` int(11) unsigned NOT NULL,
`total_count` int(10) unsigned NOT NULL,
`week_count` int(10) unsigned NOT NULL,
PRIMARY KEY (`guid`,`currency`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

View File

@@ -1,8 +0,0 @@
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;

View File

@@ -0,0 +1,8 @@
DROP TABLE IF EXISTS `character_currency`;
CREATE TABLE `character_currency` (
`guid` int(10) unsigned NOT NULL,
`currency` smallint(5) unsigned NOT NULL,
`total_count` int(10) unsigned NOT NULL,
`week_count` int(10) unsigned NOT NULL,
PRIMARY KEY (`guid`,`currency`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

View File

@@ -1,3 +0,0 @@
-- 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;

View File

@@ -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;

View File

@@ -1,2 +0,0 @@
ALTER TABLE `characters` DROP `conquestPoints`;
ALTER TABLE `characters` DROP `totalHonorPoints`;

View File

@@ -0,0 +1,2 @@
ALTER TABLE `characters` DROP `conquestPoints`;
ALTER TABLE `characters` DROP `totalHonorPoints`;