From dc308e2ecb2e5fa92368ca34bf9fc2cdbc77d7f6 Mon Sep 17 00:00:00 2001 From: Uleat Date: Mon, 30 Jan 2017 03:08:00 -0500 Subject: [PATCH] Fix for null columns in `books`.`language` crash --- common/version.h | 2 +- utils/sql/db_update_manifest.txt | 1 + utils/sql/git/required/2017_01_10_book_languages.sql | 2 +- utils/sql/git/required/2017_01_30_book_languages_fix.sql | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 utils/sql/git/required/2017_01_30_book_languages_fix.sql diff --git a/common/version.h b/common/version.h index 2d5f1d75f..f7f2ad05d 100644 --- a/common/version.h +++ b/common/version.h @@ -30,7 +30,7 @@ Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt */ -#define CURRENT_BINARY_DATABASE_VERSION 9102 +#define CURRENT_BINARY_DATABASE_VERSION 9103 #ifdef BOTS #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9008 #else diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt index 816a35a7c..2c27d858d 100644 --- a/utils/sql/db_update_manifest.txt +++ b/utils/sql/db_update_manifest.txt @@ -356,6 +356,7 @@ 9100|2016_08_27_object_display_name.sql|SHOW COLUMNS FROM `object` LIKE 'display_name'|empty| 9101|2016_12_01_pcnpc_only.sql|SHOW COLUMNS FROM `spells_new` LIKE 'pcnpc_only_flag'|empty| 9102|2017_01_10_book_languages.sql|SHOW COLUMNS FROM `books` LIKE 'language'|empty| +9103|2017_01_30_book_languages_fix.sql|SELECT `language` from `books` WHERE `language` IS NULL|not_empty| # Upgrade conditions: # This won't be needed after this system is implemented, but it is used database that are not diff --git a/utils/sql/git/required/2017_01_10_book_languages.sql b/utils/sql/git/required/2017_01_10_book_languages.sql index aa767cd03..1f51325a9 100644 --- a/utils/sql/git/required/2017_01_10_book_languages.sql +++ b/utils/sql/git/required/2017_01_10_book_languages.sql @@ -1,4 +1,4 @@ -alter table books add language int default 0; +alter table books add language int not null default 0; drop table if exists reading_is_fundamental; diff --git a/utils/sql/git/required/2017_01_30_book_languages_fix.sql b/utils/sql/git/required/2017_01_30_book_languages_fix.sql new file mode 100644 index 000000000..3d913b19c --- /dev/null +++ b/utils/sql/git/required/2017_01_30_book_languages_fix.sql @@ -0,0 +1,4 @@ +UPDATE `books` SET `language` = '0' WHERE `language` IS NULL; + +ALTER TABLE `books` MODIFY COLUMN `language` INT NOT NULL DEFAULT '0'; +