Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib/db: catch and handle return value from setting MySQL SQL ANSI mode in odbc driver #3637

Merged
merged 3 commits into from
Apr 21, 2024
Merged

lib/db: catch and handle return value from setting MySQL SQL ANSI mode in odbc driver #3637

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b17243
db/drivers/odbc: catch and handle return value from setting MySQL SQL…
tmszi Apr 21, 2024
36e68dc
Free DB SQL string
tmszi Apr 21, 2024
15cb415
Free cursor and disconnect from DB
tmszi Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions db/drivers/odbc/db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,39 @@ int db__driver_open_database(dbHandle *handle)

if (strcmp((CHAR *)dbms_name, "MySQL") == 0 ||
strcmp((CHAR *)dbms_name, "MariaDB") == 0) {
dbString sql;
cursor *c;

c = alloc_cursor();
if (c == NULL)
return DB_FAILED;

db_init_string(&sql);
db_set_string(&sql, "SET SQL_MODE=ANSI_QUOTES;");

/* Set SQL ANSI_QUOTES MODE which allow to use double quotes instead of
* backticks */
SQLExecDirect(c->stmt, (SQLCHAR *)"SET SQL_MODE=ANSI_QUOTES", SQL_NTS);
ret = SQLExecDirect(c->stmt, (SQLCHAR *)db_get_string(&sql), SQL_NTS);

if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
sizeof(msg), NULL);
db_d_append_error("SQLExecDirect():\n%s\n%s (%d)\n",
db_get_string(&sql), msg, (int)err);
db_d_report_error();
free_cursor(c);
db_free_string(&sql);
SQLDisconnect(ODconn);
close_connection();

return DB_FAILED;
}

G_debug(
3,
"db__driver_open_database(): Set ODBC %s DB SQL ANSI_QUOTES MODE",
dbms_name);
G_debug(3, "db__driver_open_database(): Set ODBC %s DB %s", dbms_name,
db_get_string(&sql));

free_cursor(c);
db_free_string(&sql);
}

return DB_OK;
Expand Down
Loading