diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 8427ea09e4..c0cca09bcb 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -66,11 +66,10 @@ runs: cd testing_mygame shell: bash - - name: Verify MySQL row format before migrations + - name: Verify MySQL settings before migrations if: ${{ inputs.testing-db == 'mysql' }} - working-directory: testing_mygame run: | - python -c "import os; import django; os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'server.conf.settings'); django.setup(); from django.db import connection; cursor = connection.cursor(); cursor.execute('SELECT @@innodb_default_row_format'); result = cursor.fetchone(); print(f'MySQL default row format (must be DYNAMIC): {result[0]}'); assert result[0] == 'dynamic' or result[0] == 'DYNAMIC', f'Expected DYNAMIC, got {result[0]}'" + mysql -h 127.0.0.1 -u evennia -ppassword evennia -e "SELECT @@innodb_default_row_format as row_format, @@innodb_large_prefix as large_prefix;" shell: bash - name: Run migrations diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml index 8898e5f9e9..62e66b98e6 100644 --- a/.github/actions/setup-database/action.yml +++ b/.github/actions/setup-database/action.yml @@ -62,6 +62,7 @@ runs: CREATE USER IF NOT EXISTS 'evennia'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON \`evennia%\`.* TO 'evennia'@'%'; GRANT PROCESS ON *.* TO 'evennia'@'%'; + GRANT SESSION_VARIABLES_ADMIN ON *.* TO 'evennia'@'%'; FLUSH PRIVILEGES; EOF # Set database character set