Skip to content

Commit e3966bf

Browse files
committed
implemented simple return type handling for functions
1 parent ec57f11 commit e3966bf

3 files changed

Lines changed: 57 additions & 38 deletions

File tree

‎python_plsql/client.py‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,6 @@ def __iter__(self):
219219
return self._execute()
220220

221221

222-
class Function:
223-
def __init__(self, plsql: Database, name: ResolvedName):
224-
self._plsql, self._name = plsql, name
225-
226-
227222
def return_type(arguments: List[Argument]) -> Optional[Argument]:
228223
"""
229224
Extracts return type from list of arguments.
@@ -270,26 +265,45 @@ def filter_match(matches: Iterator[Overload]) -> Overload:
270265
return matches[0]
271266

272267

268+
def python_type(plsql_type: Argument):
269+
type_mapping = {
270+
1: oracle.STRING,
271+
2: oracle.NUMBER,
272+
3: oracle.NATIVE_INT,
273+
11: oracle.ROWID,
274+
12: oracle.DATETIME,
275+
23: oracle.BINARY,
276+
24: oracle.LONG_BINARY,
277+
96: oracle.STRING, # oracle.FIXED_CHAR
278+
112: oracle.STRING, # oracle.CLOB
279+
252: oracle.BOOLEAN,
280+
}
281+
282+
return type_mapping[plsql_type.datatype]
283+
284+
273285
class Subprogram:
274286
def __init__(
275287
self, plsql: Database, resolved: ResolvedName, arguments: Iterator[Argument]
276288
):
277-
self.plsql, self.resolved, self.overloads = (
289+
self._plsql, self.resolved, self.overloads = (
278290
plsql,
279291
resolved,
280292
group_by_overload(arguments=arguments),
281293
)
282294

283295
def _call_function(self, *args, **kwargs):
284-
_ = filter_match(self._function_matches(*args, **kwargs))
296+
match = filter_match(self._function_matches(*args, **kwargs))
285297

286-
with self.plsql._connection.cursor() as cursor:
287-
return cursor.callfunc(self.resolved.name, int, args, kwargs)
298+
with self._plsql._connection.cursor() as cursor:
299+
return cursor.callfunc(
300+
self.resolved.name, python_type(match.return_type), args, kwargs
301+
)
288302

289303
def _call_procedure(self, *args, **kwargs):
290304
_ = filter_match(self._procedure_matches(*args, **kwargs))
291305

292-
with self.plsql._connection.cursor() as cursor:
306+
with self._plsql._connection.cursor() as cursor:
293307
cursor.callproc(self.resolved.name, args, kwargs)
294308

295309
def __call__(self, *args, **kwargs):

‎tests/func/test_return_values.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import pytest
2+
import datetime
23

34

4-
@pytest.fixture(
5-
params=[
6-
"ret_varchar",
7-
"ret_number",
8-
"ret_binary_integer",
9-
"ret_clob",
10-
"ret_rowid",
11-
"ret_date",
12-
"ret_raw",
13-
"ret_long_raw",
14-
"ret_char",
15-
"ret_bool",
16-
]
5+
@pytest.mark.parametrize(
6+
"func, expected",
7+
[
8+
("ret_varchar", "42"),
9+
("ret_number", 42.42),
10+
("ret_binary_integer", 42),
11+
("ret_clob", "42"),
12+
("ret_rowid", "AAAACPAABAAAAShAAA"),
13+
("ret_date", datetime.datetime(year=2019, month=12, day=20)),
14+
("ret_raw", b"42"),
15+
("ret_long_raw", b"42"),
16+
("ret_char", "42"),
17+
("ret_bool", True),
18+
],
1719
)
18-
def functions(plsql, request):
19-
return getattr(plsql.test_return, request.param)
20+
def test_return_values(plsql, func, expected):
21+
return_value = getattr(plsql.test_return, func)()
2022

21-
22-
def test_return_values(functions):
23-
assert functions() is None
23+
assert return_value == expected

‎tests/sql/package/test_return-b.sql‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,61 @@ CREATE OR REPLACE PACKAGE BODY test_return AS
55
FUNCTION ret_varchar
66
RETURN VARCHAR2 IS
77
BEGIN
8-
RETURN NULL;
8+
RETURN '42';
99
END;
1010

1111
-- 2 NUMBER, INTEGER, SMALLINT, REAL, FLOAT, DECIMAL -- float
1212
FUNCTION ret_number
1313
RETURN NUMBER IS
1414
BEGIN
15-
RETURN NULL;
15+
RETURN 42.42;
1616
END;
1717

1818
-- 3 BINARY_INTEGER, PLS_INTEGER, POSITIVE, NATURAL -- int
1919
FUNCTION ret_binary_integer
2020
RETURN BINARY_INTEGER IS
2121
BEGIN
22-
RETURN NULL;
22+
RETURN 42;
2323
END;
2424

2525
-- 8 LONG ?CLOB? -- str
2626
FUNCTION ret_clob
2727
RETURN CLOB IS
2828
BEGIN
29-
RETURN NULL;
29+
RETURN '42';
3030
END;
3131

3232
-- 11 ROWID -- str
3333
FUNCTION ret_rowid
3434
RETURN ROWID IS
35+
v_rowid ROWID;
3536
BEGIN
36-
RETURN NULL;
37+
SELECT ROWID
38+
INTO v_rowid
39+
FROM dual;
40+
41+
RETURN v_rowid;
3742
END;
3843

3944
-- 12 DATE -- datetime.datetime
4045
FUNCTION ret_date
4146
RETURN DATE IS
4247
BEGIN
43-
RETURN NULL;
48+
RETURN TO_DATE('20.12.2019', 'dd.mm.yyyy');
4449
END;
4550

4651
-- 23 RAW -- bytes
4752
FUNCTION ret_raw
4853
RETURN RAW IS
4954
BEGIN
50-
RETURN NULL;
55+
RETURN HEXTORAW('3432');
5156
END;
5257

5358
-- 24 LONG RAW -- bytes
5459
FUNCTION ret_long_raw
5560
RETURN LONG RAW IS
5661
BEGIN
57-
RETURN NULL;
62+
RETURN HEXTORAW('3432');
5863
END;
5964

6065
-- 58 OPAQUE TYPE -- ??? XMLType in Oracle
@@ -65,7 +70,7 @@ CREATE OR REPLACE PACKAGE BODY test_return AS
6570
FUNCTION ret_char
6671
RETURN CHAR IS
6772
BEGIN
68-
RETURN NULL;
73+
RETURN '42';
6974
END;
7075

7176
-- 106 MLSLABEL -- ??? only backwards compatibility ???
@@ -116,7 +121,7 @@ CREATE OR REPLACE PACKAGE BODY test_return AS
116121
FUNCTION ret_bool
117122
RETURN BOOLEAN IS
118123
BEGIN
119-
RETURN NULL;
124+
RETURN TRUE;
120125
END;
121126

122127

0 commit comments

Comments
 (0)