Merge branch 'develop'

database/upgrade/upgrade1.0.1.sql

@@ -1,6 +1,10 @@
--- 
+-- ---------------------------------------------------------------------------------------------------------------------
--- WARNING: BACUP YOUR DATABASE BEFORE UPGRADE
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
--- 
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.0 TO 1.0.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_fdd_db`.`tbl_rules`
@@ -41,4 +45,6 @@ CREATE INDEX `tbl_web_messages_index_1` ON  `myems_fdd_db`.`tbl_web_messages`  (
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.1', release_date='2021-01-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.1', release_date='2021-01-28' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.2.sql

@@ -1,6 +1,10 @@
--- 
+-- ---------------------------------------------------------------------------------------------------------------------
--- WARNING: BACUP YOUR DATABASE BEFORE UPGRADE
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
--- 
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.1 TO 1.0.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- MySQL:
 ALTER TABLE myems_system_db.tbl_meters CHANGE parent_meter_id master_meter_id bigint NULL;
@@ -9,4 +13,6 @@ ALTER TABLE myems_system_db.tbl_meters CHANGE parent_meter_id master_meter_id bi
 ALTER TABLE myems_system_db.tbl_meters CHANGE parent_meter_id master_meter_id;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.2', release_date='2021-01-29' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.2', release_date='2021-01-29' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.3.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.2 TO 1.0.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 ALTER TABLE myems_fdd_db.tbl_web_messages MODIFY COLUMN user_id bigint NOT NULL;
 
 CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_notifications` (
@@ -12,4 +20,6 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_notifications` (
 CREATE INDEX `tbl_notifications_index_1` ON  `myems_user_db`.`tbl_notifications`  (`user_id`, `created_datetime_utc`, `status`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.3', release_date='2021-02-07' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.3', release_date='2021-02-07' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.5.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.3 TO 1.0.5
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.5', release_date='2021-02-23' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.5', release_date='2021-02-23' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.6.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.5 TO 1.0.6
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.6', release_date='2021-02-27' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.6', release_date='2021-02-27' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.7.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.6 TO 1.0.7
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.7', release_date='2021-03-07' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.7', release_date='2021-03-07' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.0.8.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.7 TO 1.0.8
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.0.8', release_date='2021-03-11' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.0.8', release_date='2021-03-11' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.0.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.0.8 TO 1.1.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.0', release_date='2021-03-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.0', release_date='2021-03-18' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.1.sql

@@ -1,6 +1,15 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.0 TO 1.1.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.1', release_date='2021-03-31' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.1', release_date='2021-03-31' WHERE id=1;
 
 ALTER TABLE myems_fdd_db.tbl_rules ADD last_run_datetime_utc DATETIME NULL;
 ALTER TABLE myems_fdd_db.tbl_rules ADD next_run_datetime_utc DATETIME NULL;
+
+COMMIT;

database/upgrade/upgrade1.1.2.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.1 TO 1.1.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.2', release_date='2021-04-23' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.2', release_date='2021-04-23' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.3.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.2 TO 1.1.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 -- UPDATE POINT TABLE
 ALTER TABLE myems_system_db.tbl_points MODIFY COLUMN low_limit decimal(18,3) NOT NULL;
 ALTER TABLE myems_system_db.tbl_points ADD is_virtual BOOL DEFAULT FALSE NOT NULL AFTER is_trend;
@@ -7,4 +15,6 @@ ALTER TABLE myems_system_db.tbl_expressions MODIFY COLUMN equation LONGTEXT NOT
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.3', release_date='2021-05-25' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.3', release_date='2021-05-25' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.4.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.3 TO 1.1.4
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 DROP TABLE myems_fdd_db.tbl_sms_recipients;
 
@@ -22,4 +29,6 @@ RENAME TABLE myems_historical_db.tbl_offline_cost_files TO myems_historical_db.t
 ALTER TABLE myems_historical_db.tbl_offline_cost_files TO myems_historical_db.tbl_cost_files;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.4', release_date='2021-07-19' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.4', release_date='2021-07-19' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.5.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.4 TO 1.1.5
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.5', release_date='2021-07-20' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.5', release_date='2021-07-20' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.1.6.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.5 TO 1.1.6
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_system_db`.`tbl_menus`
@@ -107,4 +114,6 @@ VALUES
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.6', release_date='2021-08-02' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.1.6', release_date='2021-08-02' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.0.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.1.6 TO 1.2.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 UPDATE myems_system_db.tbl_menus SET route='/monitoring/spaceequipments' WHERE id=1001;
 UPDATE myems_system_db.tbl_menus SET route='/monitoring/combinedequipments' WHERE id=1002;
 UPDATE myems_system_db.tbl_menus SET route='/monitoring/tenantequipments' WHERE id=1003;
@@ -6,4 +14,6 @@ UPDATE myems_system_db.tbl_menus SET route='/monitoring/shopfloorequipments' WHE
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.0', release_date='2021-08-08' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.0', release_date='2021-08-08' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.1.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.0 TO 1.2.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 ALTER TABLE myems_fdd_db.tbl_email_messages ADD rule_id BIGINT NOT NULL AFTER id;
 ALTER TABLE myems_fdd_db.tbl_text_messages_outbox ADD rule_id BIGINT NOT NULL AFTER id;
 ALTER TABLE myems_fdd_db.tbl_web_messages ADD rule_id BIGINT NOT NULL AFTER id;
@@ -5,4 +13,6 @@ ALTER TABLE myems_fdd_db.tbl_wechat_messages_outbox ADD rule_id BIGINT NOT NULL
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.1', release_date='2021-08-19' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.1', release_date='2021-08-19' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.2.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.1 TO 1.2.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 DROP TABLE IF EXISTS `myems_user_db`.`tbl_logs` ;
 
 CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_logs` (
@@ -12,4 +20,6 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_logs` (
 CREATE INDEX `tbl_logs_index_1` ON  `myems_user_db`.`tbl_logs`  (`user_uuid`, `request_datetime_utc`, `request_method`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.2', release_date='2021-08-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.2', release_date='2021-08-28' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.2.3.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.2 TO 1.2.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_reporting_db`.`tbl_reports`
@@ -18,4 +25,6 @@ CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_reports` (
 CREATE INDEX `tbl_reports_index_1` ON  `myems_reporting_db`.`tbl_reports` (`name`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.2.3', release_date='2021-09-04' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.2.3', release_date='2021-09-04' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.0.sql

@@ -1,3 +1,10 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.2.3 TO 1.3.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 DROP TABLE IF EXISTS `myems_fdd_db`.`tbl_gsm_modems` ;
 
@@ -6,4 +13,6 @@ ALTER TABLE `myems_user_db`.`tbl_users` ADD `password_expiration_datetime_utc` D
 ALTER TABLE `myems_user_db`.`tbl_users` ADD `account_expiration_datetime_utc` DATETIME NOT NULL DEFAULT '2099-12-31 16:00:00' AFTER privilege_id;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.0', release_date='2021-09-24' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.0', release_date='2021-09-24' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.1.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.0 TO 1.3.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.1', release_date='2021-10-15' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.1', release_date='2021-10-15' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.2.sql

@@ -1,3 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.1 TO 1.3.2
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.2', release_date='2021-10-22' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.2', release_date='2021-10-22' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.3.sql

@@ -1,3 +1,11 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.2 TO 1.3.3
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
+START TRANSACTION;
+
 -- PLEASE CHECK YOUR DATABASE TABLES BELOW, IF rule_id IS MISSING, THEN RUN BELOW STATEMENTS
 -- IF rule_id EXISTS, THEN IGNORE THESE STATEMENTS
 ALTER TABLE myems_fdd_db.tbl_email_messages ADD rule_id BIGINT NOT NULL AFTER id;
@@ -7,4 +15,6 @@ ALTER TABLE myems_fdd_db.tbl_wechat_messages_outbox ADD rule_id BIGINT NOT NULL
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.3', release_date='2021-10-30' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.3', release_date='2021-10-30' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.3.4.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.3 TO 1.3.4
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 -- PLEASE CHECK YOUR DATABASE TABLE myems_system_db.tbl_gateway,
 -- If the tbl_gateways is empty
 -- then run the statement below to insert the default gateway data
@@ -8,14 +14,13 @@
 -- This gateway's token is used by myems-modbus-tcp service
 -- ---------------------------------------------------------------------------------------------------------------------
 START TRANSACTION;
-USE `myems_system_db`;
 
 INSERT INTO `myems_system_db`.`tbl_gateways`
 (`id`, `name`, `uuid`, `token`,  `last_seen_datetime_utc`)
 VALUES
 (1, 'MyEMS Gateway 1', 'dc681938-5053-8660-98ed-266c58227231', '983427af-1c35-42ba-8b4d-288675550225', null);
 
-COMMIT;
-
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.3.4', release_date='2021-11-06' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.3.4', release_date='2021-11-06' WHERE id=1;
+
+COMMIT;

database/upgrade/upgrade1.4.0.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.3.4 TO 1.4.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 -- NOTE: BACKUP YOUR DATABASE AND SOURCE CODE FIRST
 -- THIS UPGRADE MAY CAUSE DATA LOSS AND BREAK YOUR MYEMS SYSTEM
 
@@ -55,6 +61,6 @@ CREATE INDEX `tbl_virtual_meters_index_2` ON `myems_system_db`.`tbl_virtual_mete
 CREATE INDEX `tbl_virtual_meters_index_3` ON `myems_system_db`.`tbl_virtual_meters` (`energy_item_id`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.4.0', release_date='2021-11-14' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.4.0', release_date='2021-11-14' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.5.0.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.4.0 TO 1.5.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 -- ---------------------------------------------------------------------------------------------------------------------
@@ -311,6 +317,6 @@ CREATE INDEX `tbl_virtual_meter_8760_index_1` ON  `myems_energy_model_db`.`tbl_v
 
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.5.0', release_date='2021-12-12' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.5.0', release_date='2021-12-12' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.5.1.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.5.0 TO 1.5.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 ALTER TABLE `myems_user_db`.`tbl_users` ADD `failed_login_count` INT NOT NULL DEFAULT 0 AFTER password_expiration_datetime_utc;
@@ -17,6 +23,6 @@ ALTER TABLE `myems_system_db`.`tbl_data_sources` MODIFY COLUMN `connection` LONG
 ALTER TABLE `myems_system_db`.`tbl_points` MODIFY COLUMN `address` LONGTEXT NOT NULL COMMENT 'MUST be in JSON format';
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.5.1', release_date='2021-12-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.5.1', release_date='2021-12-18' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.6.0.sql

@@ -1,6 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.5.1 TO 1.6.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.6.0', release_date='2021-12-31' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.6.0', release_date='2021-12-31' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.6.1.sql

@@ -1,6 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.6.0 TO 1.6.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.6.1', release_date='2022-01-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.6.1', release_date='2022-01-18' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.7.0.sql

@@ -1,3 +1,9 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.6.1 TO 1.7.0
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 CREATE DATABASE IF NOT EXISTS `myems_carbon_db` ;
@@ -163,6 +169,6 @@ CREATE TABLE IF NOT EXISTS `myems_carbon_db`.`tbl_virtual_meter_hourly` (
 CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON  `myems_carbon_db`.`tbl_virtual_meter_hourly`   (`virtual_meter_id`, `start_datetime_utc`);
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.7.0', release_date='2022-01-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.7.0', release_date='2022-01-28' WHERE id=1;
 
 COMMIT;

database/upgrade/upgrade1.7.1.sql

@@ -1,12 +1,18 @@
+-- ---------------------------------------------------------------------------------------------------------------------
+-- WARNING: BACKUP YOUR DATABASE BEFORE UPGRADING
+-- THIS SCRIPT IS ONLY FOR UPGRADING 1.7.0 TO 1.7.1
+-- THE CURRENT VERSION CAN BE FOUND AT `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+
 START TRANSACTION;
 
 ALTER TABLE `myems_user_db`.`tbl_users`
-MODIFY COLUMN `failed_login_count` int(11) ZEROFILL NOT NULL DEFAULT 0 AFTER `password_expiration_datetime_utc`;
+MODIFY COLUMN `failed_login_count` int(11) NOT NULL DEFAULT 0 AFTER `password_expiration_datetime_utc`;
 
 ALTER TABLE `myems_fdd_db`.`tbl_web_messages`
 MODIFY COLUMN `status` varchar(32) NOT NULL COMMENT 'new, acknowledged, read' AFTER `created_datetime_utc`;
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.7.1', release_date='2022-02-11' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.7.1', release_date='2022-02-11' WHERE id=1;
 
 COMMIT;