diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-11-02 12:37:06 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-11-02 12:37:06 +0000 |
| commit | 40a3c65a536090c4e021affd59ae466d8edccc51 (patch) | |
| tree | 918627b0dcaa56879f59a26adee2a77eeba513a3 | |
| parent | 6d9ab8ae42b2f60e5fe880bbfe422b703e372c92 (diff) | |
remove parameter -f from mysql commands, fixes #3417
Closes #3417
Merge request studip/studip!2321
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | .gitlab/scripts/install_db.sh | 16 |
2 files changed, 14 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d834db..1b6b6af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -252,7 +252,8 @@ test-functional: <<: *composer-cache policy: pull services: - - mariadb + - name: mariadb + command: ["--sql_mode="] allow_failure: false interruptible: true before_script: @@ -276,7 +277,8 @@ test-jsonapi: <<: *composer-cache policy: pull services: - - mariadb + - name: mariadb + command: ["--sql_mode="] variables: JSONAPI_XML_REPORT: $REPORT_DIR/jsonapi-report.xml interruptible: true @@ -310,7 +312,8 @@ test-e2e: # needs: [lint-css, lint-js, lint-php] image: mcr.microsoft.com/playwright:v1.33.0-jammy services: - - mariadb + - name: mariadb + command: ["--sql_mode="] variables: PHP_WEBSERVER_URL: localhost:65432 E2E_REPORT: $REPORT_DIR/e2e.xml diff --git a/.gitlab/scripts/install_db.sh b/.gitlab/scripts/install_db.sh index 0f2f554..f095f1e 100644 --- a/.gitlab/scripts/install_db.sh +++ b/.gitlab/scripts/install_db.sh @@ -1,26 +1,26 @@ #!/bin/bash set -e -if [ $(mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "show tables;" --batch | wc -l) -eq 0 ]; then +if [ $(mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "show tables;" --batch | wc -l) -eq 0 ]; then # Setup mysql database echo "INSTALL DB" - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip.sql echo "INSTALL DEFAULT DATA" - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_default_data.sql - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_default_data.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_default_data.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_default_data.sql echo "INSTALL ROOTUSER" - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_root_user.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_root_user.sql # Check if demodata is required if [ ! -z $DEMO_DATA ]; then echo "INSTALL DEMODATA" - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_demo_data.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_demo_data.sql echo "INSTALL MVV_DEMODATA" - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_mvv_demo_data.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_mvv_demo_data.sql echo "INSTALL RESOURCES-DEMODATA" - mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_demo_data.sql + mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_demo_data.sql fi echo "INSTALLATION FINISHED" |