Skip to content

Commit deb69f1

Browse files
committed
better support for queries
and tests for them as well
1 parent e2c2527 commit deb69f1

2 files changed

Lines changed: 63 additions & 7 deletions

File tree

‎plsql/client.py‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from collections import namedtuple
2+
from operator import itemgetter
23

34
import cx_Oracle as oracle
45

@@ -99,8 +100,8 @@ def __call__(self, **kwargs):
99100

100101
def parse_in_out(parameters):
101102
return {
102-
name: parameter.getvalue()
103-
for name, parameter
103+
param_name: param_value.getvalue()
104+
for param_name, param_value
104105
in parameters
105106
}
106107

@@ -128,6 +129,9 @@ def __getattr__(self, item):
128129
return self
129130

130131
def __call__(self, **kwargs):
132+
if len(self.attr) > 3:
133+
raise ValueError('Attribute access is too deep, maximum of 3 allowed! (schema, package, subprogram)')
134+
131135
subprogram = Subprogram('.'.join(self.attr), self.plsql)
132136
return subprogram(**kwargs)
133137

@@ -143,15 +147,21 @@ def execute(self):
143147
cursor.execute(self.query, self.binds)
144148
else:
145149
cursor.execute(self.query)
146-
Result = namedtuple('Result', [column[0].lower() for column in cursor.description])
147-
for rec in cursor:
148-
yield Result(*rec)
150+
151+
if len(cursor.description) > 1:
152+
record_type = namedtuple('Result', [column[0].lower() for column in cursor.description])
153+
154+
def result(rec):
155+
return record_type(*rec)
156+
else:
157+
result = itemgetter(0)
158+
159+
for record in cursor:
160+
yield result(record)
149161

150162
@property
151163
def first(self):
152164
first_row = next(self.execute())
153-
if len(first_row) == 1:
154-
return first_row[0]
155165
return first_row
156166

157167
@property

‎tests/test_query.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
def test_dual_single_column(plsql):
2+
query = '''
3+
SELECT 1 AS test
4+
FROM dual'''
5+
6+
assert plsql.query(query).first == 1
7+
assert list(plsql.query(query).all) == [1]
8+
9+
10+
def test_dual_multiple_column(plsql):
11+
query = '''
12+
SELECT 1 AS int, '2' AS string, 3.5 AS num FROM dual UNION ALL
13+
SELECT 1 AS int, '2' AS string, 3.5 AS num FROM dual
14+
'''
15+
first_row = plsql.query(query).first
16+
all_rows = list(plsql.query(query).all)
17+
18+
def assert_assumptions(single_row):
19+
assert len(single_row) == 3
20+
assert single_row.int == 1
21+
assert single_row.string == '2'
22+
assert single_row.num == 3.5
23+
24+
assert_assumptions(first_row)
25+
26+
assert len(all_rows) == 2
27+
for row in all_rows:
28+
assert_assumptions(row)
29+
assert row == first_row
30+
31+
32+
def test_larger_query(plsql):
33+
query = '''
34+
SELECT level
35+
FROM dual
36+
CONNECT BY level <= 1000
37+
'''
38+
39+
query_generator = plsql.query(query)
40+
41+
assert query_generator.first == 1
42+
43+
for row, expected in zip(query_generator.all, range(1, 1000)):
44+
assert row == expected
45+
46+
assert len(list(query_generator.all)) == 1000

0 commit comments

Comments
 (0)