From 4cde94dc644f60d9a9d597a0a548af5f752a8cfe Mon Sep 17 00:00:00 2001
From: Andre Mochinin <35140131+amochin@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:07:04 +0200
Subject: [PATCH] Fix path length issue with ibmdb on Windows (#228)

add the CLI Driver path to list of DLL search paths only once if there are many DB connections
---
 .github/workflows/common_tests.yml        |  1 +
 src/DatabaseLibrary/connection_manager.py | 27 +++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/common_tests.yml b/.github/workflows/common_tests.yml
index 9e81a67e..7bb37709 100644
--- a/.github/workflows/common_tests.yml
+++ b/.github/workflows/common_tests.yml
@@ -115,6 +115,7 @@ jobs:
           MYSQL_DRIVER: mysql-connector-odbc-8.0.22-linux-glibc2.12-x86-64bit
 
       - name: Check ODBC setup
+        if: matrix.py_db_module == 'pyodbc'
         run: |
           echo "*** odbcinst -j"
           odbcinst -j
diff --git a/src/DatabaseLibrary/connection_manager.py b/src/DatabaseLibrary/connection_manager.py
index 3ca710d7..5844c4ef 100644
--- a/src/DatabaseLibrary/connection_manager.py
+++ b/src/DatabaseLibrary/connection_manager.py
@@ -143,6 +143,7 @@ class ConnectionManager:
     def __init__(self):
         self.omit_trailing_semicolon: bool = False
         self.connection_store: ConnectionStore = ConnectionStore()
+        self.ibmdb_driver_already_added_to_path: bool = False
 
     @staticmethod
     def _hide_password_values(string_with_pass, params_separator=","):
@@ -320,18 +321,20 @@ def _arg_or_config(arg_value, param_name, *, old_param_name=None, mandatory=Fals
 
         if db_api_module_name in ["ibm_db", "ibm_db_dbi"]:
             if os.name == "nt":
-                spec = importlib.util.find_spec(db_api_module_name)
-                if spec is not None:
-                    logger.info(
-                        f"Importing DB module '{db_api_module_name}' on Windows requires configuring the DLL directory for CLI driver"
-                    )
-                    site_packages_path = os.path.dirname(spec.origin)
-                    clidriver_bin_path = os.path.join(site_packages_path, "clidriver", "bin")
-                    if os.path.exists(clidriver_bin_path):
-                        os.add_dll_directory(clidriver_bin_path)
-                        logger.info(f"Added default CLI driver location to DLL search path: '{clidriver_bin_path}'")
-                    else:
-                        logger.info(f"Default CLI driver location folder not found: '{clidriver_bin_path}'")
+                if not self.ibmdb_driver_already_added_to_path:
+                    spec = importlib.util.find_spec(db_api_module_name)
+                    if spec is not None:
+                        logger.info(
+                            f"Importing DB module '{db_api_module_name}' on Windows requires configuring the DLL directory for CLI driver"
+                        )
+                        site_packages_path = os.path.dirname(spec.origin)
+                        clidriver_bin_path = os.path.join(site_packages_path, "clidriver", "bin")
+                        if os.path.exists(clidriver_bin_path):
+                            os.add_dll_directory(clidriver_bin_path)
+                            self.ibmdb_driver_already_added_to_path = True
+                            logger.info(f"Added default CLI driver location to DLL search path: '{clidriver_bin_path}'")
+                        else:
+                            logger.info(f"Default CLI driver location folder not found: '{clidriver_bin_path}'")
 
         db_api_2 = importlib.import_module(db_api_module_name)