Skip to content

Commit ed9c46d

Browse files
committed
varray + timestamp implemented
1 parent ef7c41b commit ed9c46d

4 files changed

Lines changed: 67 additions & 12 deletions

File tree

‎python_plsql/client.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,10 @@ def record_converter(value, record=None):
317317

318318

319319
converters = {
320-
122: list_converter,
321-
250: record_converter,
322-
251: dict_converter,
320+
122: list_converter, # nested table
321+
123: list_converter, # varray
322+
250: record_converter, # plsql record
323+
251: dict_converter, # plsql table
323324
}
324325

325326

@@ -353,6 +354,7 @@ def python_type(
353354
24: oracle.LONG_BINARY,
354355
96: oracle.STRING, # oracle.FIXED_CHAR
355356
112: oracle.STRING, # oracle.CLOB
357+
180: oracle.TIMESTAMP,
356358
252: oracle.BOOLEAN,
357359
}
358360

‎tests/func/test_return_values.py‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import datetime
33

44
RECORD = (42, 84, 126)
5+
VARRAY = list(range(10, 0, -1))
56
NESTED = [i * 2 for i in range(1, 11)]
67
PLSQL_TABLE = {i: i for i in range(1, 11)}
78

@@ -15,13 +16,14 @@
1516
("ret_clob", "42"),
1617
("ret_rowid", "AAAACPAABAAAAShAAA"),
1718
("ret_date", datetime.datetime(year=2019, month=12, day=20)),
19+
("ret_timestamp", datetime.datetime(year=2019, month=12, day=20)),
1820
("ret_raw", b"42"),
1921
("ret_long_raw", b"42"),
2022
("ret_char", "42"),
2123
("ret_bool", True),
2224
("ret_record", RECORD),
2325
("ret_record_of_records", (42, RECORD, RECORD)),
24-
("ret_record_of_nested", (42, NESTED, NESTED),),
26+
("ret_record_of_nested", (42, NESTED, NESTED)),
2527
pytest.param(
2628
"ret_record_of_plsql_table",
2729
(42, PLSQL_TABLE, PLSQL_TABLE),
@@ -32,8 +34,19 @@
3234
("ret_nested", NESTED),
3335
("ret_nested_of_records", [RECORD] * 10),
3436
("ret_nested_of_record_of_nested", [(42, NESTED, NESTED)] * 10),
37+
("ret_varray", VARRAY),
3538
("ret_plsql_table", PLSQL_TABLE),
3639
("ret_plsql_table_of_records", {i: RECORD for i in range(1, 11)}),
40+
pytest.param(
41+
"ret_varray_of_plsql_table",
42+
[PLSQL_TABLE] * 10,
43+
marks=pytest.mark.skip(reason="Memory access violation"),
44+
),
45+
pytest.param(
46+
"ret_varray_of_nested",
47+
[NESTED] * 10,
48+
marks=pytest.mark.skip(reason="Memory access violation"),
49+
),
3750
pytest.param(
3851
"ret_plsql_table_of_nested",
3952
{i: NESTED for i in range(1, 11)},

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,33 @@ CREATE OR REPLACE PACKAGE BODY test_return AS
138138
END ret_nested_of_record_of_nested;
139139

140140
-- 123 VARRAY -- list
141-
--FUNCTION ret_binary_integer
142-
--RETURN BINARY_INTEGER;
141+
FUNCTION ret_varray
142+
RETURN tt_varray IS
143+
BEGIN
144+
RETURN tt_varray(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
145+
END ret_varray;
146+
147+
FUNCTION ret_varray_of_nested
148+
RETURN tt_varray_of_nested IS
149+
vt_varray_of_nested tt_varray_of_nested := tt_varray_of_nested();
150+
BEGIN
151+
FOR v_i IN 1 .. 10 LOOP
152+
vt_varray_of_nested.extend;
153+
vt_varray_of_nested(v_i) := ret_nested;
154+
END LOOP;
155+
RETURN vt_varray_of_nested;
156+
END ret_varray_of_nested;
157+
158+
FUNCTION ret_varray_of_plsql_table
159+
RETURN tt_varray_of_plsql_table IS
160+
vt_varray_of_plsql_table tt_varray_of_plsql_table := tt_varray_of_plsql_table();
161+
BEGIN
162+
FOR v_i IN 1 .. 10 LOOP
163+
vt_varray_of_plsql_table.extend;
164+
vt_varray_of_plsql_table(v_i) := ret_plsql_table;
165+
END LOOP;
166+
RETURN vt_varray_of_plsql_table;
167+
END ret_varray_of_plsql_table;
143168

144169
-- 178 TIME -- datetime.datetime
145170
--FUNCTION ret_binary_integer
@@ -150,8 +175,11 @@ CREATE OR REPLACE PACKAGE BODY test_return AS
150175
--RETURN BINARY_INTEGER;
151176

152177
-- 180 TIMESTAMP -- datetime.datetime
153-
--FUNCTION ret_binary_integer
154-
--RETURN BINARY_INTEGER;
178+
FUNCTION ret_timestamp
179+
RETURN TIMESTAMP IS
180+
BEGIN
181+
RETURN to_timestamp(ret_date);
182+
END ret_timestamp;
155183

156184
-- 181 TIMESTAMP WITH TIME ZONE -- datetime.datetime
157185
--FUNCTION ret_binary_integer

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ CREATE OR REPLACE PACKAGE test_return AS
4242

4343
TYPE tt_nested_of_plsql_table IS TABLE OF tt_plsql_table;
4444

45+
TYPE tt_varray IS VARRAY(10) OF PLS_INTEGER;
46+
47+
TYPE tt_varray_of_nested IS VARRAY(10) OF tt_nested;
48+
49+
TYPE tt_varray_of_plsql_table IS VARRAY(10) OF tt_plsql_table;
50+
4551
-- 0 placeholder for procedures with no arguments -- ------||------
4652
-- 1 VARCHAR2, VARCHAR, STRING -- str
4753
FUNCTION ret_varchar
@@ -108,8 +114,14 @@ CREATE OR REPLACE PACKAGE test_return AS
108114
RETURN tt_nested_of_record_of_nested;
109115

110116
-- 123 VARRAY -- list
111-
--FUNCTION ret_binary_integer
112-
--RETURN BINARY_INTEGER;
117+
FUNCTION ret_varray
118+
RETURN tt_varray;
119+
120+
FUNCTION ret_varray_of_nested
121+
RETURN tt_varray_of_nested;
122+
123+
FUNCTION ret_varray_of_plsql_table
124+
RETURN tt_varray_of_plsql_table;
113125

114126
-- 178 TIME -- datetime.datetime
115127
--FUNCTION ret_binary_integer
@@ -120,8 +132,8 @@ CREATE OR REPLACE PACKAGE test_return AS
120132
--RETURN BINARY_INTEGER;
121133

122134
-- 180 TIMESTAMP -- datetime.datetime
123-
--FUNCTION ret_binary_integer
124-
--RETURN BINARY_INTEGER;
135+
FUNCTION ret_timestamp
136+
RETURN TIMESTAMP;
125137

126138
-- 181 TIMESTAMP WITH TIME ZONE -- datetime.datetime
127139
--FUNCTION ret_binary_integer

0 commit comments

Comments
 (0)