From cd287c0bc91fadff7ffa1b4e4eb1b641446ad3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Lippai?= <adam@rigo.sk>
Date: Thu, 17 Oct 2024 22:40:12 -0400
Subject: [PATCH] Better cleanup of optional arrow support

---
 meson.build               |  1 -
 turbodbc/arrow_support.py | 11 -----------
 turbodbc/cursor.py        |  5 ++---
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 turbodbc/arrow_support.py

diff --git a/meson.build b/meson.build
index df8c256b1..e5420399e 100644
--- a/meson.build
+++ b/meson.build
@@ -190,7 +190,6 @@ py.install_sources(
     'turbodbc/data_types.py',
     'turbodbc/api_constants.py',
     'turbodbc/connection.py',
-    'turbodbc/arrow_support.py',
     'turbodbc/exceptions.py',
     'turbodbc/constructors.py',
     'turbodbc/cursor.py',
diff --git a/turbodbc/arrow_support.py b/turbodbc/arrow_support.py
deleted file mode 100644
index 61eaffa56..000000000
--- a/turbodbc/arrow_support.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import os
-import sys
-
-import pyarrow
-
-# Ensure arrow_python${SHLIB_EXT} is on the PATH.
-if sys.platform == "win32":
-    for lib_dir in pyarrow.get_library_dirs():
-        os.add_dll_directory(lib_dir)
-
-from turbodbc_intern import *  # noqa
diff --git a/turbodbc/cursor.py b/turbodbc/cursor.py
index d5c0f2ff8..572186c89 100644
--- a/turbodbc/cursor.py
+++ b/turbodbc/cursor.py
@@ -8,7 +8,8 @@
     make_numpy_result_set,
     make_parameter_set,
     make_row_based_result_set,
-    set_numpy_parameters,
+    set_arrow_parameters,
+    set_numpy_parameters
 )
 
 from .exceptions import InterfaceError, translate_exceptions
@@ -184,8 +185,6 @@ def _num_chunks(c):
             return c.num_chunks
 
         if isinstance(columns, pa.Table):
-            from turbodbc.arrow_support import set_arrow_parameters  # type: ignore
-
             for column in columns.itercolumns():
                 if _num_chunks(column) != 1:
                     raise NotImplementedError("Chunked Arrays are " "not yet supported")