updated database installation script and README

Merge branch 'develop'
2021-10-04 18:08:43 +08:00 · 2021-10-04 18:08:43 +08:00 · b3d5816cfc
parent 795fd04819 cf879c4421
commit b3d5816cfc
10 changed files with 3 additions and 1 deletions
--- 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
--- a/database/install/myems_billing_baseline_db.sql
+++ b/database/install/myems_billing_baseline_db.sql
--- a/database/install/myems_billing_db.sql
+++ b/database/install/myems_billing_db.sql
--- a/database/install/myems_energy_baseline_db.sql
+++ b/database/install/myems_energy_baseline_db.sql
--- a/database/install/myems_energy_db.sql
+++ b/database/install/myems_energy_db.sql
--- a/database/install/myems_fdd_db.sql
+++ b/database/install/myems_fdd_db.sql
--- a/database/install/myems_historical_db.sql
+++ b/database/install/myems_historical_db.sql
--- a/database/install/myems_reporting_db.sql
+++ b/database/install/myems_reporting_db.sql
--- a/database/install/myems_system_db.sql
+++ b/database/install/myems_system_db.sql
--- a/database/install/myems_user_db.sql
+++ b/database/install/myems_user_db.sql