File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed
Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -530,6 +530,10 @@ std::wstring LoadDriverOrThrowException() {
530530 dllDir += L" \\ msodbcsql18.dll" ;
531531
532532 // Preload mssql-auth.dll from the same path if available
533+ <<<<<<< HEAD
534+ =======
535+ // TODO: Only load mssql-auth.dll if using Entra ID Authentication modes (Active Directory modes)
536+ >>>>>>> 25d6ef0 (refactor native layer and create reusable components)
533537 HMODULE hAuthModule = LoadLibraryW (mssqlauthDllPath.c_str ());
534538 if (hAuthModule) {
535539 LOG (" Authentication library loaded successfully from - {}" , mssqlauthDllPath.c_str ());
@@ -2143,7 +2147,10 @@ PYBIND11_MODULE(ddbc_bindings, m) {
21432147
21442148 try {
21452149 // Try loading the ODBC driver when the module is imported
2150+ <<<<<<< HEAD
21462151 LOG (" Loading ODBC driver" );
2152+ =======
2153+ >>>>>>> 25d6ef0 (refactor native layer and create reusable components)
21472154 DriverLoader::getInstance ().loadDriver (); // Load the driver
21482155 } catch (const std::exception& e) {
21492156 // Log the error but don't throw - let the error happen when functions are called
You can’t perform that action at this time.
0 commit comments