Skip to content
Snippets Groups Projects
Commit 40a3c65a authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

remove parameter -f from mysql commands, fixes #3417

Closes #3417

Merge request studip/studip!2321
parent 6d9ab8ae
No related branches found
No related tags found
No related merge requests found
...@@ -252,7 +252,8 @@ test-functional: ...@@ -252,7 +252,8 @@ test-functional:
<<: *composer-cache <<: *composer-cache
policy: pull policy: pull
services: services:
- mariadb - name: mariadb
command: ["--sql_mode="]
allow_failure: false allow_failure: false
interruptible: true interruptible: true
before_script: before_script:
...@@ -276,7 +277,8 @@ test-jsonapi: ...@@ -276,7 +277,8 @@ test-jsonapi:
<<: *composer-cache <<: *composer-cache
policy: pull policy: pull
services: services:
- mariadb - name: mariadb
command: ["--sql_mode="]
variables: variables:
JSONAPI_XML_REPORT: $REPORT_DIR/jsonapi-report.xml JSONAPI_XML_REPORT: $REPORT_DIR/jsonapi-report.xml
interruptible: true interruptible: true
...@@ -310,7 +312,8 @@ test-e2e: ...@@ -310,7 +312,8 @@ test-e2e:
# needs: [lint-css, lint-js, lint-php] # needs: [lint-css, lint-js, lint-php]
image: mcr.microsoft.com/playwright:v1.33.0-jammy image: mcr.microsoft.com/playwright:v1.33.0-jammy
services: services:
- mariadb - name: mariadb
command: ["--sql_mode="]
variables: variables:
PHP_WEBSERVER_URL: localhost:65432 PHP_WEBSERVER_URL: localhost:65432
E2E_REPORT: $REPORT_DIR/e2e.xml E2E_REPORT: $REPORT_DIR/e2e.xml
......
#!/bin/bash #!/bin/bash
set -e 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 # Setup mysql database
echo "INSTALL DB" 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" echo "INSTALL DEFAULT DATA"
mysql -f -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_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_resources_default_data.sql
echo "INSTALL ROOTUSER" 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 # Check if demodata is required
if [ ! -z $DEMO_DATA ]; then if [ ! -z $DEMO_DATA ]; then
echo "INSTALL DEMODATA" 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" 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" 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 fi
echo "INSTALLATION FINISHED" echo "INSTALLATION FINISHED"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment