From 68ec6ae8abf03c59bca7ce930fcb9019cff5f910 Mon Sep 17 00:00:00 2001 From: invliD Date: Thu, 26 Mar 2009 16:23:57 +0100 Subject: [PATCH] Moved table uptime from world database to character database. Signed-off-by: Triply --- sql/characters.sql | 24 ++++++++++++++++++++++- sql/mangos.sql | 24 +---------------------- sql/updates/7544_01_mangos_uptime.sql | 3 +++ sql/updates/7544_02_characters_uptime.sql | 14 +++++++++++++ sql/updates/Makefile.am | 4 ++++ src/game/World.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 7 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 sql/updates/7544_01_mangos_uptime.sql create mode 100644 sql/updates/7544_02_characters_uptime.sql diff --git a/sql/characters.sql b/sql/characters.sql index 470f77545..acb64945f 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS `character_db_version`; CREATE TABLE `character_db_version` ( - `required_7324_02_characters_character_aura` bit(1) default NULL + `required_7544_02_characters_uptime` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- @@ -1321,6 +1321,28 @@ LOCK TABLES `saved_variables` WRITE; /*!40000 ALTER TABLE `saved_variables` DISABLE KEYS */; /*!40000 ALTER TABLE `saved_variables` ENABLE KEYS */; UNLOCK TABLES; + +-- +-- Table structure for table `uptime` +-- + +DROP TABLE IF EXISTS `uptime`; +CREATE TABLE `uptime` ( + `starttime` bigint(20) unsigned NOT NULL default '0', + `startstring` varchar(64) NOT NULL default '', + `uptime` bigint(20) unsigned NOT NULL default '0', + `maxplayers` smallint(5) unsigned NOT NULL default '0', + PRIMARY KEY (`starttime`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system'; + +-- +-- Dumping data for table `uptime` +-- + +LOCK TABLES `uptime` WRITE; +/*!40000 ALTER TABLE `uptime` DISABLE KEYS */; +/*!40000 ALTER TABLE `uptime` ENABLE KEYS */; +UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; diff --git a/sql/mangos.sql b/sql/mangos.sql index 574570af3..3c1e671eb 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7536_01_mangos_spell_chain` bit(1) default NULL + `required_7544_01_mangos_uptime` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17851,28 +17851,6 @@ LOCK TABLES `transports` WRITE; /*!40000 ALTER TABLE `transports` DISABLE KEYS */; /*!40000 ALTER TABLE `transports` ENABLE KEYS */; UNLOCK TABLES; - --- --- Table structure for table `uptime` --- - -DROP TABLE IF EXISTS `uptime`; -CREATE TABLE `uptime` ( - `starttime` bigint(20) unsigned NOT NULL default '0', - `startstring` varchar(64) NOT NULL default '', - `uptime` bigint(20) unsigned NOT NULL default '0', - `maxplayers` smallint(5) unsigned NOT NULL default '0', - PRIMARY KEY (`starttime`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system'; - --- --- Dumping data for table `uptime` --- - -LOCK TABLES `uptime` WRITE; -/*!40000 ALTER TABLE `uptime` DISABLE KEYS */; -/*!40000 ALTER TABLE `uptime` ENABLE KEYS */; -UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; diff --git a/sql/updates/7544_01_mangos_uptime.sql b/sql/updates/7544_01_mangos_uptime.sql new file mode 100644 index 000000000..223f3f630 --- /dev/null +++ b/sql/updates/7544_01_mangos_uptime.sql @@ -0,0 +1,3 @@ +ALTER TABLE db_version CHANGE COLUMN required_7536_01_mangos_spell_chain required_7544_01_mangos_uptime bit; + +DROP TABLE IF EXISTS `uptime`; \ No newline at end of file diff --git a/sql/updates/7544_02_characters_uptime.sql b/sql/updates/7544_02_characters_uptime.sql new file mode 100644 index 000000000..5251056a7 --- /dev/null +++ b/sql/updates/7544_02_characters_uptime.sql @@ -0,0 +1,14 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_7324_02_characters_character_aura required_7544_02_characters_uptime bit; + +-- +-- Table structure for table `uptime` +-- + +DROP TABLE IF EXISTS `uptime`; +CREATE TABLE `uptime` ( + `starttime` bigint(20) unsigned NOT NULL default '0', + `startstring` varchar(64) NOT NULL default '', + `uptime` bigint(20) unsigned NOT NULL default '0', + `maxplayers` smallint(5) unsigned NOT NULL default '0', + PRIMARY KEY (`starttime`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system'; diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index c770d6133..aeed1e308 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -202,6 +202,8 @@ pkgdata_DATA = \ 7495_01_mangos_mangos_string.sql \ 7503_01_mangos_command.sql \ 7536_01_mangos_spell_chain.sql \ + 7544_01_mangos_uptime.sql \ + 7544_02_characters_uptime.sql \ README ## Additional files to include when running 'make dist' @@ -384,4 +386,6 @@ EXTRA_DIST = \ 7495_01_mangos_mangos_string.sql \ 7503_01_mangos_command.sql \ 7536_01_mangos_spell_chain.sql \ + 7544_01_mangos_uptime.sql \ + 7544_02_characters_uptime.sql \ README diff --git a/src/game/World.cpp b/src/game/World.cpp index ffed8212d..6382d02b9 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1365,7 +1365,7 @@ void World::SetInitialWorldSettings() sprintf( isoDate, "%04d-%02d-%02d %02d:%02d:%02d", local.tm_year+1900, local.tm_mon+1, local.tm_mday, local.tm_hour, local.tm_min, local.tm_sec); - WorldDatabase.PExecute("INSERT INTO uptime (startstring, starttime, uptime) VALUES('%s', " I64FMTD ", 0)", + loginDatabase.PExecute("INSERT INTO uptime (startstring, starttime, uptime) VALUES('%s', " I64FMTD ", 0)", isoDate, uint64(m_startTime)); m_timers[WUPDATE_OBJECTS].SetInterval(0); @@ -1532,10 +1532,10 @@ void World::Update(uint32 diff) if (m_timers[WUPDATE_UPTIME].Passed()) { uint32 tmpDiff = (m_gameTime - m_startTime); - uint32 maxClientsNum = sWorld.GetMaxActiveSessionCount(); + uint32 maxClientsNum = GetMaxActiveSessionCount(); m_timers[WUPDATE_UPTIME].Reset(); - WorldDatabase.PExecute("UPDATE uptime SET uptime = %d, maxplayers = %d WHERE starttime = " I64FMTD, tmpDiff, maxClientsNum, uint64(m_startTime)); + loginDatabase.PExecute("UPDATE uptime SET uptime = %d, maxplayers = %d WHERE starttime = " I64FMTD, tmpDiff, maxClientsNum, uint64(m_startTime)); } ///
  • Handle all other objects diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 859dce3be..06ca28eb3 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7543" + #define REVISION_NR "7544" #endif // __REVISION_NR_H__