Skip to content

Commit 06c8406

Browse files
committed
start of in params
1 parent ed9c46d commit 06c8406

7 files changed

Lines changed: 632 additions & 21 deletions

File tree

‎python_plsql/client.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def to_python(value):
278278
if isinstance(value, oracle.Object):
279279
if value.type.attributes:
280280
return record_converter(value)
281-
return list_converter(value)
281+
return list_converter(value) # todo: list/dict
282282
return value
283283

284284

@@ -294,7 +294,7 @@ def list_converter(value):
294294
if attributes:
295295
record = plsql_record(attributes)
296296
return [to_record(val, record) for val in value.aslist()]
297-
297+
# todo: list/dict
298298
return [list_converter(val) for val in value.aslist()]
299299
return value.aslist()
300300

@@ -305,7 +305,7 @@ def dict_converter(value):
305305
if attributes:
306306
record = plsql_record(attributes)
307307
return {key: to_record(val, record) for key, val in value.asdict().items()}
308-
308+
# todo: list/dict
309309
return {key: dict_converter(val) for key, val in value.asdict().items()}
310310
return value.asdict()
311311

@@ -316,14 +316,6 @@ def record_converter(value, record=None):
316316
return to_record(value, record)
317317

318318

319-
converters = {
320-
122: list_converter, # nested table
321-
123: list_converter, # varray
322-
250: record_converter, # plsql record
323-
251: dict_converter, # plsql table
324-
}
325-
326-
327319
def type_name(plsql: Database, resolved: ResolvedName, plsql_type: Argument):
328320
argument_type_name = plsql.query(
329321
"""
@@ -348,6 +340,7 @@ def python_type(
348340
1: oracle.STRING,
349341
2: oracle.NUMBER,
350342
3: oracle.NATIVE_INT,
343+
8: oracle.LONG_STRING, # LONG
351344
11: oracle.ROWID,
352345
12: oracle.DATETIME,
353346
23: oracle.BINARY,
@@ -361,6 +354,13 @@ def python_type(
361354
try:
362355
return cursor.var(type_mapping[plsql_type.datatype])
363356
except KeyError:
357+
converters = {
358+
122: list_converter, # nested table
359+
123: list_converter, # varray
360+
250: record_converter, # plsql record
361+
251: dict_converter, # plsql table
362+
}
363+
364364
converter = converters[plsql_type.datatype]
365365

366366
object_type = plsql._connection.gettype(

‎tests/func/test_in_param.py‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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, in_value",
12+
[
13+
("in_varchar2", "42"),
14+
("in_varchar", "42"),
15+
("in_string", "42"),
16+
("in_number", 42.42),
17+
("in_integer", 42.0),
18+
("in_smallint", 42.0),
19+
("in_real", 42.42),
20+
("in_float", 42.42),
21+
("in_numeric", 42.0),
22+
("in_decimal", 42.0),
23+
("in_binary_integer", 42),
24+
("in_pls_integer", 42),
25+
("in_positive", 42),
26+
("in_natural", 42),
27+
("in_clob", "42"),
28+
("in_long", "42"),
29+
("in_rowid", "AAAACPAABAAAAShAAA"),
30+
("in_date", datetime.datetime(year=2019, month=12, day=20)),
31+
("in_timestamp", datetime.datetime(year=2019, month=12, day=20)),
32+
("in_raw", b"42"),
33+
("in_long_raw", b"42"),
34+
("in_char", "42"),
35+
("in_character", "42"),
36+
("in_bool", True),
37+
("in_record", RECORD),
38+
("in_record_of_records", (42, RECORD, RECORD)),
39+
("in_record_of_nested", (42, NESTED, NESTED)),
40+
("in_record_of_plsql_table", (42, PLSQL_TABLE, PLSQL_TABLE),),
41+
("in_nested", NESTED),
42+
("in_nested_of_records", [RECORD] * 10),
43+
("in_nested_of_record_of_nested", [(42, NESTED, NESTED)] * 10),
44+
("in_varray", VARRAY),
45+
("in_plsql_table", PLSQL_TABLE),
46+
("in_plsql_table_of_records", {i: RECORD for i in range(1, 11)}),
47+
("in_varray_of_plsql_table", [PLSQL_TABLE] * 10,),
48+
("in_varray_of_nested", [NESTED] * 10,),
49+
("in_plsql_table_of_nested", {i: NESTED for i in range(1, 11)},),
50+
("in_nested_of_nested", [NESTED] * 10,),
51+
("in_nested_of_plsql_table", [PLSQL_TABLE] * 10,),
52+
("in_plsql_table_of_plsql_table", {i: PLSQL_TABLE for i in range(1, 11)},),
53+
],
54+
)
55+
def test_return_values(plsql, func, in_value):
56+
getattr(plsql.test_in_params, func)(in_value)

‎tests/func/test_return_values.py‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,37 @@
1010
@pytest.mark.parametrize(
1111
"func, expected",
1212
[
13+
("ret_varchar2", "42"),
1314
("ret_varchar", "42"),
15+
("ret_string", "42"),
1416
("ret_number", 42.42),
17+
("ret_integer", 42.0),
18+
("ret_smallint", 42.0),
19+
("ret_real", 42.42),
20+
("ret_float", 42.42),
21+
("ret_numeric", 42.0),
22+
("ret_decimal", 42.0),
1523
("ret_binary_integer", 42),
24+
("ret_pls_integer", 42),
25+
("ret_positive", 42),
26+
("ret_natural", 42),
1627
("ret_clob", "42"),
28+
("ret_long", "42"),
1729
("ret_rowid", "AAAACPAABAAAAShAAA"),
1830
("ret_date", datetime.datetime(year=2019, month=12, day=20)),
1931
("ret_timestamp", datetime.datetime(year=2019, month=12, day=20)),
2032
("ret_raw", b"42"),
2133
("ret_long_raw", b"42"),
2234
("ret_char", "42"),
35+
("ret_character", "42"),
2336
("ret_bool", True),
2437
("ret_record", RECORD),
2538
("ret_record_of_records", (42, RECORD, RECORD)),
2639
("ret_record_of_nested", (42, NESTED, NESTED)),
2740
pytest.param(
2841
"ret_record_of_plsql_table",
2942
(42, PLSQL_TABLE, PLSQL_TABLE),
30-
marks=pytest.mark.xfail(
31-
reason="No current way to tell between NESTED and PLSQL tables for multi-layered types"
32-
),
43+
marks=pytest.mark.xfail(reason="can't tell between NESTED/PLSQL tables"),
3344
),
3445
("ret_nested", NESTED),
3546
("ret_nested_of_records", [RECORD] * 10),
@@ -40,7 +51,10 @@
4051
pytest.param(
4152
"ret_varray_of_plsql_table",
4253
[PLSQL_TABLE] * 10,
43-
marks=pytest.mark.skip(reason="Memory access violation"),
54+
marks=[
55+
pytest.mark.skip(reason="Memory access violation"),
56+
pytest.mark.xfail(reason="can't tell between NESTED/PLSQL tables"),
57+
],
4458
),
4559
pytest.param(
4660
"ret_varray_of_nested",

0 commit comments

Comments
 (0)