Skip to content

Commit ca08069

Browse files
committed
implemented use of function via schema access
1 parent 76e8931 commit ca08069

2 files changed

Lines changed: 60 additions & 29 deletions

File tree

‎python_plsql/client.py‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ class Schema:
163163
def __init__(self, plsql: Database, name: str):
164164
self._plsql, self._name = plsql, name
165165

166+
def __getattr__(self, item):
167+
item = f"{self._name}.{item}"
168+
name = self._plsql._name_resolve(item)
169+
return search_object(plsql=self._plsql, name=name, item=item)
170+
166171

167172
class Package:
168173
def __init__(self, plsql: Database, name: str):
@@ -321,6 +326,24 @@ def standalone(self) -> bool:
321326
}
322327

323328

329+
def search_object(plsql: Database, name: ResolvedName, item: str):
330+
if name.object_type in {
331+
ObjectTypes.function,
332+
ObjectTypes.procedure,
333+
}:
334+
return Subprogram(
335+
plsql=plsql, resolved=name, arguments=plsql._describe_procedure(item),
336+
)
337+
elif name.object_type == ObjectTypes.package:
338+
items = item.split(".")
339+
with_schema = plsql.is_schema(items[0])
340+
if len(items) == 3 and with_schema or len(items) == 2 and not with_schema:
341+
return Subprogram(
342+
plsql=plsql, resolved=name, arguments=plsql._describe_procedure(item),
343+
)
344+
return Package(plsql=plsql, name=item)
345+
346+
324347
class Database:
325348
def __init__(
326349
self,
@@ -352,21 +375,8 @@ def __getattr__(self, item):
352375
return Schema(plsql=self, name=item)
353376
raise
354377
else:
355-
if name.object_type in {
356-
ObjectTypes.function,
357-
ObjectTypes.procedure,
358-
}:
359-
return Subprogram(
360-
plsql=self, resolved=name, arguments=self._describe_procedure(item),
361-
)
362-
elif name.object_type == ObjectTypes.package:
363-
if len(item.split(".")) > 1:
364-
return Subprogram(
365-
plsql=self,
366-
resolved=name,
367-
arguments=self._describe_procedure(item),
368-
)
369-
return Package(plsql=self, name=item)
378+
if found_object := search_object(plsql=self, name=name, item=item):
379+
return found_object
370380

371381
raise AttributeError
372382

‎tests/func/conftest.py‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,46 @@
11
import pytest
2+
import itertools
3+
4+
5+
def recurse_getattr(current, attributes):
6+
attributes = list(filter(None, attributes))
7+
if attributes:
8+
attribute, *attributes = attributes
9+
return recurse_getattr(getattr(current, attribute), attributes)
10+
return current
211

312

413
@pytest.fixture(
5-
params=[
6-
"simple_function",
7-
"test_package.simple_function",
8-
"synonym_function",
9-
"synonym_package.simple_function",
10-
]
14+
params=map(
15+
".".join,
16+
itertools.product(
17+
["", "test_user"],
18+
[
19+
"simple_function",
20+
"test_package.simple_function",
21+
"synonym_function",
22+
"synonym_package.simple_function",
23+
],
24+
),
25+
)
1126
)
1227
def simple_function(plsql, request):
13-
return getattr(plsql, request.param)
28+
return recurse_getattr(plsql, request.param.split("."))
1429

1530

1631
@pytest.fixture(
17-
params=[
18-
"simple_procedure",
19-
"test_package.simple_procedure",
20-
"synonym_procedure",
21-
"synonym_package.simple_procedure",
22-
]
32+
params=map(
33+
".".join,
34+
itertools.product(
35+
["", "test_user"],
36+
[
37+
"simple_procedure",
38+
"test_package.simple_procedure",
39+
"synonym_procedure",
40+
"synonym_package.simple_procedure",
41+
],
42+
),
43+
)
2344
)
2445
def simple_procedure(plsql, request):
25-
return getattr(plsql, request.param)
46+
return recurse_getattr(plsql, request.param.split("."))

0 commit comments

Comments
 (0)