From 2c8fd60503c73cbbfa2e34d0a78bcb67ef153f7c Mon Sep 17 00:00:00 2001 From: brianluau Date: Fri, 18 Jan 2013 20:32:00 +0000 Subject: [PATCH] - Renamed some /sql-files/upgrades/upgrade_svn***** files to match previous naming conventions. Upgrade files ending in "_log" should be applied to the log database. Upgrade files with no suffix are applied to the ragnarok database. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17102 54d463be-8e91-2dee-dedb-b68131a5f0ec --- sql-files/upgrades/upgrade_svn15572.sql | 2 +- sql-files/upgrades/upgrade_svn16645.sql | 2 +- .../{upgrade_svn16914.sql => upgrade_svn16914_log.sql} | 0 sql-files/upgrades/upgrade_svn17014.sql | 3 ++- sql-files/upgrades/upgrade_svn17080.sql | 2 -- sql-files/upgrades/upgrade_svn17080_log.sql | 1 + sql-files/upgrades/upgrade_svn17086.sql | 3 --- sql-files/upgrades/upgrade_svn17086_log.sql | 1 + 8 files changed, 6 insertions(+), 8 deletions(-) rename sql-files/upgrades/{upgrade_svn16914.sql => upgrade_svn16914_log.sql} (100%) create mode 100644 sql-files/upgrades/upgrade_svn17080_log.sql create mode 100644 sql-files/upgrades/upgrade_svn17086_log.sql diff --git a/sql-files/upgrades/upgrade_svn15572.sql b/sql-files/upgrades/upgrade_svn15572.sql index 821bb79d60..ae9f0fed88 100644 --- a/sql-files/upgrades/upgrade_svn15572.sql +++ b/sql-files/upgrades/upgrade_svn15572.sql @@ -1,3 +1,3 @@ -- Rename `level` column to `group_id` in `login` table -ALTER TABLE `login` CHANGE COLUMN `level` `group_id` TINYINT(3) NOT NULL DEFAULT '0'; \ No newline at end of file +ALTER TABLE `login` CHANGE COLUMN `level` `group_id` TINYINT(3) NOT NULL DEFAULT '0'; diff --git a/sql-files/upgrades/upgrade_svn16645.sql b/sql-files/upgrades/upgrade_svn16645.sql index 9a3237ad87..fd199ea83c 100644 --- a/sql-files/upgrades/upgrade_svn16645.sql +++ b/sql-files/upgrades/upgrade_svn16645.sql @@ -1,2 +1,2 @@ ALTER TABLE `item_db_re` MODIFY COLUMN `atk:matk` VARCHAR(11) DEFAULT ''; -ALTER TABLE `item_db_re` MODIFY COLUMN `defence` SMALLINT(5) UNSIGNED DEFAULT NULL; \ No newline at end of file +ALTER TABLE `item_db_re` MODIFY COLUMN `defence` SMALLINT(5) UNSIGNED DEFAULT NULL; diff --git a/sql-files/upgrades/upgrade_svn16914.sql b/sql-files/upgrades/upgrade_svn16914_log.sql similarity index 100% rename from sql-files/upgrades/upgrade_svn16914.sql rename to sql-files/upgrades/upgrade_svn16914_log.sql diff --git a/sql-files/upgrades/upgrade_svn17014.sql b/sql-files/upgrades/upgrade_svn17014.sql index 68a279aa75..5d925f714e 100644 --- a/sql-files/upgrades/upgrade_svn17014.sql +++ b/sql-files/upgrades/upgrade_svn17014.sql @@ -6,4 +6,5 @@ ALTER TABLE `elemental` CHANGE COLUMN `str` `atk1` MEDIUMINT(6) UNSIGNED NOT NUL CHANGE COLUMN `luk` `mdef` SMALLINT(4) UNSIGNED NOT NULL DEFAULT 0, CHANGE COLUMN `life_time` `flee` SMALLINT(4) UNSIGNED NOT NULL DEFAULT 0, ADD COLUMN `hit` SMALLINT(4) UNSIGNED NOT NULL DEFAULT 0 AFTER `flee`, - ADD COLUMN `life_time` INT(11) NOT NULL DEFAULT 0 AFTER `hit`; \ No newline at end of file + ADD COLUMN `life_time` INT(11) NOT NULL DEFAULT 0 AFTER `hit`; + \ No newline at end of file diff --git a/sql-files/upgrades/upgrade_svn17080.sql b/sql-files/upgrades/upgrade_svn17080.sql index cfbe5dfe01..6aaf8a5019 100644 --- a/sql-files/upgrades/upgrade_svn17080.sql +++ b/sql-files/upgrades/upgrade_svn17080.sql @@ -12,5 +12,3 @@ ALTER TABLE `guild_storage` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0'; ALTER TABLE `inventory` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0'; ALTER TABLE `mail` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0'; ALTER TABLE `storage` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0'; - -ALTER TABLE `picklog` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0' AFTER `card3`; diff --git a/sql-files/upgrades/upgrade_svn17080_log.sql b/sql-files/upgrades/upgrade_svn17080_log.sql new file mode 100644 index 0000000000..0621aea967 --- /dev/null +++ b/sql-files/upgrades/upgrade_svn17080_log.sql @@ -0,0 +1 @@ +ALTER TABLE `picklog` ADD `nsiuid` BIGINT NOT NULL DEFAULT '0' AFTER `card3`; diff --git a/sql-files/upgrades/upgrade_svn17086.sql b/sql-files/upgrades/upgrade_svn17086.sql index 3ba53e9ba6..61f069f10e 100644 --- a/sql-files/upgrades/upgrade_svn17086.sql +++ b/sql-files/upgrades/upgrade_svn17086.sql @@ -1,11 +1,8 @@ UPDATE `interreg` SET `varname` = 'unique_id' WHERE `interreg`.`varname` = 'nsiuid'; - ALTER TABLE `auction` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; ALTER TABLE `cart_inventory` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; ALTER TABLE `guild_storage` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; ALTER TABLE `inventory` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; ALTER TABLE `mail` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; ALTER TABLE `storage` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; - -ALTER TABLE `picklog` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0'; \ No newline at end of file diff --git a/sql-files/upgrades/upgrade_svn17086_log.sql b/sql-files/upgrades/upgrade_svn17086_log.sql new file mode 100644 index 0000000000..83039e3c61 --- /dev/null +++ b/sql-files/upgrades/upgrade_svn17086_log.sql @@ -0,0 +1 @@ +ALTER TABLE `picklog` CHANGE `nsiuid` `unique_id` BIGINT( 20 ) NOT NULL DEFAULT '0';