diff options
| -rw-r--r-- | apps/db_pendings/import.sh | 15 | ||||
| -rw-r--r-- | data/sql/updates/db_auth/2021_05_30_00.sql | 9 | ||||
| -rw-r--r-- | data/sql/updates/db_characters/2021_05_30_00.sql | 9 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2021_05_30_01.sql | 9 |
4 files changed, 24 insertions, 18 deletions
diff --git a/apps/db_pendings/import.sh b/apps/db_pendings/import.sh index a2cb5e1c24..40d68e83f8 100644 --- a/apps/db_pendings/import.sh +++ b/apps/db_pendings/import.sh @@ -43,6 +43,9 @@ function import() { newVer=$dateToday"_"$cnt startTransaction="START TRANSACTION;"; + updHeader="ALTER TABLE version_db_"$db" CHANGE COLUMN "$oldVer" "$newVer" bit;"; + updDate="UPDATE version_db_"$db" SET date = '"$newVer"' WHERE sql_rev = '"$rev"';"; + endTransaction="COMMIT;"; newFile="$updPath/"$dateToday"_"$cnt".sql" @@ -64,13 +67,15 @@ function import() { echo "DELIMITER //" >> "$newFile"; echo "CREATE PROCEDURE updateDb ()" >> "$newFile"; echo "proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';" >> "$newFile"; - echo "SELECT date INTO @COLEXISTS" >> "$newFile"; - echo "FROM version_db_"$db >> "$newFile"; - echo "ORDER BY date DESC LIMIT 1;" >> "$newFile"; - echo "IF @COLEXISTS <> '"$oldVer"' THEN LEAVE proc; END IF;" >> "$newFile"; + echo "SELECT COUNT(*) INTO @COLEXISTS" >> "$newFile"; + echo "FROM information_schema.COLUMNS" >> "$newFile"; + echo "WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_"$db"' AND COLUMN_NAME = '"$oldVer"';" >> "$newFile"; + echo "IF @COLEXISTS = 0 THEN LEAVE proc; END IF;" >> "$newFile"; fi echo "$startTransaction" >> "$newFile"; + echo "$updHeader" >> "$newFile"; + echo "$updDate" >> "$newFile"; if [[ $isRev -eq 1 ]]; then echo "SELECT sql_rev INTO OK FROM version_db_"$db" WHERE sql_rev = '$rev'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;" >> "$newFile"; @@ -88,8 +93,6 @@ function import() { echo "-- END UPDATING QUERIES" >> "$newFile"; echo "--" >> "$newFile"; - echo "UPDATE version_db_"$db" SET date = '"$newVer"' WHERE sql_rev = '"$rev"';" >> "$newFile"; - echo "$endTransaction" >> "$newFile"; if [[ $isRev -eq 1 ]]; then diff --git a/data/sql/updates/db_auth/2021_05_30_00.sql b/data/sql/updates/db_auth/2021_05_30_00.sql index 181e0e172b..471b839c27 100644 --- a/data/sql/updates/db_auth/2021_05_30_00.sql +++ b/data/sql/updates/db_auth/2021_05_30_00.sql @@ -3,11 +3,12 @@ DROP PROCEDURE IF EXISTS `updateDb`; DELIMITER // CREATE PROCEDURE updateDb () proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; -SELECT date INTO @COLEXISTS -FROM version_db_auth -ORDER BY date DESC LIMIT 1; -IF @COLEXISTS <> '2021_05_26_00' THEN LEAVE proc; END IF; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_auth' AND COLUMN_NAME = '2021_05_26_00'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; START TRANSACTION; +ALTER TABLE version_db_auth CHANGE COLUMN 2021_05_26_00 2021_05_30_00 bit; SELECT sql_rev INTO OK FROM version_db_auth WHERE sql_rev = '1621715473238990700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; -- -- START UPDATING QUERIES diff --git a/data/sql/updates/db_characters/2021_05_30_00.sql b/data/sql/updates/db_characters/2021_05_30_00.sql index 0ac235b6d2..6d28a74cf4 100644 --- a/data/sql/updates/db_characters/2021_05_30_00.sql +++ b/data/sql/updates/db_characters/2021_05_30_00.sql @@ -3,11 +3,12 @@ DROP PROCEDURE IF EXISTS `updateDb`; DELIMITER // CREATE PROCEDURE updateDb () proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; -SELECT date INTO @COLEXISTS -FROM version_db_characters -ORDER BY date DESC LIMIT 1; -IF @COLEXISTS <> '2021_05_28_00' THEN LEAVE proc; END IF; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_characters' AND COLUMN_NAME = '2021_05_28_00'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; START TRANSACTION; +ALTER TABLE version_db_characters CHANGE COLUMN 2021_05_28_00 2021_05_30_00 bit; SELECT sql_rev INTO OK FROM version_db_characters WHERE sql_rev = '1621715444570678000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; -- -- START UPDATING QUERIES diff --git a/data/sql/updates/db_world/2021_05_30_01.sql b/data/sql/updates/db_world/2021_05_30_01.sql index 432e2b3aab..a5848aba22 100644 --- a/data/sql/updates/db_world/2021_05_30_01.sql +++ b/data/sql/updates/db_world/2021_05_30_01.sql @@ -3,11 +3,12 @@ DROP PROCEDURE IF EXISTS `updateDb`; DELIMITER // CREATE PROCEDURE updateDb () proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE'; -SELECT date INTO @COLEXISTS -FROM version_db_world -ORDER BY date DESC LIMIT 1; -IF @COLEXISTS <> '2021_05_30_00' THEN LEAVE proc; END IF; +SELECT COUNT(*) INTO @COLEXISTS +FROM information_schema.COLUMNS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_30_00'; +IF @COLEXISTS = 0 THEN LEAVE proc; END IF; START TRANSACTION; +ALTER TABLE version_db_world CHANGE COLUMN 2021_05_30_00 2021_05_30_01 bit; SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621709841145351300'; IF OK <> 'FALSE' THEN LEAVE proc; END IF; -- -- START UPDATING QUERIES |