chore: rename sql files

Renames the sql files everywhere they are referenced to their new alphanumeric names.
IMA-WorldHealth · May 13, 2024 · c2d48e4 · c2d48e4
1 parent 8378f57
commit c2d48e4
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 50 deletions.
diff --git a/docs/en/for-developers/installing-bhima.md b/docs/en/for-developers/installing-bhima.md
@@ -167,7 +167,7 @@ To start a MySQL server using docker you can use:
 docker run --name mysql -p 3306:3306 \
  -e MYSQL_ROOT_PASSWORD=MyPassword \
  -e MYSQL_ROOT_HOST=% \
- -d mysql/mysql-server:8.0 \
+ -d mysql:8.3 \
  --sql-mode='STRICT_ALL_TABLES,NO_UNSIGNED_SUBTRACTION' \
  --default-authentication-plugin=mysql_native_password
 
@@ -176,21 +176,27 @@ docker run --name mysql -p 3306:3306 \
 
 This will start a MySQL server that listens on port 3306 (the default MySQL port) on your localhost. Additionally, you have to set `DB_HOST` in the `.env` file to `127.0.0.1`, leaving it to `localhost` will make the `mysql` command trying to connect via socket, what is not possible when using docker.
 
-If you have already a MySQL server running on port 3306 of your localhost, start docker without the port-forwarding (`-p 3306:3306`), use `docker inspect mysql5.7` to find the IP of the container and use that IP in the `.env` file as `DB_HOST`.
+Note that you can also run redis using docker if you prefer:
+
+```bash
+docker run --name redis -p 6379:6379 -d redis
+```
+
+If you have already a MySQL server running on port 3306 of your localhost, start docker without the port-forwarding (`-p 3306:3306`), use `docker inspect mysql` to find the IP of the container and use that IP in the `.env` file as `DB_HOST`.
 
 The database structure is contained in the `server/models/*.sql` files. You can execute these one by one in the order below, or simply run `yarn build:db`.
 
-1. `server/models/schema.sql`
-2. `server/models/functions.sql`
-3. `server/models/procedures.sql`
-4. `server/models/admin.sql`
-5. `server/models/triggers.sql`
+1. `server/models/01-schema.sql`
+2. `server/models/02-functions.sql`
+3. `server/models/03-procedures.sql`
+4. `server/models/98-admin.sql`
+5. `server/models/04-triggers.sql`
 
 
 This sets up the basic schema, routines, and triggers. The following scripts will build a basic dataset to begin playing around with:
 
-1. `server/models/icd10.sql`
-2. `server/models/bhima.sql`
+1. `server/models/05-icd10.sql`
+2. `server/models/06-bhima.sql`
 3. `test/data.sql`
 
 You can run all this by using the following command: `yarn build:db` Alternatively, you might use the `./sh/build-database.sh` script, customized with your environmental variables as shown below:

diff --git a/docs/fr/for-developers/installing-bhima.md b/docs/fr/for-developers/installing-bhima.md
@@ -132,7 +132,7 @@ Tu peux aussi utiliser docker avec mysql. Le command pour le lancer est:
 docker run --name mysql -p 3306:3306 \
  -e MYSQL_ROOT_PASSWORD=MyPassword \
  -e MYSQL_ROOT_HOST=% \
- -d mysql/mysql-server:8.0 \
+ -d mysql:8.3 \
  --sql-mode='STRICT_ALL_TABLES,NO_UNSIGNED_SUBTRACTION' \
  --default-authentication-plugin=mysql_native_password
 
@@ -141,18 +141,18 @@ docker run --name mysql -p 3306:3306 \
 Il faut changer le fichier `.env` pour mettre `DB_HOST` a `127.0.0.1`.
 
 
-La structure de la base de données est contenue dans les fichiers `server/models/*. Sql`. Vous pouvez les exécuter un par un dans l'ordre ci-dessous ou simplement lancer `yarn build: db`.
+La structure de la base de données est contenue dans les fichiers `server/models/*.sql`. Vous pouvez les exécuter un par un dans l'ordre ci-dessous ou simplement lancer `yarn build: db`.
 
-1. `server/models/schema.sql`
-2. `server/models/triggers.sql`
-3. `server/models/functions.sql`
-4. `server/models/procedures.sql`
-5. `server/models/admin.sql`
+1. `server/models/01-schema.sql`
+2. `server/models/04-triggers.sql`
+3. `server/models/02-functions.sql`
+4. `server/models/03-procedures.sql`
+5. `server/models/98-admin.sql`
 
 Ceci configure le schéma de base, les déclencheurs et les routines. Les scripts suivants créeront un ensemble de données de base avec lequel commencer à jouer:
 
-1. `server/models/icd10.sql`
-2. `server/models/bhima.sql`
+1. `server/models/05-icd10.sql`
+2. `server/models/06-bhima.sql`
 3. `test/data.sql`
 
 Vous pouvez exécuter tout cela en utilisant la commande suivante: `yarn build:db` Vous pouvez également utiliser le script`./sh/build-database.sh`, personnalisé à l'aide de vos variables d'environnement, comme indiqué ci-dessous:

diff --git a/sh/build-database.sh b/sh/build-database.sh
@@ -31,22 +31,22 @@ mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" -e "DROP DATABASE IF
 mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" || { echo 'failed to create DB' ; exit 1; }
 
 echo "[build] database schema"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/schema.sql || { echo 'failed to build DB schema' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/01-schema.sql || { echo 'failed to build DB schema' ; exit 1; }
 
 echo "[build] functions"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/functions.sql || { echo 'failed to import functions into DB' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/02-functions.sql || { echo 'failed to import functions into DB' ; exit 1; }
 
 echo "[build] procedures"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/procedures.sql || { echo 'failed to import procedures into DB 1/2' ; exit 1; }
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/admin.sql || { echo 'failed to import procedures into DB 2/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/03-procedures.sql || { echo 'failed to import procedures into DB 1/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/98-admin.sql || { echo 'failed to import procedures into DB 2/2' ; exit 1; }
 
 echo "[build] triggers"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/triggers.sql || { echo 'failed to import triggers into DB' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/04-triggers.sql || { echo 'failed to import triggers into DB' ; exit 1; }
 
 echo "[build] default data"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/icd10.sql || { echo 'failed to import default data into DB 1/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/05-icd10.sql || { echo 'failed to import default data into DB 1/2' ; exit 1; }
 
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/bhima.sql || { echo 'failed to import default data into DB 2/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/06-bhima.sql || { echo 'failed to import default data into DB 2/2' ; exit 1; }
 
 echo "[build] test data"
 mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < test/data.sql || { echo 'failed to import test data into DB' ; exit 1; }

diff --git a/sh/build-init-database.sh b/sh/build-init-database.sh
@@ -31,21 +31,21 @@ mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" -e "DROP DATABASE IF
 mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" || { echo "failed to create DB" ; exit 1; }
 
 echo "[ build ] database schema"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/schema.sql || { echo "failed to build DB scheme" ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/01-schema.sql || { echo "failed to build DB scheme" ; exit 1; }
 
 echo "[ build ] functions"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/functions.sql || { echo "failed to import functions into DB" ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/02-functions.sql || { echo "failed to import functions into DB" ; exit 1; }
 
 echo "[ build ] procedures"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/procedures.sql
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/admin.sql || { echo "failed to import procedures into DB 2/2" ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/03-procedures.sql
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/98-admin.sql || { echo "failed to import procedures into DB 2/2" ; exit 1; }
 
 echo "[ build ] triggers"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/triggers.sql
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/04-triggers.sql
 
 echo "[ build ] default data"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/icd10.sql || { echo "failed to import default data into DB 1/2" ; exit 1; }
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/bhima.sql || { echo "failed to import default data into DB 2/2" ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/05-icd10.sql || { echo "failed to import default data into DB 1/2" ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/06-bhima.sql || { echo "failed to import default data into DB 2/2" ; exit 1; }
 
 echo "[build] recomputing mappings"
 mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" -e "Call zRecomputeEntityMap();" || { echo "failed to recompute mappings 1/2" ; exit 1; }

diff --git a/sh/build-stock-database.sh b/sh/build-stock-database.sh
@@ -31,22 +31,22 @@ mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" -e "DROP DATABASE IF
 mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;" || { echo 'failed to create DB' ; exit 1; }
 
 echo "[build] database schema"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/schema.sql || { echo 'failed to build DB schema' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/01-schema.sql || { echo 'failed to build DB schema' ; exit 1; }
 
 echo "[build] functions"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/functions.sql || { echo 'failed to import functions into DB' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/02-functions.sql || { echo 'failed to import functions into DB' ; exit 1; }
 
 echo "[build] procedures"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/procedures.sql || { echo 'failed to import procedures into DB 1/2' ; exit 1; }
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/admin.sql || { echo 'failed to import procedures into DB 2/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/03-procedures.sql || { echo 'failed to import procedures into DB 1/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/98-admin.sql || { echo 'failed to import procedures into DB 2/2' ; exit 1; }
 
 echo "[build] triggers"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/triggers.sql || { echo 'failed to import triggers into DB' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/04-triggers.sql || { echo 'failed to import triggers into DB' ; exit 1; }
 
 echo "[build] default data"
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/icd10.sql || { echo 'failed to import default data into DB 1/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/05-icd10.sql || { echo 'failed to import default data into DB 1/2' ; exit 1; }
 
-mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/bhima.sql || { echo 'failed to import default data into DB 2/2' ; exit 1; }
+mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < server/models/06-bhima.sql || { echo 'failed to import default data into DB 2/2' ; exit 1; }
 
 echo "[build] stock test data"
 mysql -u "$DB_USER" -p"$DB_PASS" -h"$DB_HOST" -P"$DB_PORT" "$DB_NAME" < test/data/enterprise.sql || { echo 'failed to import test data into DB 1/5' ; exit 1; }

diff --git a/sh/debian-install.sh b/sh/debian-install.sh
@@ -293,21 +293,21 @@ cp .env bin/
 echo "Building initial mysql database..."
 
 echo "[ build ] database schema"
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/schema.sql || { echo "failed to build DB scheme" ; exit 1; }
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/01-schema.sql || { echo "failed to build DB scheme" ; exit 1; }
 echo "[ build ] functions"
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/functions.sql || { echo "failed to import functions into DB" ; exit 1; }
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/02-functions.sql || { echo "failed to import functions into DB" ; exit 1; }
 
 echo "[ build ] procedures"
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/procedures.sql || { echo "failed to import procedures into DB 1/2" ; exit 1; }
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/03-procedures.sql || { echo "failed to import procedures into DB 1/2" ; exit 1; }
 
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/admin.sql || { echo "failed to import procedures into DB 2/2" ; exit 1; }
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/98-admin.sql || { echo "failed to import procedures into DB 2/2" ; exit 1; }
 
 echo "[ build ] triggers"
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/triggers.sql
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/04-triggers.sql
 
 echo "[ build ] default data"
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/icd10.sql || { echo "failed to import default data into DB 1/2" ; exit 1; }
-mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/bhima.sql || { echo "failed to import default data into DB 2/2" ; exit 1; }
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/05-icd10.sql || { echo "failed to import default data into DB 1/2" ; exit 1; }
+mysql "$BHIMA_DB_NAME" < $HOME/apps/bhima/bin/server/models/06-bhima.sql || { echo "failed to import default data into DB 2/2" ; exit 1; }
 
 echo "[build] recomputing mappings"
 mysql "$BHIMA_DB_NAME" -e "Call zRecomputeEntityMap();" || { echo "failed to recompute mappings 1/2" ; exit 1; }

diff --git a/sh/setup-migration-script.sh b/sh/setup-migration-script.sh
@@ -55,10 +55,10 @@ mysql -u $DB_USER --password=$DB_PASS -e "SELECT CONCAT('DROP ',ROUTINE_TYPE,' I
 echo "" >> $MIGRATION_FILE
 
 echo "[migrate] Adding latest triggers, functions, and procedures to $DATABASE."
-cat "$BHIMA_PATH"/server/models/functions.sql \
- "$BHIMA_PATH"/server/models/procedures.sql \
- "$BHIMA_PATH"/server/models/admin.sql \
- "$BHIMA_PATH"/server/models/triggers.sql \
+cat "$BHIMA_PATH"/server/models/02-functions.sql \
+ "$BHIMA_PATH"/server/models/03-procedures.sql \
+ "$BHIMA_PATH"/server/models/98-admin.sql \
+ "$BHIMA_PATH"/server/models/04-triggers.sql \
  >> $MIGRATION_FILE
 
 echo "" >> $MIGRATION_FILE