Add testing conditionals for uuid

Author: choptastic

src/sql_bridge_test.erl

@@ -66,8 +66,33 @@ gen_setup(Adapter, ReplacementType, Host, Port) ->
     application:set_env(sql_bridge, replacement_token_style, ReplacementType),
     application:set_env(sql_bridge, stringify_binaries, true),
     sql_bridge:start(),
+    case Adapter of
+        sql_bridge_epgsql -> set_feature(uuid, true);
+        sql_bridge_mysql_otp -> check_mysql_feature(uuid)
+    end,
     ?DB:q("delete from fruit").
 
+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;
+        nomatch ->
+            io:format("UUID Tests Disabled~n"),
+            false
+    end,
+    set_feature(uuid, Enabled).
+
+set_feature(Feature, TF) ->
+    persistent_term:put({sql_bridge_feature, Feature}, TF).
+
+get_feature(Feature) ->
+    persistent_term:get({sql_bridge_feature, Feature}).
+
+get_feature_uuid() ->
+    get_feature(uuid).
 
 epgsql_cleanup(_) ->
     application:stop(epgsql),
@@ -206,6 +231,7 @@ trans_status(StartTime, Tag, Msg, Args) ->
     Msg2 = "(~p) Trans Update [Tag = ~p] (~pms Elapsed): " ++ Msg ++ "\n",
     logger:notice(Msg2, Args2).
 
+
 main_tests(_) ->
     [
      ?_assertEqual([], ?DB:q("select * from fruit")),
@@ -278,9 +304,11 @@ main_tests(_) ->
      ?_assert(test_key_variety(other_auto, fun is_nonzero_integer/1)),
      ?_assert(test_key_variety(other_int, fun is_nonzero_integer/1)),
      ?_assert(test_key_variety(other_string, fun is_string/1)),
-     ?_assert(test_key_variety(other_uuid, fun is_uuid/1))
+     ?_assert(maybe_test(fun get_feature_uuid/0, fun() -> test_key_variety(other_uuid, fun is_uuid/1) end))
     ].
 
+
+
 is_nonzero_integer(X) ->
     is_integer(X) andalso X=/=0.
 
@@ -327,6 +355,12 @@ test_null() ->
     ID = ?DB:pl(other, [{otherid, 0}, {my_decimal, 123.5}]),
     ?DB:field(other, my_date, ID).
 
+maybe_test(CondFun, TestFun) ->
+    case CondFun() of
+        true -> TestFun();
+        false -> true
+    end.
+
 test_key_variety(Table, TypeFun) ->
     ID = ?DB:save(Table, [{some_text, "random_text"}]),
     true=TypeFun(ID),

test/db_config.sh

@@ -4,29 +4,37 @@ PGCMD="/usr/bin/psql -q"
 MYSQLCMD="/usr/bin/mysql --verbose"
 
 if [[ -z $GITHUB_ACTION ]]; then
-	## We're not in a github action, so we're going to use the ubuntu
-	## out-of-the-box configuration to connect to postgres and mysql
-	## with sudo.
-	## This could be reworked to install a local docker image, then remove it
-	## after the fact, but for now, this is the method we're going to use
-	PGCMD="sudo -u postgres $PGCMD"
-	MYSQLCMD="sudo $MYSQLCMD"
+    ## We're not in a github action, so we're going to use the ubuntu
+    ## out-of-the-box configuration to connect to postgres and mysql
+    ## with sudo.
+    ## This could be reworked to install a local docker image, then remove it
+    ## after the fact, but for now, this is the method we're going to use
+    PGCMD="sudo -u postgres $PGCMD"
+    MYSQLCMD="sudo $MYSQLCMD"
 else
-	MYSQLCMD="$MYSQLCMD -uroot"
+    MYSQLCMD="$MYSQLCMD -uroot"
 fi
 
-
 echo "[*] Initializing the PostreSQL database and user"
-$PGCMD < test/postgres/pg-test-1.sql
+$PGCMD <test/postgres/pg-test-1.sql
 echo "[*] Populating the PostreSQL database"
-$PGCMD sql_bridge_test < test/postgres/pg-test-2.sql
+$PGCMD sql_bridge_test <test/postgres/pg-test-2.sql
 echo "[*] Creating and populating the MySQL database"
-$MYSQLCMD < test/mysql/create-database.sql
+$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
+else
+    echo "[ ] MySQL is NOT MariaDB. Skipping UUID Type Fields"
+fi
 
 if [[ -z $GITHUB_ACTION ]]; then
-	## we only initialize the user if we're not running this from a github action.
-	## This is because the workflows file in .github/ is manually creating the
-	## users
-	echo "[*] Initializing the MySQL test user"
-	$MYSQLCMD < test/mysql/init-user.sql
+    ## we only initialize the user if we're not running this from a github action.
+    ## This is because the workflows file in .github/ is manually creating the
+    ## users
+    echo "[*] Initializing the MySQL test user"
+    $MYSQLCMD <test/mysql/init-user.sql
 fi

test/mysql/create-database.sql

@@ -23,8 +23,7 @@ create table other (
     si smallint,
     bi bigint,
     vc varchar(20),
-    c char(20),
-    u uuid
+    c char(20)
 );
 
 -- testing IDs that aren't tablename + 'id'
@@ -46,9 +45,3 @@ create table other_string (
     id varchar(25) primary key,
     some_text text
 );
-
-drop table if exists other_uuid;
-create table other_uuid (
-    id uuid primary key,
-    some_text text
-);

test/mysql/uuid.sql

@@ -0,0 +1,8 @@
+use sql_bridge_test;
+alter table other add u uuid;
+
+drop table if exists other_uuid;
+create table other_uuid (
+    id uuid primary key,
+    some_text text
+);