Catalog function fixes #6
Conversation
The application can get(/set) the current catalog of a connection. 'SYS CATALOGS' query is used now to ask for the list of available catalogs and the first entry is returned as "current".
must have been removed by mistake, instead of training WS.
The spec allows for this argument to contain a list of table types to filter by. The list of types can be given as quoted or unquoted tokens. ES/SQL only suppots the quoted synthax, so do the quoting in the driver. Note: no sanity check done by the driver, though (i.e. mixed quoted/unquoted or invalid characters). This isn't done for the other arguments either.
driver/catalogue.c
Outdated
| #define SYS_CATALOGS \ | ||
| "SYS CATALOGS" | ||
|
|
||
| /* SYS TABLES synthax tokens; these need to stay broken down, since this |
There was a problem hiding this comment.
Typo: no 'h' in syntax
|
|
||
| /* In this argument, "each value can be enclosed in single quotation | ||
| * marks (') or unquoted" => quote if not quoted (see GH#30398). */ | ||
| if (! wcsnstr(type, cnt_typ, L'\'')) { |
There was a problem hiding this comment.
Is it possible that some of the tokens could be quoted already but not others? If that is possible then this won't work.
There was a problem hiding this comment.
It is, but that would be an illegal syntax.
The driver does a simple scan for ' in the received parameter and if none is found, it applies the quoting. If some tokens would be quoted but others not, the driver would pass the argument as is to the plug-in (which would then fail the query due to wrong syntax).
The application could generate illegal SQL in many ways (ex. 'TABLE',,'ALIAS'). But the driver doesn't validate these, since ES/SQL will anyways.
| SQLWCHAR wbuf[sizeof(SQL_TABLES) + 2 * ESODBC_MAX_IDENTIFIER_LEN]; | ||
| SQLWCHAR *table, *schema, *catalog; | ||
| size_t cnt_tab, cnt_sch, cnt_cat, pos; | ||
| /* b/c declaring an array with a const doesn't work with MSVC's compiler */ |
There was a problem hiding this comment.
Yes, with Visual Studio you're stuck with C90 aka C89. The background is here in case you didn't know why.
There was a problem hiding this comment.
Thanks! Nice article.
driver/catalogue.c
Outdated
| if (pos <= 0) { | ||
| ERRH(stmt, "failed to print 'tables' catalog SQL."); | ||
| RET_HDIAGS(stmt, SQL_STATE_HY000); | ||
| #if 1 // GH#30398 |
There was a problem hiding this comment.
Can this be removed before merging the PR?
There was a problem hiding this comment.
sure, I have removed it.
This PR introduces two changes:
when the client-app asks for current catalog (
SQLGetConnectAttr(attribute=SQL_ATTR_CURRENT_CATALOG)), the driver will now ask ES/SQL for the list of catalogs (using the newSYS CATALOGS) and return the first result as the "current" one. (There's currently always one single catalog returned, the cluster the plug-in runs on.)the table type parameter given in
SQLTables() can be a list of quoted or unquoted tokens. ES/SQL supports the quoted version only (second point in SQL: SYS TABLES adjustments for ODBC: TYPE argument elasticsearch#30398). The driver will now do the quoting of the tokens if needed.