Skip to content

Commit 6532415

Browse files
committed
out parameters
1 parent 55d8932 commit 6532415

4 files changed

Lines changed: 489 additions & 16 deletions

File tree

‎python_plsql/client.py‎

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,10 @@ def to_python(value):
283283
elif is_list(value.type):
284284
return list_out_converter(value)
285285
return dict_out_coverter(value)
286-
return value
286+
try:
287+
return value.getvalue(0)
288+
except AttributeError:
289+
return value
287290

288291

289292
def to_record(value, record):
@@ -345,19 +348,19 @@ def convert(object_type, value):
345348
def make_in_converter(object_type):
346349
def _in_converter(value):
347350
var = object_type.newobject()
348-
349-
if object_type.iscollection:
350-
if is_list(object_type):
351-
for val in value:
352-
var.append(convert(object_type.elementType, val))
351+
if value:
352+
if object_type.iscollection:
353+
if is_list(object_type):
354+
for val in value:
355+
var.append(convert(object_type.elementType, val))
356+
else:
357+
for key, val in value.items():
358+
var.setelement(key, convert(object_type.elementType, val))
353359
else:
354-
for key, val in value.items():
355-
var.setelement(key, convert(object_type.elementType, val))
356-
else:
357-
for attribute, val in zip(object_type.attributes, value):
358-
# todo: self made change to ObjectAttr.c (cx_Oracle should implement this)
359-
# type is not accessible by default..
360-
setattr(var, attribute.name, convert(attribute.type, val))
360+
for attribute, val in zip(object_type.attributes, value):
361+
# todo: self made change to ObjectAttr.c (cx_Oracle should implement this)
362+
# type is not accessible by default..
363+
setattr(var, attribute.name, convert(attribute.type, val))
361364

362365
return var
363366

@@ -477,6 +480,29 @@ def wrap_named(match, plsql, resolved, cursor, named):
477480
return wrapped_named
478481

479482

483+
def in_out_parameters(positional, named, match: Overload):
484+
in_out = []
485+
for pos, argument in zip(positional, match.arguments):
486+
if argument.in_out in {Direction.out, Direction.in_out}:
487+
in_out.append((pos, argument.argument_name.lower()))
488+
489+
for argument in match.arguments:
490+
if argument.in_out in {Direction.out, Direction.in_out}:
491+
try:
492+
in_out.append(
493+
(
494+
named[argument.argument_name.lower()],
495+
argument.argument_name.lower(),
496+
)
497+
)
498+
except KeyError:
499+
pass
500+
501+
in_out_rec = namedtuple("InOutParams", map(itemgetter(1), in_out))
502+
503+
return in_out_rec(*map(to_python, map(itemgetter(0), in_out)))
504+
505+
480506
def translate_arguments(match_filter):
481507
def decorator(func):
482508
@wraps(func)
@@ -495,9 +521,16 @@ def wrapper(self: Subprogram, *positional, **named):
495521

496522
result = func(self, match, cursor, wrapped_positional, wrapped_named)
497523

524+
in_out = in_out_parameters(wrapped_positional, wrapped_named, match)
525+
498526
if match.is_function:
527+
if in_out:
528+
return result, in_out
499529
return result
500530

531+
if in_out:
532+
return in_out
533+
501534
return wrapper
502535

503536
return decorator
@@ -543,8 +576,6 @@ def __call__(self, *args, **kwargs):
543576

544577
@property
545578
def overloaded(self) -> bool:
546-
"""returns true if exists multiple definitions of the same subprogram in a package
547-
only applicable for package procedures/functions where overloading is possible"""
548579
return len(self.overloads) > 1
549580

550581
@property
@@ -557,7 +588,6 @@ def is_procedure(self) -> bool:
557588

558589
@property
559590
def standalone(self) -> bool:
560-
"""returns true if procedure/function is not part of a package"""
561591
return self.resolved.object_type in {
562592
ObjectTypes.procedure,
563593
ObjectTypes.function,

‎tests/func/test_out_param.py‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
import pytest
2+
import datetime
3+
4+
RECORD = (42, 84, 126)
5+
VARRAY = list(range(10, 0, -1))
6+
NESTED = [i * 2 for i in range(1, 11)]
7+
PLSQL_TABLE = {i: i for i in range(1, 11)}
8+
9+
10+
@pytest.mark.parametrize(
11+
"func, out_value",
12+
[
13+
("out_varchar2", "42"),
14+
("out_varchar", "42"),
15+
("out_string", "42"),
16+
("out_number", 42.42),
17+
("out_integer", 42.0),
18+
("out_smallint", 42.0),
19+
("out_real", 42.42),
20+
("out_float", 42.42),
21+
("out_numeric", 42.0),
22+
("out_decimal", 42.0),
23+
("out_binary_integer", 42),
24+
("out_pls_integer", 42),
25+
("out_positive", 42),
26+
("out_natural", 42),
27+
("out_clob", "42"),
28+
("out_long", "42"),
29+
("out_rowid", "AAAACPAABAAAAShAAA"),
30+
("out_date", datetime.datetime(year=2019, month=12, day=20)),
31+
("out_timestamp", datetime.datetime(year=2019, month=12, day=20)),
32+
("out_raw", b"42"),
33+
("out_long_raw", b"42"),
34+
("out_char", "42".ljust(12000, " ")),
35+
("out_character", "42".ljust(12000, " ")),
36+
("out_bool", True),
37+
("out_record", RECORD),
38+
("out_record_of_records", (42, RECORD, RECORD),),
39+
("out_record_of_nested", (42, NESTED, NESTED)),
40+
("out_record_of_plsql_table", (42, PLSQL_TABLE, PLSQL_TABLE),),
41+
("out_nested", NESTED),
42+
("out_nested_of_records", [RECORD] * 10),
43+
("out_nested_of_record_of_nested", [(42, NESTED, NESTED)] * 10),
44+
("out_varray", VARRAY),
45+
("out_plsql_table", PLSQL_TABLE),
46+
("out_plsql_table_of_records", {i: RECORD for i in range(1, 11)}),
47+
pytest.param(
48+
"out_varray_of_plsql_table",
49+
[PLSQL_TABLE] * 10,
50+
marks=pytest.mark.skip("Memory access violation"),
51+
),
52+
pytest.param(
53+
"out_varray_of_nested",
54+
[NESTED] * 10,
55+
marks=pytest.mark.skip("Memory access violation"),
56+
),
57+
pytest.param(
58+
"out_plsql_table_of_nested",
59+
{i: NESTED for i in range(1, 11)},
60+
marks=pytest.mark.skip("Memory access violation"),
61+
),
62+
pytest.param(
63+
"out_nested_of_nested",
64+
[NESTED] * 10,
65+
marks=pytest.mark.skip("Memory access violation"),
66+
),
67+
pytest.param(
68+
"out_nested_of_plsql_table",
69+
[PLSQL_TABLE] * 10,
70+
marks=pytest.mark.skip("Memory access violation"),
71+
),
72+
pytest.param(
73+
"out_plsql_table_of_plsql_table",
74+
{i: PLSQL_TABLE for i in range(1, 11)},
75+
marks=pytest.mark.skip("Memory access violation"),
76+
),
77+
],
78+
)
79+
def test_return_values(plsql, func, out_value):
80+
assert getattr(plsql.test_out_params, func)(None).p_param == out_value

0 commit comments

Comments
 (0)