[ODBC] Rework Connect to the ODBC driver and add functionality to set all DuckDB configurations in the Connection String #10692
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mytherin
reviewed
Feb 15, 2024
Mytherin
reviewed
Feb 15, 2024
Mytherin
reviewed
Feb 15, 2024
maiadegraaf
changed the title
taniabogatsch
approved these changes
Feb 16, 2024
Mytherin
reviewed
Feb 23, 2024
| SQLINTEGER *id = new SQLINTEGER[TABLE_SIZE[size[i]]]; | ||
| SQLLEN *id_ind = new SQLLEN[TABLE_SIZE[size[i]]]; | ||
| auto *id = new SQLINTEGER[TABLE_SIZE[i]]; | ||
| auto *id_ind = new SQLLEN[TABLE_SIZE[i]]; |
There was a problem hiding this comment.
nit: using unique_ptr here would clean up the code a bit and prevent memory from leaking in case of a failure
| #include <utility> | ||
|
|
||
| #if WIN32 | ||
| #include <windows.h> |
There was a problem hiding this comment.
nit: we have duckdb/common/windows.hpp that can be used for this
| return SQL_SUCCESS; | ||
| } | ||
|
|
||
| while ((row_pos = input_str.find(ROW_DEL)) != std::string::npos) { |
There was a problem hiding this comment.
nit: I think this code could be simplified somewhat by using StringUtil::Split
| SQLRETURN Connect::FindKeyValPair(const std::string &row) { | ||
| string key; | ||
|
|
||
| size_t val_pos = row.find(KEY_VAL_DEL); |
There was a problem hiding this comment.
Same here - StringUtil::Split could simplify the code here
This was referenced Feb 23, 2024
github-actions bot
pushed a commit
to duckdb/duckdb-r
that referenced
this pull request
Mar 15, 2024
Merge pull request duckdb/duckdb#10796 from yiyuanliu/lyy/arrow-map Merge pull request duckdb/duckdb#10692 from maiadegraaf/ODBC_Connect Merge pull request duckdb/duckdb#10814 from szarnyasg/update-readme
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, when connecting to the ODBC driver using either
SQLDriverConnector with a populatedODBC.ini, only theDSNanddatabasefields would be read, with the rest being ignored. There were also no tests for reading from theODBC.inifileAs of this PR, this has been reworked. The entire connection string is now parsed and errors are correctly returned in the case of an unrecognized attribute or any other issues that are encountered.
Now all DuckDB configurations can be set.
Special mention:
allow_unsigned_extensions: Allows unsigned extensions to be loaded-unsignedoption in the ODBC driver #5355access_mode: Allows the user to open the database in eitherREAD_ONLYorREAD_WRITEmodeFinally, I've added extensive testing for both reading from the connection string as well as reading from the
ODBC.inifile.