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.

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

[ODBC] Rework Connect to the ODBC driver and add functionality to set all DuckDB configurations in the Connection String #10692

Merged
merged 69 commits into from
Feb 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
8ab7fc8
Update SQLConnect
maiadegraaf Dec 11, 2023
6136e6c
only run odbc tests
maiadegraaf Dec 11, 2023
f4a10d0
add SQLDriverConnect
maiadegraaf Dec 11, 2023
4069172
add read from iostream
maiadegraaf Dec 12, 2023
cfccda9
Add new tests
maiadegraaf Dec 22, 2023
12223d0
Add extra connection attributes
maiadegraaf Jan 3, 2024
9a1330a
Move connect stuff to new file
maiadegraaf Jan 5, 2024
a019532
format fix
maiadegraaf Jan 8, 2024
4cd8651
write current dir to std::out
maiadegraaf Jan 15, 2024
9fdfe49
Wrap ReadFromIniFile in an #if
maiadegraaf Jan 15, 2024
f4841c2
Wrap ReadFromIniFile in an #if
maiadegraaf Jan 15, 2024
f799d01
wrap ini file test
maiadegraaf Jan 15, 2024
cd0cecb
add another print
maiadegraaf Jan 16, 2024
a6048eb
check if odbc file is correctly made
maiadegraaf Jan 17, 2024
29ab98f
mo prints
maiadegraaf Jan 19, 2024
f9513b8
mo prints
maiadegraaf Jan 19, 2024
82b9e21
Add GetLastError
maiadegraaf Jan 31, 2024
04d1578
mo mo mo
maiadegraaf Jan 31, 2024
f8471c3
add script to create ini_file
maiadegraaf Feb 1, 2024
d0d3bd2
read directly from "odbc.ini"
maiadegraaf Feb 1, 2024
fb58836
read directly from "odbc.ini"
maiadegraaf Feb 5, 2024
ba04b07
read directly from ".odbc.ini"
maiadegraaf Feb 5, 2024
1a649df
add SQLGetConfigMode
maiadegraaf Feb 5, 2024
9d09765
Use SQLWritePrivateProfileString for windows
maiadegraaf Feb 6, 2024
9522d67
Use SQLWritePrivateProfileString for windows
maiadegraaf Feb 6, 2024
1e45773
Use SQLWritePrivateProfileString for windows
maiadegraaf Feb 6, 2024
b0051ba
Out put SQLInstallerError
maiadegraaf Feb 6, 2024
ad1d072
Output SQLInstallerError
maiadegraaf Feb 6, 2024
95f46b3
Change database string
maiadegraaf Feb 7, 2024
13ae00f
Change database string
maiadegraaf Feb 7, 2024
05ee51d
try w/out database
maiadegraaf Feb 8, 2024
c18b301
Use SQLConfigDataSource
maiadegraaf Feb 8, 2024
83d0559
change to CONFIG sys dsn
samansmink Feb 12, 2024
1484fc8
alter way attr string is set
samansmink Feb 12, 2024
c3dc6b0
add default settings in install
maiadegraaf Feb 12, 2024
73c57cd
add default settings in install
maiadegraaf Feb 12, 2024
f3cc352
add default settings in setup.c
maiadegraaf Feb 12, 2024
e53ece9
add default settings in setup.c
maiadegraaf Feb 12, 2024
bdeb2b9
print attributes
maiadegraaf Feb 12, 2024
2867724
print attributes
maiadegraaf Feb 12, 2024
7b86f7c
print attributes
maiadegraaf Feb 12, 2024
40ec630
use REG ADD to alter reg file
maiadegraaf Feb 12, 2024
b081e1f
initial clean up
maiadegraaf Feb 12, 2024
e6f9837
alter main yml
maiadegraaf Feb 13, 2024
74ba4e5
try setup in different section
maiadegraaf Feb 14, 2024
541e440
correct name
maiadegraaf Feb 14, 2024
1739380
add back in tests
maiadegraaf Feb 14, 2024
d479a67
Merge branch 'main' into ODBC_Connect
maiadegraaf Feb 14, 2024
1231618
alter tests that aren't supported
maiadegraaf Feb 14, 2024
ff4b8fa
ff
maiadegraaf Feb 14, 2024
6047395
Add info on how to add an attribute to the connection string
maiadegraaf Feb 14, 2024
20df1ec
move all connect files to own directory
maiadegraaf Feb 14, 2024
324de99
move ini test to seperate file
maiadegraaf Feb 15, 2024
9e73092
add chmod +x to inifile script
maiadegraaf Feb 15, 2024
6e5d309
add chmod +x to inifile script
maiadegraaf Feb 15, 2024
92a2053
final bits
maiadegraaf Feb 15, 2024
8e8cd6a
Merge branch 'main' into ODBC_Connect
maiadegraaf Feb 15, 2024
8c4d826
add extra info to connect_with_ini.cpp
maiadegraaf Feb 15, 2024
d29d5d4
add all DBConfig functionality and change test db
maiadegraaf Feb 16, 2024
8842251
nits
maiadegraaf Feb 16, 2024
6931bd3
ff
maiadegraaf Feb 16, 2024
832688d
std::cout the test database
maiadegraaf Feb 19, 2024
f1e913c
DirectoryExists -> FileExists
maiadegraaf Feb 21, 2024
627fff7
idk
maiadegraaf Feb 21, 2024
1dc0d13
run odbc from beginning
maiadegraaf Feb 21, 2024
29e32b1
change odbc test db to storage version
maiadegraaf Feb 21, 2024
40744bc
Merge branch 'duckdb:main' into ODBC_Connect
maiadegraaf Feb 22, 2024
36f7dda
put back main thing and take out prints
maiadegraaf Feb 22, 2024
ed08240
clean
maiadegraaf Feb 22, 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
Prev Previous commit
Next Next commit
print attributes
  • Loading branch information
maiadegraaf committed Feb 12, 2024
commit 2867724e68f285dbc061d2f83da2e26359006380
2 changes: 2 additions & 0 deletions tools/odbc/winsetup/install.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ int main(int argc, char **argv) {
exit(1);
}

PrintMsg("ODBC Driver Installer", "This program will install the DuckDB ODBC driver", 0);

char *parameters = NULL;
if (!IsUserAnAdmin()) {
CopyParameters(argc, argv, &parameters);
Expand Down