From 78a99d58604169db4a0d2a1f5c9c490fa32dc49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= Date: Sun, 20 Oct 2019 14:38:11 +0200 Subject: [PATCH] Allow previous Liquibase migration checksums for MariaDB If someone was using MariaDB before #1188, they were probably doing so by using the MySQL JDBC driver to pass the migration (which had the proper workarounds in place for some column types). This commit assumes that the migrations done that way were valid and produced the same result as running the MariaDB migrations after #1188. --- .../main/resources/liquibase/6.3/add-player-mixer.xml | 1 + .../liquibase/6.4/add-album-mb-release-id.xml | 1 + .../liquibase/6.4/add-media-file-mb-release-id.xml | 1 + .../src/main/resources/liquibase/legacy/schema25.xml | 3 +++ .../src/main/resources/liquibase/legacy/schema26.xml | 3 +++ .../src/main/resources/liquibase/legacy/schema28.xml | 2 ++ .../src/main/resources/liquibase/legacy/schema29.xml | 1 + .../src/main/resources/liquibase/legacy/schema30.xml | 2 ++ .../src/main/resources/liquibase/legacy/schema32.xml | 2 ++ .../src/main/resources/liquibase/legacy/schema35.xml | 3 +++ .../src/main/resources/liquibase/legacy/schema36.xml | 1 + .../src/main/resources/liquibase/legacy/schema38.xml | 1 + .../src/main/resources/liquibase/legacy/schema43.xml | 1 + .../src/main/resources/liquibase/legacy/schema45.xml | 1 + .../src/main/resources/liquibase/legacy/schema46.xml | 1 + .../src/main/resources/liquibase/legacy/schema47.xml | 10 ++++++++++ .../src/main/resources/liquibase/legacy/schema49.xml | 2 ++ .../src/main/resources/liquibase/legacy/schema52.xml | 2 ++ .../src/main/resources/liquibase/legacy/schema53.xml | 2 ++ 19 files changed, 40 insertions(+) diff --git a/airsonic-main/src/main/resources/liquibase/6.3/add-player-mixer.xml b/airsonic-main/src/main/resources/liquibase/6.3/add-player-mixer.xml index 881c65df..fb16bf4c 100644 --- a/airsonic-main/src/main/resources/liquibase/6.3/add-player-mixer.xml +++ b/airsonic-main/src/main/resources/liquibase/6.3/add-player-mixer.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + 8:f3bc74192812dcd68bcf8e5945f5a2ac diff --git a/airsonic-main/src/main/resources/liquibase/6.4/add-album-mb-release-id.xml b/airsonic-main/src/main/resources/liquibase/6.4/add-album-mb-release-id.xml index d8240b48..1d5cb768 100644 --- a/airsonic-main/src/main/resources/liquibase/6.4/add-album-mb-release-id.xml +++ b/airsonic-main/src/main/resources/liquibase/6.4/add-album-mb-release-id.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + 8:554b1dab1d0ae6808830d870acf83046 diff --git a/airsonic-main/src/main/resources/liquibase/6.4/add-media-file-mb-release-id.xml b/airsonic-main/src/main/resources/liquibase/6.4/add-media-file-mb-release-id.xml index 5ce5d45a..94a0438b 100644 --- a/airsonic-main/src/main/resources/liquibase/6.4/add-media-file-mb-release-id.xml +++ b/airsonic-main/src/main/resources/liquibase/6.4/add-media-file-mb-release-id.xml @@ -3,6 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + 8:fd01642a58f1fae9d908253d455e2255 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema25.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema25.xml index 32d05582..4a57146a 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema25.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema25.xml @@ -30,6 +30,7 @@ + 8:f360471c71fa278a72aeb0ef8b3792ee @@ -68,6 +69,7 @@ + 8:72e07b169e23067bd89ea458ff58fa48 @@ -90,6 +92,7 @@ + 8:4d92e7c97abc6f197f1236b0353ec2f7 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema26.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema26.xml index 480a159e..1fdeb8c7 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema26.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema26.xml @@ -46,6 +46,7 @@ + 8:0c6447f4d1ccad4b86d908f9533df044 @@ -71,6 +72,7 @@ + 8:d9c3069bd0ebe8f33546115abdf1eb98 @@ -96,6 +98,7 @@ + 8:c53234c8f3594f463f5a929bb769112b diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema28.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema28.xml index 0c9fb776..7a7a002c 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema28.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema28.xml @@ -16,6 +16,7 @@ + 8:df10cf4177190084441bc819d0a1e1c3 @@ -99,6 +100,7 @@ + 8:22047927537571b66b940c3da4c522ee diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema29.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema29.xml index c9789c3f..cb2f6ac9 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema29.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema29.xml @@ -16,6 +16,7 @@ + 8:fe1e8eafd7b3d08d810350d9a02c0f7b diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema30.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema30.xml index 37dedba6..2f349005 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema30.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema30.xml @@ -16,6 +16,7 @@ + 8:0d052a6db950c7dbe1e88c8b6d0fde93 @@ -30,6 +31,7 @@ + 8:d7dde2aca814346c586b547d7f3793e4 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema32.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema32.xml index 50d31ef6..970c14a0 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema32.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema32.xml @@ -40,6 +40,7 @@ + 8:8f6db2abc741f08aab64771fc1064c03 @@ -64,6 +65,7 @@ + 8:95f9f9399c94a8672b6d5102ba2b0a80 7:0d4fbe2adcca829c14d12a5b1a8229c5 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema35.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema35.xml index c5334698..24adac97 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema35.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema35.xml @@ -60,6 +60,7 @@ + 8:d428266eb794ae2f1361a6eec0f67672 @@ -91,6 +92,7 @@ + 8:60a4f99dea63d7813457a1b8f981f763 @@ -125,6 +127,7 @@ + 8:653b5e40160877def2fe855b03f8ed42 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema36.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema36.xml index 813405cd..cc353942 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema36.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema36.xml @@ -16,6 +16,7 @@ + 8:b32e656eb1338a3ecaeec3cfe3c2b8c3 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema38.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema38.xml index 1ab6c9ad..e8aeb09c 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema38.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema38.xml @@ -16,6 +16,7 @@ + 8:b667a345c9c60defe5a1b117f062c601 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema43.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema43.xml index eadf978a..42bf6c87 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema43.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema43.xml @@ -118,6 +118,7 @@ + 8:8ecc02a5ec4edb410a8babd0a8245216 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema45.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema45.xml index ebfdbde6..7c95d2d2 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema45.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema45.xml @@ -31,6 +31,7 @@ + 8:958f3a4e916720a8867885a2cf940d54 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema46.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema46.xml index fd009415..f6eada2d 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema46.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema46.xml @@ -16,6 +16,7 @@ + 8:a06ad5c377b5e13418ff69d33c6dc496 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml index dd41501f..fe5fb7ca 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml @@ -16,6 +16,7 @@ + 8:6a093828880a904bd57feebc0c01ebd1 @@ -116,6 +117,7 @@ + 8:6e1ae92177617c5dad56d1ba85b241c0 @@ -153,6 +155,7 @@ + 8:024d07d67c14a4c993d0cb124396c99c 7:a3a788d87fd58508ecb4acac39e255c6 @@ -246,6 +249,7 @@ + 8:2483df97b4b9984bd6ab324d837dcfcb @@ -277,6 +281,7 @@ + 8:32fc5e9da67a1547e7ef41241f9d198c @@ -308,6 +313,7 @@ + 8:f0c5210bccdb697dda5ab5c67f7cfe8b @@ -339,6 +345,7 @@ + 8:d23ef0e36774d376d3893c4e4f77fc08 @@ -376,6 +383,7 @@ + 8:d284dccefde5e604a9bd4e736484fc80 @@ -410,6 +418,7 @@ + 8:15f0f633935a0478e63be5544ac0adcb @@ -432,6 +441,7 @@ + 8:9c7f948604127f8800ef527181bc4f59 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema49.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema49.xml index b5dd5b22..7012a47d 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema49.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema49.xml @@ -26,6 +26,7 @@ + 8:48810c74f102adade1af439589febc11 @@ -36,6 +37,7 @@ + 8:7b001d801628d7030007fe2d288adf6b diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema52.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema52.xml index d472107d..d1ee5487 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema52.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema52.xml @@ -16,6 +16,7 @@ + 8:9eab62bc3d9cba6a9cfdbc58110a7df8 7:8fde86035edbca443a54b1861ae70819 7:e7e0f04cd4691ec2b5d955b449e0154b @@ -53,6 +54,7 @@ + 8:a23c4e58cf64a1a76cb2c990342a4890 diff --git a/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml index e0efd06e..67514bd3 100644 --- a/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml +++ b/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml @@ -47,6 +47,7 @@ + 8:354ba24098a5afe59761b39a36060298 @@ -71,6 +72,7 @@ + 8:a7e207e75eb9fbe25c2f911e89a26f21