Skip to content

Commit 2328199

Browse files
Allow thick mode on macOS ARM64.
1 parent d607ef9 commit 2328199

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

samples/oracledb_upgrade.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
# set lib_dir; instead set LD_LIBRARY_PATH or configure ldconfig before running
134134
# Python.
135135
lib_dir = None
136-
if platform.system() == "Darwin" and platform.machine() == "x86_64":
136+
if platform.system() == "Darwin":
137137
lib_dir = os.environ.get("HOME") + "/Downloads/instantclient_19_8"
138138
elif platform.system() == "Windows":
139139
lib_dir = r"C:\oracle\instantclient_19_14"

samples/sample_env.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,7 @@ def get_admin_connection():
209209

210210

211211
def get_oracle_client():
212-
if (
213-
platform.system() == "Darwin" and platform.machine() == "x86_64"
214-
) or platform.system() == "Windows":
212+
if platform.system() == "Darwin" or platform.system() == "Windows":
215213
return get_value(
216214
"PYO_SAMPLES_ORACLE_CLIENT_PATH", "Oracle Instant Client Path"
217215
)

samples/tutorial/Python-and-Oracle-Database-The-New-Wave-of-Scripting.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,9 +1807,9 @@ <h4> 10.1 Review the Oracle Client library path</h4>
18071807
if platform.system() == &quot;Windows&quot;:
18081808
instant_client_dir = r"C:\Oracle\instantclient_19_14"
18091809

1810-
# On macOS (Intel x86) set the directory to your Instant Client directory
1811-
if platform.system() == &quot;Darwin&quot; and platform.machine() == &quot;x86_64&quot;:
1812-
instant_client_dir = os.environ.get("HOME")+"/Downloads/instantclient_19_8"
1810+
# On macOS set the directory to your Instant Client directory
1811+
if platform.system() == &quot;Darwin&quot;:
1812+
instant_client_dir = os.environ.get("HOME")+"/Downloads/instantclient_23_3"
18131813

18141814
# You must always call init_oracle_client() to use thick mode
18151815
oracledb.init_oracle_client(lib_dir=instant_client_dir)</pre>

samples/tutorial/db_config_thick.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
if platform.system() == "Windows":
4545
instant_client_dir = r"C:\Oracle\instantclient_19_14"
4646

47-
# On macOS (Intel x86) set the directory to your Instant Client directory
48-
if platform.system() == "Darwin" and platform.machine() == "x86_64":
47+
# On macOS set the directory to your Instant Client directory
48+
if platform.system() == "Darwin":
4949
instant_client_dir = (
50-
os.environ.get("HOME") + "/Downloads/instantclient_19_8"
50+
os.environ.get("HOME") + "/Downloads/instantclient_23_3"
5151
)
5252

5353
# You must always call init_oracle_client() to use thick mode in any platform

0 commit comments

Comments
 (0)