DB squash & begin AC 3.0.0 development

8 files changed, 182 insertions, 15 deletions

diff --git a/data/sql/base/db_auth/account.sql b/data/sql/base/db_auth/account.sql
index 9125c61e79..4954510978 100644
--- a/data/sql/base/db_auth/account.sql
+++ b/data/sql/base/db_auth/account.sql
@@ -15,20 +15,25 @@ CREATE TABLE `account`
   `sessionkey` varchar(80) NOT NULL DEFAULT '',
   `v` varchar(64) NOT NULL DEFAULT '',
   `s` varchar(64) NOT NULL DEFAULT '',
-  `email` varchar(254) NOT NULL DEFAULT '',
+  `token_key` varchar(100) NOT NULL DEFAULT '',
+  `email` varchar(255) NOT NULL DEFAULT '',
+  `reg_mail` varchar(255) NOT NULL DEFAULT '',
   `joindate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `last_ip` varchar(15) NOT NULL DEFAULT '127.0.0.1',
+  `last_attempt_ip` varchar(15) NOT NULL DEFAULT '127.0.0.1',
   `failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
   `locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `last_login` TIMESTAMP NULL DEFAULT NULL,
+  `lock_country` varchar(2) NOT NULL DEFAULT '00',
+  `last_login` timestamp NULL DEFAULT NULL,
   `online` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `expansion` tinyint(3) unsigned NOT NULL DEFAULT '2',
   `mutetime` bigint(20) NOT NULL DEFAULT '0',
   `mutereason` varchar(255) NOT NULL DEFAULT '',
   `muteby` varchar(50) NOT NULL DEFAULT '',
   `locale` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `os` varchar(3) NOT NULL DEFAULT '',
   `recruiter` int(10) unsigned NOT NULL DEFAULT '0',
+  `totaltime` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_username` (`username`)
 ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COMMENT='Account System';
@@ -37,16 +42,16 @@ CREATE TABLE `account`
 LOCK TABLES `account` WRITE;
 /*!40000 ALTER TABLE `account` DISABLE KEYS */;
 INSERT INTO `account` VALUES 
-(1,'test1','047ce22643f9b0bd6baeb18d51bf1075a4d43fc6','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(2,'test2','10eb1ff16cf5380147e8281cd8080a210ecb3c53','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(3,'test3','e546bbf9ca93ae5291f0b441bb9ea2fa0c466176','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(4,'test4','61015d83b456a9c6a7defdff07f55265f24097af','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(5,'test5','dddeac4ffe5f286ec57b7a1ed63bf3a859debe1e','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(6,'test6','f1f94cdffd83c8c4182d66689077f92c807ab579','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(7,'test7','6fcd35c35b127be1d9ca040b2b478eb366506ce2','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(8,'test8','484332ccb02e284e4e0a04573c3fa417f4745fdf','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(9,'test9','4fce15ed251721f02754d5381ae9d0137b6a6a30','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0),
-(10,'test10','b22d249228e84ab493b39a2bd765bee9b7c0b350','','','','','2016-01-30 21:09:43','127.0.0.1',0,0,NULL,0,2,0,'','',0,'',0);
+(1,'test1','047ce22643f9b0bd6baeb18d51bf1075a4d43fc6','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(2,'test2','10eb1ff16cf5380147e8281cd8080a210ecb3c53','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(3,'test3','e546bbf9ca93ae5291f0b441bb9ea2fa0c466176','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(4,'test4','61015d83b456a9c6a7defdff07f55265f24097af','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(5,'test5','dddeac4ffe5f286ec57b7a1ed63bf3a859debe1e','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(6,'test6','f1f94cdffd83c8c4182d66689077f92c807ab579','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(7,'test7','6fcd35c35b127be1d9ca040b2b478eb366506ce2','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(8,'test8','484332ccb02e284e4e0a04573c3fa417f4745fdf','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(9,'test9','4fce15ed251721f02754d5381ae9d0137b6a6a30','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0),
+(10,'test10','b22d249228e84ab493b39a2bd765bee9b7c0b350','','','','','','','2016-01-30 21:09:43','127.0.0.1','127.0.0.1',0,0,'00',NULL,0,2,0,'','',0,'',0,0);
 /*!40000 ALTER TABLE `account` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/db_auth/account_muted.sql b/data/sql/base/db_auth/account_muted.sql
new file mode 100644
index 0000000000..b67b39ead4
--- /dev/null
+++ b/data/sql/base/db_auth/account_muted.sql
@@ -0,0 +1,31 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `account_muted`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account_muted` 
+(
+  `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+  `mutedate` int(10) unsigned NOT NULL DEFAULT '0',
+  `mutetime` int(10) unsigned NOT NULL DEFAULT '0',
+  `mutedby` varchar(50) NOT NULL,
+  `mutereason` varchar(255) NOT NULL,
+  PRIMARY KEY (`guid`,`mutedate`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='mute List';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `account_muted` WRITE;
+/*!40000 ALTER TABLE `account_muted` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_muted` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
diff --git a/data/sql/base/db_auth/ip2nation.sql b/data/sql/base/db_auth/ip2nation.sql
new file mode 100644
index 0000000000..fa8c8d7122
--- /dev/null
+++ b/data/sql/base/db_auth/ip2nation.sql
@@ -0,0 +1,28 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `ip2nation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ip2nation` 
+(
+  `ip` int(11) unsigned NOT NULL DEFAULT '0',
+  `country` char(2) NOT NULL DEFAULT '',
+  KEY `ip` (`ip`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `ip2nation` WRITE;
+/*!40000 ALTER TABLE `ip2nation` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ip2nation` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
diff --git a/data/sql/base/db_auth/ip2nationCountries.sql b/data/sql/base/db_auth/ip2nationCountries.sql
new file mode 100644
index 0000000000..5e77f00d77
--- /dev/null
+++ b/data/sql/base/db_auth/ip2nationCountries.sql
@@ -0,0 +1,34 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `ip2nationCountries`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ip2nationCountries` 
+(
+  `code` varchar(4) NOT NULL DEFAULT '',
+  `iso_code_2` varchar(2) NOT NULL DEFAULT '',
+  `iso_code_3` varchar(3) DEFAULT '',
+  `iso_country` varchar(255) NOT NULL DEFAULT '',
+  `country` varchar(255) NOT NULL DEFAULT '',
+  `lat` float NOT NULL DEFAULT '0',
+  `lon` float NOT NULL DEFAULT '0',
+  PRIMARY KEY (`code`),
+  KEY `code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `ip2nationCountries` WRITE;
+/*!40000 ALTER TABLE `ip2nationCountries` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ip2nationCountries` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
diff --git a/data/sql/base/db_auth/logs_ip_actions.sql b/data/sql/base/db_auth/logs_ip_actions.sql
new file mode 100644
index 0000000000..3b1477f500
--- /dev/null
+++ b/data/sql/base/db_auth/logs_ip_actions.sql
@@ -0,0 +1,35 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `logs_ip_actions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `logs_ip_actions` 
+(
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Identifier',
+  `account_id` int(10) unsigned NOT NULL COMMENT 'Account ID',
+  `character_guid` int(10) unsigned NOT NULL COMMENT 'Character Guid',
+  `type` tinyint(3) unsigned NOT NULL,
+  `ip` varchar(15) NOT NULL DEFAULT '127.0.0.1',
+  `systemnote` text COMMENT 'Notes inserted by system',
+  `unixtime` int(10) unsigned NOT NULL COMMENT 'Unixtime',
+  `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp',
+  `comment` text COMMENT 'Allows users to add a comment',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Used to log ips of individual actions';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `logs_ip_actions` WRITE;
+/*!40000 ALTER TABLE `logs_ip_actions` DISABLE KEYS */;
+/*!40000 ALTER TABLE `logs_ip_actions` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
diff --git a/data/sql/base/db_auth/realmlist.sql b/data/sql/base/db_auth/realmlist.sql
index b451b0f329..73c951584b 100644
--- a/data/sql/base/db_auth/realmlist.sql
+++ b/data/sql/base/db_auth/realmlist.sql
@@ -29,7 +29,7 @@ CREATE TABLE `realmlist`
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
 INSERT INTO `realmlist` VALUES 
-(1,'AzerothCore','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,2,1,0,0,12340);
+(1,'AzerothCore','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,12340);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/data/sql/base/db_auth/uptime.sql b/data/sql/base/db_auth/uptime.sql
new file mode 100644
index 0000000000..5a5c0c6b90
--- /dev/null
+++ b/data/sql/base/db_auth/uptime.sql
@@ -0,0 +1,34 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `uptime`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `uptime` 
+(
+  `realmid` int(10) unsigned NOT NULL,
+  `starttime` int(10) unsigned NOT NULL DEFAULT '0',
+  `uptime` int(10) unsigned NOT NULL DEFAULT '0',
+  `maxplayers` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `revision` varchar(255) NOT NULL DEFAULT 'AzerothCore',
+  PRIMARY KEY (`realmid`,`starttime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Uptime system';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `uptime` WRITE;
+/*!40000 ALTER TABLE `uptime` DISABLE KEYS */;
+INSERT INTO `uptime` VALUES 
+(1,1550400304,121,0,'AzerothCore rev. 2bcedc2859e7 2019-02-17 10:04:09 +0100 (master branch) (Unix, Debug)'),
+(1,1550400454,1440,0,'AzerothCore rev. 2bcedc2859e7 2019-02-17 10:04:09 +0100 (master branch) (Unix, Debug)');
+/*!40000 ALTER TABLE `uptime` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
diff --git a/data/sql/base/db_auth/version_db_auth.sql b/data/sql/base/db_auth/version_db_auth.sql
index 8e34016ae4..8d6d37d074 100644
--- a/data/sql/base/db_auth/version_db_auth.sql
+++ b/data/sql/base/db_auth/version_db_auth.sql
@@ -11,7 +11,7 @@ CREATE TABLE `version_db_auth`
 (
   `sql_rev` varchar(100) NOT NULL,
   `required_rev` varchar(100) DEFAULT NULL,
-  `2016_09_04_00` bit(1) DEFAULT NULL,
+  `2019_02_08_00` bit(1) DEFAULT NULL,
   PRIMARY KEY (`sql_rev`),
   KEY `required` (`required_rev`),
   CONSTRAINT `required` FOREIGN KEY (`required_rev`) REFERENCES `version_db_auth` (`sql_rev`)