Skip to content

Commit 5114abb

Browse files
committed
supporting package defined record types
1 parent d80c0a0 commit 5114abb

2 files changed

Lines changed: 23 additions & 14 deletions

File tree

‎plsql/client.py‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
class Subprogram:
1313
argument_sql = f'''
14-
SELECT argument_name, data_type, defaulted, in_out
14+
SELECT argument_name, data_type, defaulted, in_out, type_owner || '.' || type_name || '.' || type_subname extended_type
1515
FROM all_arguments
1616
WHERE owner = UPPER(:owner)
1717
AND object_name = :object_name
@@ -76,17 +76,9 @@ def __call__(self, **kwargs):
7676
pass
7777
kwargs[name] = parameter
7878

79-
def pythonize_value(value):
80-
# todo: should leave clobs and blobs as is, file like objects, they can be quite big, so user will
81-
# know best himself how to read them, not sure whats best
82-
# try:
83-
# return value.read()
84-
# except AttributeError:
85-
return value
86-
8779
def parse_in_out(parameters):
8880
return {
89-
param_name: pythonize_value(param_value.getvalue())
81+
param_name: param_value.getvalue()
9082
for param_name, param_value
9183
in parameters
9284
}
@@ -99,11 +91,28 @@ def parse_in_out(parameters):
9991
else:
10092
object_type = PROCEDURE
10193

94+
def oracle_record(argument, mapping):
95+
record_type = self.plsql.connection.gettype(argument.extended_type)
96+
record = record_type.newobject()
97+
98+
for key, value in mapping.items():
99+
setattr(record, key.upper(), value)
100+
return record
101+
102+
rec_types = {
103+
argument.argument_name.lower(): oracle_record(argument, kwargs[argument.argument_name.lower()])
104+
for argument
105+
in self.arguments
106+
if 'IN' in argument.in_out
107+
if argument.data_type == 'PL/SQL RECORD'
108+
}
109+
110+
for argument_name, argument_value in rec_types.items():
111+
kwargs[argument_name] = argument_value
112+
102113
if object_type == FUNCTION:
103114
result = cursor.callfunc(self.name, self.return_type, keywordParameters=kwargs)
104115

105-
result = pythonize_value(result)
106-
107116
if in_out_parameters:
108117
return result, parse_in_out(in_out_parameters)
109118
return result

‎tests/test_package_type.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from itertools import accumulate
1+
from functools import reduce
22
from operator import mul
33

44

@@ -19,4 +19,4 @@ def test_rec_type(plsql):
1919

2020
result = plsql.test_package.compute_rec_product(pr_rec=record)
2121

22-
assert result == accumulate(record.values(), mul)
22+
assert result == reduce(mul, record.values())

0 commit comments

Comments
 (0)