Merge branch 'develop' into fork_develop

core/data/schema/versions/SDEZ_1_rollback.sql

@@ -0,0 +1,3 @@
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE mai2_playlog DROP COLUMN trialPlayAchievement;
+SET FOREIGN_KEY_CHECKS=1;

core/data/schema/versions/SDEZ_2_upgrade.sql

@@ -0,0 +1,3 @@
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE mai2_playlog ADD trialPlayAchievement INT NULL;
+SET FOREIGN_KEY_CHECKS=1;

docs/INSTALL_UBUNTU.md

@@ -51,7 +51,7 @@ sudo apt install -f mysql-client=5.7* mysql-community-server=5.7* mysql-server=5
 ```
 CREATE USER 'aime'@'localhost' IDENTIFIED BY 'MyStrongPass.';
 CREATE DATABASE aime;
-GRANT Alter,Create,Delete,Drop,Insert,References,Select,Update ON aime.* TO 'aime'@'localhost';
+GRANT Alter,Create,Delete,Drop,Index,Insert,References,Select,Update ON aime.* TO 'aime'@'localhost';
 FLUSH PRIVILEGES;
 exit;
 ```

docs/INSTALL_WINDOWS.md

@@ -27,7 +27,7 @@ This step-by-step guide assumes that you are using a fresh install of Windows 10
 ```
 CREATE USER 'aime'@'localhost' IDENTIFIED BY 'MyStrongPass.';
 CREATE DATABASE aime;
-GRANT Alter,Create,Delete,Drop,Insert,References,Select,Update ON aime.* TO 'aime'@'localhost';
+GRANT Alter,Create,Delete,Drop,Index,Insert,References,Select,Update ON aime.* TO 'aime'@'localhost';
 FLUSH PRIVILEGES;
 exit;
 ```

titles/mai2/__init__.py

@@ -15,4 +15,4 @@ trailing_slash = True
 use_default_host = False
 host = ""
 
-current_schema_version = 1
+current_schema_version = 2

titles/mai2/schema/score.py

@@ -135,6 +135,7 @@ playlog = Table(
     Column("isNewFree", Boolean),
     Column("extNum1", Integer),
     Column("extNum2", Integer),
+    Column("trialPlayAchievement", Integer),
     mysql_charset='utf8mb4'
 )