Skip to content

Commit be3145f

Browse files
committed
nested records work fine as in parameters
1 parent 5114abb commit be3145f

4 files changed

Lines changed: 62 additions & 6 deletions

File tree

‎plsql/client.py‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ def parse_in_out(parameters):
9191
else:
9292
object_type = PROCEDURE
9393

94-
def oracle_record(argument, mapping):
95-
record_type = self.plsql.connection.gettype(argument.extended_type)
94+
def oracle_record(argument, mapping, record_type=None):
95+
if record_type is None:
96+
record_type = self.plsql.connection.gettype(argument.extended_type.upper())
9697
record = record_type.newobject()
9798

9899
for key, value in mapping.items():
@@ -110,6 +111,29 @@ def oracle_record(argument, mapping):
110111
for argument_name, argument_value in rec_types.items():
111112
kwargs[argument_name] = argument_value
112113

114+
def oracle_table(argument, list_of_recs):
115+
table_type = self.plsql.connection.gettype(argument.extended_type)
116+
table = table_type.newobject()
117+
118+
if table_type.elementType is not None:
119+
for mapping in list_of_recs:
120+
rec = oracle_record(None, mapping, table_type.elementType)
121+
table.append(rec)
122+
return table
123+
124+
return list_of_recs
125+
126+
table_types = {
127+
argument.argument_name.lower(): oracle_table(argument, kwargs[argument.argument_name.lower()])
128+
for argument
129+
in self.arguments
130+
if 'IN' in argument.in_out
131+
if argument.data_type == 'PL/SQL TABLE'
132+
}
133+
134+
for argument_name, argument_value in table_types.items():
135+
kwargs[argument_name] = argument_value
136+
113137
if object_type == FUNCTION:
114138
result = cursor.callfunc(self.name, self.return_type, keywordParameters=kwargs)
115139

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CREATE OR REPLACE PACKAGE BODY test_package AS
55
NULL;
66
END simple_procedure;
77

8+
89
FUNCTION simple_function(p_int IN INTEGER)
910
RETURN INTEGER IS
1011
BEGIN
@@ -17,19 +18,32 @@ CREATE OR REPLACE PACKAGE BODY test_package AS
1718
v_result INTEGER := 0;
1819
BEGIN
1920

20-
FOR i IN 1 .. pt_stringlist.COUNT LOOP
21+
FOR i IN pt_stringlist.FIRST .. pt_stringlist.LAST LOOP
2122
v_result := v_result + LENGTH(pt_stringlist(i));
2223
END LOOP;
2324

2425
RETURN v_result;
2526
END compute_agg_length;
2627

2728

28-
2929
FUNCTION compute_rec_product(pr_rec IN tr_rec)
3030
RETURN INTEGER IS
3131
BEGIN
3232
RETURN pr_rec.int_1 * pr_rec.int_2 * pr_rec.int_3 * pr_rec.int_4;
3333
END compute_rec_product;
3434

35+
36+
FUNCTION compute_rec_table(pt_rec IN tt_rec)
37+
RETURN INTEGER IS
38+
v_result INTEGER := 0;
39+
BEGIN
40+
FOR i IN pt_rec.FIRST .. pt_rec.LAST LOOP
41+
v_result := v_result + (pt_rec(i).int_1 * pt_rec(i).int_2 * pt_rec(i).int_3 * pt_rec(i).int_4);
42+
END LOOP;
43+
RETURN v_result;
44+
EXCEPTION
45+
WHEN NO_DATA_FOUND THEN
46+
RETURN pt_rec.COUNT;
47+
END compute_rec_table;
48+
3549
END test_package;

‎tests/sql/package/test_package-h.sql‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
CREATE OR REPLACE PACKAGE test_package AS
22
TYPE tt_stringlist IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
33

4-
54
TYPE tr_rec IS RECORD (
65
int_1 INTEGER,
76
int_2 INTEGER,
87
int_3 INTEGER,
98
int_4 INTEGER
109
);
1110

11+
TYPE tt_rec IS TABLE OF tr_rec INDEX BY BINARY_INTEGER;
12+
1213
PROCEDURE simple_procedure;
1314

1415
FUNCTION simple_function(p_int IN INTEGER)
@@ -20,4 +21,7 @@ CREATE OR REPLACE PACKAGE test_package AS
2021
FUNCTION compute_rec_product(pr_rec IN tr_rec)
2122
RETURN INTEGER;
2223

24+
FUNCTION compute_rec_table(pt_rec IN tt_rec)
25+
RETURN INTEGER;
26+
2327
END test_package;

‎tests/test_package_type.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from operator import mul
33

44

5-
def test_list_type(plsql):
5+
def test_table_type(plsql):
66
words = ['aoeu', 'snth', 'qjkx', 'bmwv']
77

88
result = plsql.test_package.compute_agg_length(pt_stringlist=words)
@@ -20,3 +20,17 @@ def test_rec_type(plsql):
2020
result = plsql.test_package.compute_rec_product(pr_rec=record)
2121

2222
assert result == reduce(mul, record.values())
23+
24+
25+
def test_rec_table(plsql):
26+
record = {
27+
f'int_{i}': i
28+
for i
29+
in range(1, 5)
30+
}
31+
32+
table = [record] * 5
33+
34+
result = plsql.test_package.compute_rec_table(pt_rec=table)
35+
36+
assert result == reduce(mul, record.values()) * 5

0 commit comments

Comments
 (0)