From cf879c44217558b13e28fdaf6d7d0326ef0f916b Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Mon, 4 Oct 2021 18:07:16 +0800
Subject: [PATCH] updated database installation script and README

---
 database/README.md                                   | 4 +++-
 database/{ => install}/myems_billing_baseline_db.sql | 0
 database/{ => install}/myems_billing_db.sql          | 0
 database/{ => install}/myems_energy_baseline_db.sql  | 0
 database/{ => install}/myems_energy_db.sql           | 0
 database/{ => install}/myems_fdd_db.sql              | 0
 database/{ => install}/myems_historical_db.sql       | 0
 database/{ => install}/myems_reporting_db.sql        | 0
 database/{ => install}/myems_system_db.sql           | 0
 database/{ => install}/myems_user_db.sql             | 0
 10 files changed, 3 insertions(+), 1 deletion(-)
 rename database/{ => install}/myems_billing_baseline_db.sql (100%)
 rename database/{ => install}/myems_billing_db.sql (100%)
 rename database/{ => install}/myems_energy_baseline_db.sql (100%)
 rename database/{ => install}/myems_energy_db.sql (100%)
 rename database/{ => install}/myems_fdd_db.sql (100%)
 rename database/{ => install}/myems_historical_db.sql (100%)
 rename database/{ => install}/myems_reporting_db.sql (100%)
 rename database/{ => install}/myems_system_db.sql (100%)
 rename database/{ => install}/myems_user_db.sql (100%)

diff --git a/database/README.md b/database/README.md
index 2a120a8e..2143a513 100644
--- a/database/README.md
+++ b/database/README.md
@@ -15,6 +15,7 @@ Providing database schema and scripts for MyEMS.
 
 Execute the following scripts in MySQL commandline, or execute in other MySQL client tools such as MySQL Workbench, Navicat, DBaver, phpMyAdmin, etc.
 ```bash
+cd myems/database/install
 mysql -u root -p < myems_billing_baseline_db.sql
 mysql -u root -p < myems_billing_db.sql
 mysql -u root -p < myems_energy_baseline_db.sql
@@ -27,7 +28,8 @@ mysql -u root -p < myems_user_db.sql
 ```
 To insert demo data execute the following scripts,
 ```bash
-mysql -u root -p < demo/myems_system_db.sql
+cd myems/database/demo
+mysql -u root -p < myems_system_db.sql
 ```
 #### Change COLLATE for MySQL server before version 8.0
 ```bash
diff --git a/database/myems_billing_baseline_db.sql b/database/install/myems_billing_baseline_db.sql
similarity index 100%
rename from database/myems_billing_baseline_db.sql
rename to database/install/myems_billing_baseline_db.sql
diff --git a/database/myems_billing_db.sql b/database/install/myems_billing_db.sql
similarity index 100%
rename from database/myems_billing_db.sql
rename to database/install/myems_billing_db.sql
diff --git a/database/myems_energy_baseline_db.sql b/database/install/myems_energy_baseline_db.sql
similarity index 100%
rename from database/myems_energy_baseline_db.sql
rename to database/install/myems_energy_baseline_db.sql
diff --git a/database/myems_energy_db.sql b/database/install/myems_energy_db.sql
similarity index 100%
rename from database/myems_energy_db.sql
rename to database/install/myems_energy_db.sql
diff --git a/database/myems_fdd_db.sql b/database/install/myems_fdd_db.sql
similarity index 100%
rename from database/myems_fdd_db.sql
rename to database/install/myems_fdd_db.sql
diff --git a/database/myems_historical_db.sql b/database/install/myems_historical_db.sql
similarity index 100%
rename from database/myems_historical_db.sql
rename to database/install/myems_historical_db.sql
diff --git a/database/myems_reporting_db.sql b/database/install/myems_reporting_db.sql
similarity index 100%
rename from database/myems_reporting_db.sql
rename to database/install/myems_reporting_db.sql
diff --git a/database/myems_system_db.sql b/database/install/myems_system_db.sql
similarity index 100%
rename from database/myems_system_db.sql
rename to database/install/myems_system_db.sql
diff --git a/database/myems_user_db.sql b/database/install/myems_user_db.sql
similarity index 100%
rename from database/myems_user_db.sql
rename to database/install/myems_user_db.sql