luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correctly check if the RETURNING keyword is available.

Browse source 
[GB.DB.MYSQL]
* BUG: Correctly check if the RETURNING keyword is available, by searching for "MariaDB" in the full version string, and checking the version number.
This commit is contained in:
Benoît Minisini 2023-08-25 04:24:35 +02:00
parent c865a5a7e5
commit ac15f27a96
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gb.db.mysql/src/main.c
View file

@ -918,6 +918,24 @@ static void set_character_set(DB_DATABASE *db)
mysql_free_result(res); mysql_free_result(res);
} }
static bool is_mariadb(DB_DATABASE *db)
{
int len = GB.StringLength(db->full_version);
int i;
const char *search = "mariadb";
const int len_search = strlen(search);
for (i = 0; i <= len - len_search; i++)
{
if (GB.StrNCaseCmp(&db->full_version[i], search, len_search) == 0)
return TRUE;
}
return FALSE;
}
static int open_database(DB_DESC *desc, DB_DATABASE *db) static int open_database(DB_DESC *desc, DB_DATABASE *db)
{ {
MYSQL *conn; MYSQL *conn;
@ -982,10 +1000,15 @@ static int open_database(DB_DESC *desc, DB_DATABASE *db)
db->handle = conn; db->handle = conn;
init_version(db); init_version(db);
if (is_mariadb(db))
db->flags.no_returning = db->version >= 100500;
else
db->flags.no_returning = TRUE;
set_character_set(db); set_character_set(db);
GB.HashTable.New(POINTER(&db->data), GB_COMP_BINARY); GB.HashTable.New(POINTER(&db->data), GB_COMP_BINARY);
/* flags: none at the moment */
return FALSE; return FALSE;
} }