Add better testing conditionals for Mariadb < 10.7

Author: choptastic

src/sql_bridge_test.erl

@@ -75,10 +75,20 @@ gen_setup(Adapter, ReplacementType, Host, Port) ->
 check_mysql_feature(uuid) ->
     Vsn = ?DB:fffr("select @@version"),
     io:format("MySQL Version: ~p", [Vsn]),
-    Enabled = case re:run(Vsn, "mariadb", [caseless, {capture, none}]) of
-        match ->
-            io:format("UUID Support Enabled~n"),
-            true;
+
+    Enabled = case re:run(Vsn, "^(\\d+)\\.(\\d+)\\.(\\d+)-mariadb", [caseless, {capture, all_but_first, list}]) of
+        {match, [Maj, Min, Pat]} ->
+            Major = list_to_integer(Maj),
+            Minor = list_to_integer(Min),
+            Patch = list_to_integer(Pat),
+            case {Major, Minor, Patch} >= {10, 7, 0} of
+                true ->
+                    io:format("UUID Support Enabled~n"),
+                    true;
+                false ->
+                    io:format("UUID Support Disabled (10.7+ Required~n"),
+                    false
+            end;
         nomatch ->
             io:format("UUID Tests Disabled~n"),
             false

test/db_config.sh

@@ -1,5 +1,20 @@
 #!/bin/bash
 
+compare_versions() {
+    #if [ $# -ne 2 ]; then
+    #    echo "Usage: compare_versions <version1> <version2>" >&2
+    #    return 2
+    #fi
+
+    if printf '%s\n%s\n' "$1" "$2" | sort -V -c 2>/dev/null; then
+        echo "$1 <= $2"
+        return 0
+    else
+        echo "$1 > $2"
+        return 1
+    fi
+}
+
 PGCMD="/usr/bin/psql -q"
 MYSQLCMD="/usr/bin/mysql --verbose"
 
@@ -22,13 +37,20 @@ $PGCMD sql_bridge_test <test/postgres/pg-test-2.sql
 echo "[*] Creating and populating the MySQL database"
 $MYSQLCMD <test/mysql/create-database.sql
 
-echo "[*] Checking if MySQL is actually MariaDB"
-MARIA=$($MYSQLCMD -B sql_bridge_test -e "select version()" | grep -i mariadb)
-if [[ -n $MARIA ]]; then
-    echo "[*] MySQL is MariaDB ($MARIA). Adding UUID Field Types"
-    $MYSQLCMD <test/mysql/uuid.sql
+echo "[*] Checking MySQL Version"
+MY_VSN=$($MYSQLCMD -B -e "select version()" | grep "[0-9]")
+echo "[*] MySQL Version: $MY_VSN"
+IS_MARIA=$(echo $MY_VSN | grep -i mariadb)
+if [[ -n $IS_MARIA ]]; then
+    echo "[*] MySQL is MariaDB"
+    if [[ $(compare_versions "10.6.99999" "$MY_VSN") ]]; then
+        echo "[*] MariaDB Version is 10.7+. Enabling UUID Field Types"
+        $MYSQLCMD <test/mysql/uuid.sql
+    else
+        echo "[ ] MariaDB is not 10.7+. Skipping UUID Field Types"
+    fi
 else
-    echo "[ ] MySQL is NOT MariaDB. Skipping UUID Type Fields"
+    echo "[ ] MySQL is NOT MariaDB. Skipping UUID Type Fields."
 fi
 
 if [[ -z $GITHUB_ACTION ]]; then