Skip to content

oracledb support #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Skada13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

oracledb support #755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions pony/orm/dbproviders/oracle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from decimal import Decimal
from uuid import UUID

import cx_Oracle
import oracledb

from pony.orm import core, dbapiprovider, sqltranslation
from pony.orm.core import log_orm, log_sql, DatabaseError, TranslationError
Expand Down Expand Up @@ -300,7 +300,7 @@ def validate(converter, val, obj=None):
if val == '': return None
return dbapiprovider.StrConverter.validate(converter, val)
def sql2py(converter, val):
if isinstance(val, cx_Oracle.LOB):
if isinstance(val, oracledb.LOB):
val = val.read()
return val
def sql_type(converter):
Expand Down Expand Up @@ -392,7 +392,7 @@ class OraProvider(DBAPIProvider):
varchar_default_max_len = 1000
uint64_support = True

dbapi_module = cx_Oracle
dbapi_module = oracledb
dbschema_cls = OraSchema
translator_cls = OraTranslator
sqlbuilder_cls = OraBuilder
Expand Down Expand Up @@ -429,7 +429,7 @@ def should_reconnect(provider, exc):
3113, # ORA-03113: end-of-file on communication channel
3114, # ORA-03114: not connected to ORACLE
)
return isinstance(exc, cx_Oracle.OperationalError) \
return isinstance(exc, oracledb.OperationalError) \
and exc.args[0].code in reconnect_error_codes

def normalize_name(provider, name):
Expand Down Expand Up @@ -464,7 +464,7 @@ def execute(provider, cursor, sql, arguments=None, returning_id=False):
else:
if arguments is not None: set_input_sizes(cursor, arguments)
if returning_id:
var = cursor.var(cx_Oracle.STRING, 40, cursor.arraysize, outconverter=int)
var = cursor.var(oracledb.STRING, 40, cursor.arraysize, outconverter=int)
arguments['new_id'] = var
if arguments is None: cursor.execute(sql)
else: cursor.execute(sql, arguments)
Expand Down Expand Up @@ -559,27 +559,27 @@ def to_decimal(val):
return Decimal(val.replace(',', '.'))

def output_type_handler(cursor, name, defaultType, size, precision, scale):
if defaultType == cx_Oracle.NUMBER:
if defaultType == oracledb.NUMBER:
if scale == 0:
if precision: return cursor.var(cx_Oracle.STRING, 40, cursor.arraysize, outconverter=int)
return cursor.var(cx_Oracle.STRING, 40, cursor.arraysize, outconverter=to_int_or_decimal)
if precision: return cursor.var(oracledb.STRING, 40, cursor.arraysize, outconverter=int)
return cursor.var(oracledb.STRING, 40, cursor.arraysize, outconverter=to_int_or_decimal)
if scale != -127:
return cursor.var(cx_Oracle.STRING, 100, cursor.arraysize, outconverter=to_decimal)
elif defaultType in (cx_Oracle.STRING, cx_Oracle.FIXED_CHAR):
return cursor.var(oracledb.STRING, 100, cursor.arraysize, outconverter=to_decimal)
elif defaultType in (oracledb.STRING, oracledb.FIXED_CHAR):
return cursor.var(str, size, cursor.arraysize) # from cx_Oracle example
return None

class OraPool(object):
forked_pools = []
def __init__(pool, **kwargs):
pool.kwargs = kwargs
pool.cx_pool = cx_Oracle.SessionPool(**kwargs)
pool.cx_pool = oracledb.SessionPool(**kwargs)
pool.pid = os.getpid()
def connect(pool):
pid = os.getpid()
if pool.pid != pid:
pool.forked_pools.append((pool.cx_pool, pool.pid))
pool.cx_pool = cx_Oracle.SessionPool(**pool.kwargs)
pool.cx_pool = oracledb.SessionPool(**pool.kwargs)
pool.pid = os.getpid()
if core.local.debug: log_orm('GET CONNECTION')
con = pool.cx_pool.acquire()
Expand All @@ -594,7 +594,7 @@ def disconnect(pool):

def get_inputsize(arg):
if isinstance(arg, datetime):
return cx_Oracle.TIMESTAMP
return oracledb.TIMESTAMP
return None

def set_input_sizes(cursor, arguments):
Expand Down