Merge branch 'develop'

MyEMS · Dec 20, 2024 · 24322df · 24322df
2 parents 47622fe + 275f361
commit 24322df
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 345 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - fixed gulp scss compile error in myems-web
 ### Removed
+- removed myems_billing_baseline_db
 
 ## [v4.11.0] - 2024-11-23
 ### Added

diff --git a/database/install/myems_billing_baseline_db.sql b/database/install/myems_billing_baseline_db.sql
diff --git a/database/upgrade/upgrade1.5.0.sql b/database/upgrade/upgrade1.5.0.sql
@@ -42,41 +42,6 @@ CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_virtual_meter_hourly`
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON  `myems_energy_baseline_db`.`tbl_virtual_meter_hourly`   (`virtual_meter_id`, `start_datetime_utc`);
 
--- ---------------------------------------------------------------------------------------------------------------------
--- Table `myems_billing_baseline_db`.`tbl_meter_hourly`
--- ---------------------------------------------------------------------------------------------------------------------
-
-CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_meter_hourly` (
-  `id` BIGINT NOT NULL AUTO_INCREMENT,
-  `meter_id` BIGINT NOT NULL,
-  `start_datetime_utc` DATETIME NOT NULL,
-  `actual_value` DECIMAL(18, 3) NOT NULL,
-  PRIMARY KEY (`id`));
-CREATE INDEX `tbl_meter_hourly_index_1` ON  `myems_billing_baseline_db`.`tbl_meter_hourly`   (`meter_id`, `start_datetime_utc`);
-
--- ---------------------------------------------------------------------------------------------------------------------
--- Table `myems_billing_baseline_db`.`tbl_offline_meter_hourly`
--- ---------------------------------------------------------------------------------------------------------------------
-
-CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_offline_meter_hourly` (
-  `id` BIGINT NOT NULL AUTO_INCREMENT,
-  `offline_meter_id` BIGINT NOT NULL,
-  `start_datetime_utc` DATETIME NOT NULL,
-  `actual_value` DECIMAL(18, 3) NOT NULL,
-  PRIMARY KEY (`id`));
-CREATE INDEX `tbl_offline_meter_hourly_index_1` ON  `myems_billing_baseline_db`.`tbl_offline_meter_hourly`   (`offline_meter_id`, `start_datetime_utc`);
-
--- ---------------------------------------------------------------------------------------------------------------------
--- Table `myems_billing_baseline_db`.`tbl_virtual_meter_hourly`
--- ---------------------------------------------------------------------------------------------------------------------
-CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` (
-  `id` BIGINT NOT NULL AUTO_INCREMENT,
-  `virtual_meter_id` BIGINT NOT NULL,
-  `start_datetime_utc` DATETIME NOT NULL,
-  `actual_value` DECIMAL(18, 3) NOT NULL,
-  PRIMARY KEY (`id`));
-CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON  `myems_billing_baseline_db`.`tbl_virtual_meter_hourly`   (`virtual_meter_id`, `start_datetime_utc`);
-
 -- MyEMS Energy Model Database
 -- store energy consumption models in 8760 hours of year, hour by hour
 -- ---------------------------------------------------------------------------------------------------------------------

diff --git a/database/upgrade/upgrade4.12.0RC.sql b/database/upgrade/upgrade4.12.0RC.sql
@@ -1080,6 +1080,8 @@ CREATE TABLE IF NOT EXISTS `myems_energy_prediction_db`.`tbl_virtual_meter_hourl
 CREATE INDEX `tbl_virtual_meter_hourly_index_1`
  ON `myems_energy_prediction_db`.`tbl_virtual_meter_hourly` (`virtual_meter_id`, `start_datetime_utc`);
 
+DROP DATABASE IF EXISTS `myems_billing_baseline_db` ;
+
 -- UPDATE VERSION NUMBER
 UPDATE `myems_system_db`.`tbl_versions` SET version='4.12.0RC', release_date='2024-12-12' WHERE id=1;