From dca4a6da265cd92df2fafa3772d0393600e0f86b Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Mon, 24 May 2021 18:27:47 +0800
Subject: [PATCH] updated tbl_expressions in database

---
 database/myems_system_db.sql | 4 ++--
 database/upgrade1.1.3.sql    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/database/myems_system_db.sql b/database/myems_system_db.sql
index d69889b2..c7e770ed 100644
--- a/database/myems_system_db.sql
+++ b/database/myems_system_db.sql
@@ -704,7 +704,7 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_expressions` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `uuid` CHAR(36) NOT NULL,
   `virtual_meter_id` BIGINT NOT NULL,
-  `equation` VARCHAR(1024) NOT NULL,
+  `equation` LONGTEXT NOT NULL,
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_expressions_index_1` ON  `myems_system_db`.`tbl_expressions`   (`virtual_meter_id`);
 
@@ -717,7 +717,7 @@ CREATE INDEX `tbl_expressions_index_1` ON  `myems_system_db`.`tbl_expressions`
 -- INSERT INTO `myems_system_db`.`tbl_expressions`
 -- (`id`, `uuid`, `virtual_meter_id`, `equation`)
 -- VALUES
--- (1, '3fff2cfb-f755-44c8-a919-6135205a8573', 1, 'x+y-z');
+-- (1, '3fff2cfb-f755-44c8-a919-6135205a8573', 1, 'x1+x2-x3');
 -- COMMIT;
 
 -- ---------------------------------------------------------------------------------------------------------------------
diff --git a/database/upgrade1.1.3.sql b/database/upgrade1.1.3.sql
index 614ec682..c6fd7b09 100644
--- a/database/upgrade1.1.3.sql
+++ b/database/upgrade1.1.3.sql
@@ -2,6 +2,9 @@
 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;
 
+-- UPDATE EXPRESSION TABLE
+ALTER TABLE myems_system_db.tbl_expressions MODIFY COLUMN equation LONGTEXT NOT NULL;
+
 
 -- UPDATE VERSION NUMBER
 UPDATE myems_system_db.tbl_versions SET version='1.1.3', release_date='2021-05-05' WHERE id=1;