From 981a22ab95f503078054161fb55e5aa3146aa866 Mon Sep 17 00:00:00 2001
From: John A Stevenson <jostev@bgs.ac.uk>
Date: Fri, 17 May 2024 16:25:18 +0100
Subject: [PATCH 1/2] Update MSODBC to version 18

---
 Dockerfile   | 2 +-
 docs/api.rst | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6538ac9..b4263e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc > microsoft.asc && \
     curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
     apt-get update -y && \
     ACCEPT_EULA=y apt-get install -y \
-      msodbcsql17 \
+      msodbcsql18 \
       unixodbc-dev
 
 # Install Python modules
diff --git a/docs/api.rst b/docs/api.rst
index 62b7a9d..ac884a6 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -15,7 +15,6 @@ etlhelper.row_factories
     :members:
 
 
-
 .. _db_helpers:
 
 DB Helpers

From df4c191b40ffeae335572fe9f6f4798e0afe7d2d Mon Sep 17 00:00:00 2001
From: John A Stevenson <jostev@bgs.ac.uk>
Date: Fri, 17 May 2024 16:26:28 +0100
Subject: [PATCH 2/2] Remove encoding args from Oracle connection

python-oracledb does not support them, and uses utf-8 for everything.
---
 test/integration/db/test_oracle.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/integration/db/test_oracle.py b/test/integration/db/test_oracle.py
index 63a84ea..82bbcdc 100644
--- a/test/integration/db/test_oracle.py
+++ b/test/integration/db/test_oracle.py
@@ -348,8 +348,7 @@ def test_lob_io(testdb_conn, test_blob_table, fetch_lobs):
 @pytest.fixture(scope='function')
 def testdb_conn():
     """Get connection to test Oracle database."""
-    with connect(ORADB, 'TEST_ORACLE_PASSWORD', encoding="UTF-8",
-                 nencoding="UTF-8") as conn:
+    with connect(ORADB, 'TEST_ORACLE_PASSWORD') as conn:
         yield conn