move and rename sql script, fix path

ral-facilities · Feb 13, 2023 · f14bccb · f14bccb
1 parent 9e4da17
commit f14bccb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -293,9 +293,9 @@ jobs:
       - name: Add dummy data to icatdb
         run: poetry run python -m util.icat_db_generator
       - name: Drop modTime and createTime
-        run: mysql -picatdbuserpw -uicatdbuser icatdb < /home/runner/work/datagateway-api/tables_to_drop.sql
+        run: mysql -picatdbuserpw -uicatdbuser icatdb < /home/runner/work/datagateway-api/datagateway-api/util/columns_to_drop.sql
       - name: Get SQL dump of dummy data to be prepared
-        run: mysqldump -picatdbuserpw -uicatdbuser --skip-comments icatdb > ~/generator_script_dump_1_unprepared.sql
+        run: mysqldump -picatdbuserpw -uicatdbuser --skip-comments icatdb > ~/generator_script_dump_1.sql
 
       # Drop and re-create icatdb to remove generated data
       - name: Drop icatdb
@@ -310,7 +310,7 @@ jobs:
         run: |
           cd /home/runner/work/datagateway-api/datagateway-api; poetry run python -m util.icat_db_generator
       - name: Drop modTime and createTime
-        run: mysql -picatdbuserpw -uicatdbuser icatdb < /home/runner/work/datagateway-api/tables_to_drop.sql
+        run: mysql -picatdbuserpw -uicatdbuser icatdb < /home/runner/work/datagateway-api/datagateway-api/util/columns_to_drop.sql
       - name: Get SQL dump of new dummy data
         run: mysqldump -picatdbuserpw -uicatdbuser --skip-comments icatdb > ~/generator_script_dump_2.sql
 
@@ -349,7 +349,7 @@ jobs:
       - name: Add dummy data to icatdb
         run: poetry run python -m util.icat_db_generator
       - name: Drop modTime and createTime
-        run: mysql -picatdbuserpw -uicatdbuser icatdb < /home/runner/work/datagateway-api/tables_to_drop.sql
+        run: mysql -picatdbuserpw -uicatdbuser icatdb < /home/runner/work/datagateway-api/datagateway-api/util/columns_to_drop.sql
       - name: Get SQL dump of dummy data from main's generator script
         run: mysqldump -picatdbuserpw -uicatdbuser --skip-comments icatdb > ~/generator_script_dump_main.sql
 

diff --git a/tables_to_drop.sql → util/columns_to_drop.sql b/tables_to_drop.sql → util/columns_to_drop.sql