From b86573020b4686090f36fcfb6fddf4650693f735 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Tue, 31 Aug 2021 18:41:07 +0800
Subject: [PATCH] added tbl_reports to myems_reporting_db in database

---
 database/myems_reporting_db.sql   | 19 +++++++++++++++++++
 database/upgrade/upgrade1.2.3.sql | 21 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 database/upgrade/upgrade1.2.3.sql

diff --git a/database/myems_reporting_db.sql b/database/myems_reporting_db.sql
index 6b328774..a46697cf 100644
--- a/database/myems_reporting_db.sql
+++ b/database/myems_reporting_db.sql
@@ -26,6 +26,25 @@ CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_email_messages` (
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_email_messages_index_1` ON  `myems_reporting_db`.`tbl_email_messages`  (`status`,   `scheduled_datetime_utc`);
 
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_reporting_db`.`tbl_reports`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_reporting_db`.`tbl_reports` ;
+
+CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_reports` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(128) NOT NULL,
+  `uuid` CHAR(36) NOT NULL,
+  `category` VARCHAR(128) NOT NULL COMMENT 'SPACE, METER, VIRTUALMETER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT',
+  `report_code` VARCHAR(128) NOT NULL COMMENT 'SPACE01, SPACE02, ... METER01, METER02, ... TENANT01, TENANT02, ...',
+  `expression` JSON NOT NULL COMMENT 'JSON string of reporting objects, peroids, date ranges, and recipients',
+  `is_enabled` BOOL NOT NULL,
+  `last_run_datetime_utc` DATETIME,
+  `next_run_datetime_utc` DATETIME,
+  PRIMARY KEY (`id`));
+CREATE INDEX `tbl_reports_index_1` ON  `myems_reporting_db`.`tbl_reports` (`name`);
+
+
 -- ---------------------------------------------------------------------------------------------------------------------
 -- Table `myems_reporting_db`.`tbl_reports_files`
 -- ---------------------------------------------------------------------------------------------------------------------
diff --git a/database/upgrade/upgrade1.2.3.sql b/database/upgrade/upgrade1.2.3.sql
new file mode 100644
index 00000000..e5b2cbe5
--- /dev/null
+++ b/database/upgrade/upgrade1.2.3.sql
@@ -0,0 +1,21 @@
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_reporting_db`.`tbl_reports`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_reporting_db`.`tbl_reports` ;
+
+CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_reports` (
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(128) NOT NULL,
+  `uuid` CHAR(36) NOT NULL,
+  `category` VARCHAR(128) NOT NULL COMMENT 'SPACE, METER, VIRTUALMETER, TENANT, STORE, SHOPFLOOR, EQUIPMENT, COMBINEDEQUIPMENT',
+  `report_code` VARCHAR(128) NOT NULL COMMENT 'SPACE01, SPACE02, ... METER01, METER02, ... TENANT01, TENANT02, ...',
+  `expression` JSON NOT NULL COMMENT 'JSON string of reporting objects, peroids, date ranges, and recipients',
+  `is_enabled` BOOL NOT NULL,
+  `last_run_datetime_utc` DATETIME,
+  `next_run_datetime_utc` DATETIME,
+  PRIMARY KEY (`id`));
+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;