Skip to content

Commit 1ba40eb

Browse files
methanemethane
committed
Merge pull request #3 from jettify/tornado
fix SSCursor
2 parents 1e94d52 + 141610f commit 1ba40eb

5 files changed

Lines changed: 136 additions & 49 deletions

File tree

‎tornado_mysql/connections.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ def init_unbuffered_query(self):
10221022
self.connection = None
10231023
else:
10241024
self.field_count = first_packet.read_length_encoded_integer()
1025-
self._get_descriptions()
1025+
yield self._get_descriptions()
10261026

10271027
# Apparently, MySQLdb picks this number because it's the maximum
10281028
# value of a 64bit unsigned integer. Since we're emulating MySQLdb,

‎tornado_mysql/cursors.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ def fetchone(self):
393393
self._check_executed()
394394
row = yield self.read_next()
395395
if row is None:
396-
raise gen.Return()
396+
raise gen.Return(None)
397397
self.rownumber += 1
398398
raise gen.Return(row)
399399

@@ -427,6 +427,7 @@ def fetchmany(self, size=None):
427427
self.rownumber += 1
428428
raise gen.Return(rows)
429429

430+
@gen.coroutine
430431
def scroll(self, value, mode='relative'):
431432
self._check_executed()
432433

@@ -436,7 +437,7 @@ def scroll(self, value, mode='relative'):
436437
"Backwards scrolling not supported by this cursor")
437438

438439
for _ in range_type(value):
439-
self.read_next()
440+
yield self.read_next()
440441
self.rownumber += value
441442
elif mode == 'absolute':
442443
if value < self.rownumber:
@@ -445,7 +446,7 @@ def scroll(self, value, mode='relative'):
445446

446447
end = value - self.rownumber
447448
for _ in range_type(end):
448-
self.read_next()
449+
yield self.read_next()
449450
self.rownumber = value
450451
else:
451452
raise ProgrammingError("unknown scroll mode %s" % mode)

‎tornado_mysql/tests/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from tornado_mysql.tests.test_nextset import *
44
from tornado_mysql.tests.test_DictCursor import *
55
from tornado_mysql.tests.test_connection import TestConnection
6-
6+
from tornado_mysql.tests.test_SSCursor import TestSSCursor
77
#from pymysql.tests.thirdparty import *
88

99
if __name__ == "__main__":

‎tornado_mysql/tests/test_SSCursor.py‎

Lines changed: 129 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,181 @@
1-
import sys
1+
from tornado_mysql import ProgrammingError
2+
from tornado import gen
3+
from tornado.testing import gen_test
4+
from tornado_mysql import NotSupportedError
25

3-
from tornado_mysql.tests import base
46
import tornado_mysql.cursors
7+
from tornado_mysql.tests import base
58

69

710
class TestSSCursor(base.PyMySQLTestCase):
11+
12+
data = [
13+
('America', '', 'America/Jamaica'),
14+
('America', '', 'America/Los_Angeles'),
15+
('America', '', 'America/Lima'),
16+
('America', '', 'America/New_York'),
17+
('America', '', 'America/Menominee'),
18+
('America', '', 'America/Havana'),
19+
('America', '', 'America/El_Salvador'),
20+
('America', '', 'America/Costa_Rica'),
21+
('America', '', 'America/Denver'),
22+
('America', '', 'America/Detroit'),]
23+
24+
@gen_test
825
def test_SSCursor(self):
926
affected_rows = 18446744073709551615
1027

1128
conn = self.connections[0]
12-
data = [
13-
('America', '', 'America/Jamaica'),
14-
('America', '', 'America/Los_Angeles'),
15-
('America', '', 'America/Lima'),
16-
('America', '', 'America/New_York'),
17-
('America', '', 'America/Menominee'),
18-
('America', '', 'America/Havana'),
19-
('America', '', 'America/El_Salvador'),
20-
('America', '', 'America/Costa_Rica'),
21-
('America', '', 'America/Denver'),
22-
('America', '', 'America/Detroit'),]
2329

2430
try:
2531
cursor = conn.cursor(tornado_mysql.cursors.SSCursor)
2632

2733
# Create table
28-
cursor.execute(('CREATE TABLE tz_data ('
29-
'region VARCHAR(64),'
30-
'zone VARCHAR(64),'
31-
'name VARCHAR(64))'))
34+
yield cursor.execute('DROP TABLE IF EXISTS tz_data;')
35+
yield cursor.execute(('CREATE TABLE tz_data ('
36+
'region VARCHAR(64),'
37+
'zone VARCHAR(64),'
38+
'name VARCHAR(64))'))
3239

3340
# Test INSERT
34-
for i in data:
35-
cursor.execute('INSERT INTO tz_data VALUES (%s, %s, %s)', i)
41+
for i in self.data:
42+
yield cursor.execute('INSERT INTO tz_data VALUES (%s, %s, %s)', i)
3643
self.assertEqual(conn.affected_rows(), 1, 'affected_rows does not match')
37-
conn.commit()
38-
44+
yield conn.commit()
3945
# Test fetchone()
4046
iter = 0
41-
cursor.execute('SELECT * FROM tz_data')
47+
yield cursor.execute('SELECT * FROM tz_data;')
4248
while True:
43-
row = cursor.fetchone()
49+
row = yield cursor.fetchone()
50+
4451
if row is None:
4552
break
4653
iter += 1
4754

4855
# Test cursor.rowcount
4956
self.assertEqual(cursor.rowcount, affected_rows,
50-
'cursor.rowcount != %s' % (str(affected_rows)))
57+
'cursor.rowcount != %s' % (str(affected_rows)))
5158

5259
# Test cursor.rownumber
5360
self.assertEqual(cursor.rownumber, iter,
54-
'cursor.rowcount != %s' % (str(iter)))
61+
'cursor.rowcount != %s' % (str(iter)))
5562

5663
# Test row came out the same as it went in
57-
self.assertEqual((row in data), True,
58-
'Row not found in source data')
64+
self.assertEqual((row in self.data), True,
65+
'Row not found in source self.data')
5966

6067
# Test fetchall
61-
cursor.execute('SELECT * FROM tz_data')
62-
self.assertEqual(len(cursor.fetchall()), len(data),
63-
'fetchall failed. Number of rows does not match')
68+
yield cursor.execute('SELECT * FROM tz_data')
69+
r = yield cursor.fetchall()
70+
self.assertEqual(len(r), len(self.data),
71+
'fetchall failed. Number of rows does not match')
6472

6573
# Test fetchmany
66-
cursor.execute('SELECT * FROM tz_data')
67-
self.assertEqual(len(cursor.fetchmany(2)), 2,
68-
'fetchmany failed. Number of rows does not match')
74+
yield cursor.execute('SELECT * FROM tz_data')
75+
r = yield cursor.fetchmany(2)
76+
self.assertEqual(len(r), 2,
77+
'fetchmany failed. Number of rows does not match')
6978

7079
# So MySQLdb won't throw "Commands out of sync"
7180
while True:
72-
res = cursor.fetchone()
81+
res = yield cursor.fetchone()
7382
if res is None:
7483
break
7584

7685
# Test update, affected_rows()
77-
cursor.execute('UPDATE tz_data SET zone = %s', ['Foo'])
78-
conn.commit()
79-
self.assertEqual(cursor.rowcount, len(data),
80-
'Update failed. affected_rows != %s' % (str(len(data))))
86+
yield cursor.execute('UPDATE tz_data SET zone = %s', ['Foo'])
87+
yield conn.commit()
88+
self.assertEqual(cursor.rowcount, len(self.data),
89+
'Update failed. affected_rows != %s' % (str(len(self.data))))
8190

8291
# Test executemany
83-
cursor.executemany('INSERT INTO tz_data VALUES (%s, %s, %s)', data)
84-
self.assertEqual(cursor.rowcount, len(data),
85-
'executemany failed. cursor.rowcount != %s' % (str(len(data))))
92+
yield cursor.executemany('INSERT INTO tz_data VALUES (%s, %s, %s)', self.data)
93+
self.assertEqual(cursor.rowcount, len(self.data),
94+
'executemany failed. cursor.rowcount != %s' % (str(len(self.data))))
8695

8796
finally:
88-
cursor.execute('DROP TABLE tz_data')
89-
cursor.close()
97+
yield cursor.execute('DROP TABLE tz_data')
98+
yield cursor.close()
99+
100+
@gen.coroutine
101+
def _prepare(self):
102+
conn = self.connections[0]
103+
cursor = conn.cursor()
104+
yield cursor.execute('DROP TABLE IF EXISTS tz_data;')
105+
yield cursor.execute('CREATE TABLE tz_data ('
106+
'region VARCHAR(64),'
107+
'zone VARCHAR(64),'
108+
'name VARCHAR(64))')
109+
110+
yield cursor.executemany(
111+
'INSERT INTO tz_data VALUES (%s, %s, %s)', self.data)
112+
yield conn.commit()
113+
yield cursor.close()
114+
115+
@gen.coroutine
116+
def _cleanup(self):
117+
conn = self.connections[0]
118+
cursor = conn.cursor()
119+
yield cursor.execute('DROP TABLE IF EXISTS tz_data;')
120+
121+
@gen_test
122+
def test_sscursor_executemany(self):
123+
conn = self.connections[0]
124+
yield self._prepare()
125+
cursor = conn.cursor(tornado_mysql.cursors.SSCursor)
126+
# Test executemany
127+
yield cursor.executemany(
128+
'INSERT INTO tz_data VALUES (%s, %s, %s)', self.data)
129+
msg = 'executemany failed. cursor.rowcount != %s'
130+
self.assertEqual(cursor.rowcount, len(self.data),
131+
msg % (str(len(self.data))))
132+
yield self._cleanup()
133+
134+
@gen_test
135+
def test_sscursor_scroll_relative(self):
136+
conn = self.connections[0]
137+
yield self._prepare()
138+
cursor = conn.cursor(tornado_mysql.cursors.SSCursor)
139+
yield cursor.execute('SELECT * FROM tz_data;')
140+
yield cursor.scroll(1)
141+
ret = yield cursor.fetchone()
142+
self.assertEqual(('America', '', 'America/Los_Angeles'), ret)
143+
yield self._cleanup()
144+
145+
@gen_test
146+
def test_sscursor_scroll_absolute(self):
147+
conn = self.connections[0]
148+
yield self._prepare()
149+
cursor = conn.cursor(tornado_mysql.cursors.SSCursor)
150+
yield cursor.execute('SELECT * FROM tz_data;')
151+
yield cursor.scroll(2, mode='absolute')
152+
ret = yield cursor.fetchone()
153+
self.assertEqual(('America', '', 'America/Lima'), ret)
154+
yield self._cleanup()
155+
156+
@gen_test
157+
def test_sscursor_scroll_errors(self):
158+
yield self._prepare()
159+
conn = self.connections[0]
160+
cursor = conn.cursor(tornado_mysql.cursors.SSCursor)
161+
162+
yield cursor.execute('SELECT * FROM tz_data;')
163+
164+
with self.assertRaises(NotSupportedError):
165+
yield cursor.scroll(-2, mode='relative')
166+
167+
yield cursor.scroll(2, mode='absolute')
168+
169+
with self.assertRaises(NotSupportedError):
170+
yield cursor.scroll(1, mode='absolute')
171+
with self.assertRaises(ProgrammingError):
172+
yield cursor.scroll(3, mode='not_valid_mode')
173+
yield self._cleanup()
174+
90175

91176
__all__ = ["TestSSCursor"]
92177

178+
93179
if __name__ == "__main__":
94180
import unittest
95181
unittest.main()

‎tornado_mysql/tests/test_nextset.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def test_multi_cursor(self):
6363
self.assertTrue(res)
6464

6565
self.assertEqual([(2,)], list(cur1))
66-
res = yield cur.nextset()
66+
res = yield cur1.nextset()
6767
self.assertIsNone(res)
6868

6969
#TODO: How about SSCursor and nextset?

0 commit comments

Comments
 (0)