Skip to content

Commit 462e984

Browse files
committed
changed to using SID
added nested tables
1 parent ed4e215 commit 462e984

4 files changed

Lines changed: 37 additions & 10 deletions

File tree

‎plsql/client.py‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ def oracle_plsql_table(connection, argument, mapping_of_recs):
4141
return mapping_of_recs
4242

4343

44+
def oracle_table(connection, argument, list_of_recs):
45+
table_type = connection.gettype(argument.extended_type)
46+
table = table_type.newobject()
47+
48+
if table_type.elementType is not None:
49+
for value in list_of_recs:
50+
rec = oracle_plsql_record(connection, None, value, table_type.elementType)
51+
table.append(rec)
52+
return table
53+
else:
54+
for value in list_of_recs:
55+
table.append(value)
56+
return table
57+
58+
4459
def translate_types(connection, arguments, parameters, conversion_func, data_type):
4560
return {
4661
argument.argument_name.lower(): conversion_func(
@@ -64,6 +79,7 @@ class Subprogram:
6479
AND object_name = :object_name
6580
AND object_id = :object_id
6681
AND subprogram_id = :subprogram_id
82+
AND data_level = 0
6783
"""
6884

6985
# fixme: not gonna scale with other types
@@ -140,6 +156,7 @@ def __call__(self, **kwargs):
140156
for func, data_type in [
141157
(oracle_plsql_record, "PL/SQL RECORD"),
142158
(oracle_plsql_table, "PL/SQL TABLE"),
159+
(oracle_table, "TABLE"),
143160
]
144161
)
145162

@@ -338,17 +355,10 @@ def __iter__(self):
338355

339356
class Database:
340357
def __init__(
341-
self,
342-
user: str,
343-
password: str,
344-
host: str,
345-
port: int,
346-
service_name: str,
347-
encoding: str,
358+
self, user: str, password: str, sid: str, encoding: str,
348359
):
349-
dsn = oracle.makedsn(host, port, service_name=service_name)
350360
self.connection = oracle.connect(
351-
user=user, password=password, dsn=dsn, encoding=encoding, nencoding=encoding
361+
user, password, sid, encoding=encoding, nencoding=encoding
352362
)
353363

354364
def execute_immediate(self, dynamic_string: str):

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ CREATE OR REPLACE PACKAGE BODY test_package AS
66
RETURN tt_integers(1, 2, p_integer);
77
END;
88

9+
FUNCTION in_integers(pt_integers IN tt_integers)
10+
RETURN INTEGER IS
11+
v_sum INTEGER;
12+
BEGIN
13+
SELECT SUM(column_value)
14+
INTO v_sum
15+
FROM TABLE(pt_integers);
16+
RETURN v_sum;
17+
END;
18+
919
FUNCTION return_record
1020
RETURN tr_rec IS
1121
vr_rec tr_rec;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ CREATE OR REPLACE PACKAGE test_package AS
1717
FUNCTION out_integers(p_integer IN INTEGER)
1818
RETURN tt_integers;
1919

20+
FUNCTION in_integers(pt_integers IN tt_integers)
21+
RETURN INTEGER;
22+
2023
FUNCTION return_record
2124
RETURN tr_rec;
2225

‎tests/test_package_type.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,9 @@ def test_rec_plsql_table(plsql):
4040
assert result == reduce(mul, record.values()) * 100
4141

4242

43-
def test_nested_table(plsql):
43+
def test_nested_table_as_out(plsql):
4444
assert plsql.test_package.out_integers(p_integer=5) == [1, 2, 5]
45+
46+
47+
def test_nested_table_as_in(plsql):
48+
assert plsql.test_package.in_integers(pt_integers=[1, 2, 3]) == 6

0 commit comments

Comments
 (0)