rename data_model to datamodel (#171)

* rename data_model to datamodel * rename data_model to datamodel
opengisch · Jan 30, 2024 · acd8072 · acd8072
1 parent 3cf5ccb
commit acd8072
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 13 deletions.
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     image: schemaspy/schemaspy
     volumes:
       - ../model-documentation:/output
-      - ${SOURCE_DIR:-..}/data_model/schemaspy.properties:/schemaspy.properties
+      - ${SOURCE_DIR:-..}/datamodel/schemaspy.properties:/schemaspy.properties
     depends_on:
       - signalo
     network_mode: "service:signalo"

diff --git a/.docker/init_db.sh b/.docker/init_db.sh
@@ -46,7 +46,7 @@ if [ "$#" == "0" ] || [ "$1" == "build" ]; then
   echo '----------------------------------------'
   echo "Building database normally (passing argument: ${@:2})"
 
-  ./data_model/setup.sh ${@:2}
+  ./datamodel/setup.sh ${@:2}
 
   echo "Done ! Database ${PGSERVICE} can now be used."
   echo '----------------------------------------'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,16 +52,16 @@ jobs:
           sed -i 's|projectname="Signalo - Demo"|projectname="Signalo - v${{ github.event.release.tag_name }}"|' project/signalo.qgs
           sed 's/pg_signalo/pg_signalo_dev/g' project/signalo.qgs > project/signalo_dev.qgs
           sed 's/pg_signalo/pg_signalo_prod/g' project/signalo.qgs > project/signalo_prod.qgs
-          cp data_model/demo_data/this-is-the-way.jpg project/this-is-the-way.jpg
+          cp datamodel/demo_data/this-is-the-way.jpg project/this-is-the-way.jpg
           zip -r signalo-${{ github.event.release.tag_name }}-project.zip project README.md
 
       - name: zip changelogs
         run: |
-          zip -r signalo-${{ github.event.release.tag_name }}-changelogs.zip data_model/changelogs
+          zip -r signalo-${{ github.event.release.tag_name }}-changelogs.zip datamodel/changelogs
 
       - name: schemaspy
         run: |
-          sed -i "s/version dev/version ${{ github.event.release.tag_name }}/" data_model/schemaspy.properties
+          sed -i "s/version dev/version ${{ github.event.release.tag_name }}/" datamodel/schemaspy.properties
           docker compose run schemaspy
           zip -r signalo-${{ github.event.release.tag_name }}-model-documentation.zip model-documentation/*
 

diff --git a/data_model/app/__init__.py → datamodel/app/__init__.py b/data_model/app/__init__.py → datamodel/app/__init__.py
diff --git a/data_model/app/create_app.py → datamodel/app/create_app.py b/data_model/app/create_app.py → datamodel/app/create_app.py
@@ -29,11 +29,11 @@ def create_views(srid: int, pg_service: str):
 
     variables = {"SRID": srid}
 
-    run_sql("data_model/app/drop_schema.sql", pg_service, variables)
+    run_sql("datamodel/app/drop_schema.sql", pg_service, variables)
 
-    run_sql("data_model/app/create_schema.sql", pg_service, variables)
+    run_sql("datamodel/app/create_schema.sql", pg_service, variables)
 
-    run_sql("data_model/app/vw_edited_support.sql", pg_service, variables)
+    run_sql("datamodel/app/vw_edited_support.sql", pg_service, variables)
     vw_sign_symbol(pg_service=pg_service, srid=srid)
 
 

diff --git a/data_model/app/create_schema.sql → datamodel/app/create_schema.sql b/data_model/app/create_schema.sql → datamodel/app/create_schema.sql
diff --git a/data_model/app/drop_schema.sql → datamodel/app/drop_schema.sql b/data_model/app/drop_schema.sql → datamodel/app/drop_schema.sql
diff --git a/data_model/app/vw_edited_support.sql → datamodel/app/vw_edited_support.sql b/data_model/app/vw_edited_support.sql → datamodel/app/vw_edited_support.sql
diff --git a/data_model/app/vw_sign_symbol.py → datamodel/app/vw_sign_symbol.py b/data_model/app/vw_sign_symbol.py → datamodel/app/vw_sign_symbol.py
diff --git a/data_model/changelogs/0001/0001_1.sql → datamodel/changelogs/0001/0001_1.sql b/data_model/changelogs/0001/0001_1.sql → datamodel/changelogs/0001/0001_1.sql
diff --git a/...odel/changelogs/0002/0002_1_sign-5.00.sql → ...odel/changelogs/0002/0002_1_sign-5.00.sql b/...odel/changelogs/0002/0002_1_sign-5.00.sql → ...odel/changelogs/0002/0002_1_sign-5.00.sql
diff --git a/...del/changelogs/0003/0003_fix_img_size.sql → ...del/changelogs/0003/0003_fix_img_size.sql b/...del/changelogs/0003/0003_fix_img_size.sql → ...del/changelogs/0003/0003_fix_img_size.sql
diff --git a/...elogs/0004/0004_fix_img_size_followup.sql → ...elogs/0004/0004_fix_img_size_followup.sql b/...elogs/0004/0004_fix_img_size_followup.sql → ...elogs/0004/0004_fix_img_size_followup.sql
diff --git a/data_model/changelogs/0005/0005_fix_vls.sql → datamodel/changelogs/0005/0005_fix_vls.sql b/data_model/changelogs/0005/0005_fix_vls.sql → datamodel/changelogs/0005/0005_fix_vls.sql
diff --git a/..._model/changelogs/0006/0006_delete_en.sql → datamodel/changelogs/0006/0006_delete_en.sql b/..._model/changelogs/0006/0006_delete_en.sql → datamodel/changelogs/0006/0006_delete_en.sql
diff --git a/..._model/changelogs/0006/0006_new_signs.sql → datamodel/changelogs/0006/0006_new_signs.sql b/..._model/changelogs/0006/0006_new_signs.sql → datamodel/changelogs/0006/0006_new_signs.sql
diff --git a/...del/changelogs/0006/0006_translate_de.sql → ...del/changelogs/0006/0006_translate_de.sql b/...del/changelogs/0006/0006_translate_de.sql → ...del/changelogs/0006/0006_translate_de.sql
diff --git a/...model/changelogs/0006/0006_user_signs.sql → ...model/changelogs/0006/0006_user_signs.sql b/...model/changelogs/0006/0006_user_signs.sql → ...model/changelogs/0006/0006_user_signs.sql
diff --git a/...del/changelogs/0100/0100_anchor-point.sql → ...del/changelogs/0100/0100_anchor-point.sql b/...del/changelogs/0100/0100_anchor-point.sql → ...del/changelogs/0100/0100_anchor-point.sql
diff --git a/data_model/changelogs/0100/0100_indexes.sql → datamodel/changelogs/0100/0100_indexes.sql b/data_model/changelogs/0100/0100_indexes.sql → datamodel/changelogs/0100/0100_indexes.sql
diff --git a/...l/changelogs/0100/0100_support_photo2.sql → ...l/changelogs/0100/0100_support_photo2.sql b/...l/changelogs/0100/0100_support_photo2.sql → ...l/changelogs/0100/0100_support_photo2.sql
diff --git a/...l/changelogs/0100/0100_user_signs_img.sql → ...l/changelogs/0100/0100_user_signs_img.sql b/...l/changelogs/0100/0100_user_signs_img.sql → ...l/changelogs/0100/0100_user_signs_img.sql
diff --git a/data_model/demo_data/azimut_content.sql → datamodel/demo_data/azimut_content.sql b/data_model/demo_data/azimut_content.sql → datamodel/demo_data/azimut_content.sql
diff --git a/data_model/demo_data/frame_content.sql → datamodel/demo_data/frame_content.sql b/data_model/demo_data/frame_content.sql → datamodel/demo_data/frame_content.sql
diff --git a/data_model/demo_data/owner_content.sql → datamodel/demo_data/owner_content.sql b/data_model/demo_data/owner_content.sql → datamodel/demo_data/owner_content.sql
diff --git a/data_model/demo_data/sign_content.sql → datamodel/demo_data/sign_content.sql b/data_model/demo_data/sign_content.sql → datamodel/demo_data/sign_content.sql
diff --git a/data_model/demo_data/support_content.sql → datamodel/demo_data/support_content.sql b/data_model/demo_data/support_content.sql → datamodel/demo_data/support_content.sql
diff --git a/data_model/demo_data/this-is-the-way.jpg → datamodel/demo_data/this-is-the-way.jpg b/data_model/demo_data/this-is-the-way.jpg → datamodel/demo_data/this-is-the-way.jpg
diff --git a/..._model/demo_data/vl_user_sign_content.sql → datamodel/demo_data/vl_user_sign_content.sql b/..._model/demo_data/vl_user_sign_content.sql → datamodel/demo_data/vl_user_sign_content.sql
diff --git a/data_model/schemaspy.properties → datamodel/schemaspy.properties b/data_model/schemaspy.properties → datamodel/schemaspy.properties
diff --git a/data_model/setup.sh → datamodel/setup.sh b/data_model/setup.sh → datamodel/setup.sh
diff --git a/doc/testing.md b/doc/testing.md
@@ -47,4 +47,4 @@ To start SIGNALO virtual environement automatically with Docker, use: `docker up
 
 ## Setup on an existing DB server
 
-Run bash script to init the data model: `data_model/setup.sh -p _PG_SERVICE_`
+Run bash script to init the data model: `datamodel/setup.sh -p _PG_SERVICE_`
diff --git a/scripts/dump-demodata.sh b/scripts/dump-demodata.sh
@@ -5,5 +5,5 @@ TABLES=( sign azimut frame support vl_user_sign)
 export PGSERVICE=pg_signalo
 
 for TABLE in "${TABLES[@]}"; do
-  pg_dump --data-only -t signalo_db.${TABLE} --column-inserts | gsort | gsed '/^INSERT/!d' > data_model/demo_data/${TABLE}_content.sql
+  pg_dump --data-only -t signalo_db.${TABLE} --column-inserts | gsort | gsed '/^INSERT/!d' > datamodel/demo_data/${TABLE}_content.sql
 done
diff --git a/test/test-changelog.sh b/test/test-changelog.sh
@@ -5,9 +5,9 @@ set -e
 
 return_code=0
 
-for file in $(find data_model/changelogs -type f); do
-  if ! grep -q $(basename ${file}) data_model/setup.sh; then
-    echo "changelog file ${file} not found in data_model/setup.sh"
+for file in $(find datamodel/changelogs -type f); do
+  if ! grep -q $(basename ${file}) datamodel/setup.sh; then
+    echo "changelog file ${file} not found in datamodel/setup.sh"
     return_code=1
   fi
 done
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,4 @@ To start SIGNALO virtual environement automatically with Docker, use: `docker up

		## Setup on an existing DB server

		Run bash script to init the data model: `data_model/setup.sh -p _PG_SERVICE_`
		Run bash script to init the data model: `datamodel/setup.sh -p _PG_SERVICE_`