Skip to content

Commit a0fd7d6

Browse files
committed
simplified fixtures
1 parent 219e61c commit a0fd7d6

4 files changed

Lines changed: 43 additions & 63 deletions

File tree

‎plsql/client.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,25 +97,24 @@ def __call__(self, **kwargs):
9797
pass
9898
kwargs[name] = parameter
9999

100+
def parse_in_out(parameters):
101+
return {
102+
name: parameter.getvalue()
103+
for name, parameter
104+
in parameters
105+
}
106+
100107
if self.definition.object_type == FUNCTION:
101108
result = cursor.callfunc(self.name, self.return_type, keywordParameters=kwargs)
102109

103110
if in_out_parameters:
104-
return result, {
105-
name: parameter.getvalue()
106-
for name, parameter
107-
in in_out_parameters
108-
}
111+
return result, parse_in_out(in_out_parameters)
109112
return result
110113
elif self.definition.object_type == PROCEDURE:
111114
cursor.callproc(self.name, keywordParameters=kwargs)
112115

113116
if in_out_parameters:
114-
return {
115-
name: parameter.getvalue()
116-
for name, parameter
117-
in in_out_parameters
118-
}
117+
return parse_in_out(in_out_parameters)
119118
else:
120119
raise NotImplementedError(f'Unrecognized object_type "{self.definition.object_type}"!')
121120

@@ -140,7 +139,10 @@ def __init__(self, connection, query, binds):
140139

141140
def execute(self):
142141
with self.connection.cursor() as cursor:
143-
cursor.execute(self.query, self.binds)
142+
if self.binds:
143+
cursor.execute(self.query, self.binds)
144+
else:
145+
cursor.execute(self.query)
144146
Result = namedtuple('Result', [column[0].lower() for column in cursor.description])
145147
for rec in cursor:
146148
yield Result(*rec)

‎tests/conftest.py‎

Lines changed: 23 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import configparser
2+
from pathlib import Path
3+
14
import pytest
5+
26
from plsql import Database
3-
from contextlib import contextmanager
4-
import configparser
57

68

79
@pytest.fixture(scope='session')
@@ -10,56 +12,32 @@ def plsql():
1012
config.read('./database.ini')
1113

1214
parameters = dict(config['database'].items())
13-
return Database(**parameters)
14-
15-
16-
@contextmanager
17-
def managed_object(plsql, object_type, object_name):
18-
with open(f'./sql/{object_type}/{object_name}.sql', mode='r', encoding='utf8') as file:
19-
sql_text = file.read()
20-
21-
plsql.execute_immediate(sql_text)
22-
yield
23-
plsql.execute_immediate(f'DROP {object_type} {object_name}')
24-
25-
26-
@pytest.fixture(scope='module')
27-
def simple_function(plsql):
28-
with managed_object(plsql, 'function', 'simple_function'):
29-
yield
30-
31-
32-
@pytest.fixture(scope='module')
33-
def function_with_defaults(plsql):
34-
with managed_object(plsql, 'function', 'function_with_defaults'):
35-
yield
3615

16+
database = Database(**parameters)
3717

38-
@pytest.fixture(scope='module')
39-
def string_function(plsql):
40-
with managed_object(plsql, 'function', 'string_function'):
41-
yield
18+
directories = [directory for directory in Path('.').glob('./sql/*/') if directory.is_dir()]
4219

20+
objects = [
21+
(file, directory)
22+
for directory in directories
23+
for file in directory.glob('*.sql')
24+
]
4325

44-
@pytest.fixture(scope='module')
45-
def simple_procedure(plsql):
46-
with managed_object(plsql, 'procedure', 'simple_procedure'):
47-
yield
26+
create_object(database, objects)
4827

28+
yield database
4929

50-
@pytest.fixture(scope='module')
51-
def procedure_out_params(plsql):
52-
with managed_object(plsql, 'procedure', 'procedure_out_params'):
53-
yield
30+
drop_all_objects(database, objects)
5431

5532

56-
@pytest.fixture(scope='module')
57-
def procedure_in_out_params(plsql):
58-
with managed_object(plsql, 'procedure', 'procedure_in_out_params'):
59-
yield
33+
def create_object(plsql, objects):
34+
for file, _ in objects:
35+
with open(file, mode='r', encoding='utf8') as file:
36+
sql_text = file.read()
37+
plsql.execute_immediate(sql_text)
6038

6139

62-
@pytest.fixture(scope='module')
63-
def function_in_out(plsql):
64-
with managed_object(plsql, 'function', 'function_in_out'):
65-
yield
40+
def drop_all_objects(plsql, objects):
41+
for file, directory in objects:
42+
object_type, object_name = directory.name, file.stem,
43+
plsql.execute_immediate(f'DROP {object_type} {object_name}')

‎tests/test_functions.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
def test_simple_function(plsql, simple_function):
1+
def test_simple_function(plsql):
22
assert plsql.simple_function(p_int=5) == 5 + 5
33
assert plsql.simple_function(p_int=None) is None
44

55

6-
def test_function_with_defaults(plsql, function_with_defaults):
6+
def test_function_with_defaults(plsql):
77
assert plsql.function_with_defaults() == 5
88
assert plsql.function_with_defaults(p_int_a=0) == 4
99
assert plsql.function_with_defaults(p_int_b=0) == 1
1010
assert plsql.function_with_defaults(p_int_a=0, p_int_b=0) == 0
1111

1212

13-
def test_string_function(plsql, string_function):
13+
def test_string_function(plsql):
1414
assert plsql.string_function(p_str='test') == 'testtest'
1515

1616

17-
def test_function_in_out(plsql, function_in_out):
17+
def test_function_in_out(plsql):
1818
result, in_out = plsql.function_in_out(p_int=21, p_float=1337.42, p_str='input')
1919

2020
assert result == 42

‎tests/test_procedures.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
def test_simple_procedure(plsql, simple_procedure):
1+
def test_simple_procedure(plsql):
22
plsql.simple_procedure()
33

44

5-
def test_procedure_out_params(plsql, procedure_out_params):
5+
def test_procedure_out_params(plsql):
66
result = plsql.procedure_out_params()
77
assert result == {'p_str': '42'}
88

99

10-
def test_procedure_in_out_params(plsql, procedure_in_out_params):
10+
def test_procedure_in_out_params(plsql):
1111
result = plsql.procedure_in_out_params(p_str='21')
1212
assert result == {'p_str': '42'}

0 commit comments

Comments
 (0)