From: Federico Caselli <cfederico87@gmail.com>
Date: Thu, 14 Nov 2024 18:55:32 +0000 (+0100)
Subject: Improve oracle max id length again
X-Git-Tag: rel_2_0_37~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec80c7e14ea33ab32ae5c0103096a28fdcf06678;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Improve oracle max id length again

Adjust 90bf575b81c5396b364908547551b6592a333bf7 to handle the none case
Fix missing return

Fixes: #12032
Change-Id: I166efbde1a0cc88673ad3cdfbda70c737dcafcc8
(cherry picked from commit 1a7c5772623546f8ba182adef48a8bb20f9c50c6)
---

diff --git a/lib/sqlalchemy/dialects/oracle/oracledb.py b/lib/sqlalchemy/dialects/oracle/oracledb.py
index bdeb535e68..37e07daf1d 100644
--- a/lib/sqlalchemy/dialects/oracle/oracledb.py
+++ b/lib/sqlalchemy/dialects/oracle/oracledb.py
@@ -223,9 +223,10 @@ class OracleDialect_oracledb(_cx_oracle.OracleDialect_cx_oracle):
 
     def _check_max_identifier_length(self, connection):
         if self.oracledb_ver >= (2, 5):
-            return connection.connection.max_identifier_length
-        else:
-            super()._check_max_identifier_length(connection)
+            max_len = connection.connection.max_identifier_length
+            if max_len is not None:
+                return max_len
+        return super()._check_max_identifier_length(connection)
 
 
 class AsyncAdapt_oracledb_cursor(AsyncAdapt_dbapi_cursor):