Commite0b373d

authored

feat: DB API cursors are now iterable (#618)

* feat: make DB API Cursors iterable* Raise error if obtaining iterator of closed Cursor

1 parentf75dcdf commite0b373dCopy full SHA for e0b373d

File tree

+29

-1

lines changed

+29

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ def decorate_public_methods(klass):`
`276`	`276`	"""Apply ``_raise_on_closed()`` decorator to public instance methods.
`277`	`277`	`"""`
`278`	`278`	`fornameindir(klass):`
`279`		`-ifname.startswith("_"):`
	`279`	`+ifname.startswith("_")andname!="__iter__":`
`280`	`280`	`continue`
`281`	`281`
`282`	`282`	`member=getattr(klass,name)`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,10 @@ def setinputsizes(self, sizes):`
`365`	`365`	`defsetoutputsize(self,size,column=None):`
`366`	`366`	`"""No-op, but for consistency raise an error if cursor is closed."""`
`367`	`367`
	`368`	`+def__iter__(self):`
	`369`	`+self._try_fetch()`
	`370`	`+returniter(self._query_data)`
	`371`	`+`
`368`	`372`
`369`	`373`	`def_format_operation_list(operation,parameters):`
`370`	`374`	`"""Formats parameters in operation in the way BigQuery expects.`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ def test_raises_error_if_closed(self):`
`178`	`178`	`"fetchone",`
`179`	`179`	`"setinputsizes",`
`180`	`180`	`"setoutputsize",`
	`181`	`+"__iter__",`
`181`	`182`	`)`
`182`	`183`
`183`	`184`	`formethodinmethod_names:`
`@@ -611,6 +612,29 @@ def test_executemany_w_dml(self):`
`611`	`612`	`self.assertIsNone(cursor.description)`
`612`	`613`	`self.assertEqual(cursor.rowcount,12)`
`613`	`614`
	`615`	`+deftest_is_iterable(self):`
	`616`	`+fromgoogle.cloud.bigqueryimportdbapi`
	`617`	`+`
	`618`	`+connection=dbapi.connect(`
	`619`	`+self._mock_client(rows=[("hello","there",7), ("good","bye",-3)])`
	`620`	`+ )`
	`621`	`+cursor=connection.cursor()`
	`622`	`+cursor.execute("SELECT foo, bar, baz FROM hello_world WHERE baz < 42;")`
	`623`	`+`
	`624`	`+rows_iter=iter(cursor)`
	`625`	`+`
	`626`	`+row=next(rows_iter)`
	`627`	`+self.assertEqual(row, ("hello","there",7))`
	`628`	`+row=next(rows_iter)`
	`629`	`+self.assertEqual(row, ("good","bye",-3))`
	`630`	`+self.assertRaises(StopIteration,next,rows_iter)`
	`631`	`+`
	`632`	`+self.assertEqual(`
	`633`	`+list(cursor),`
	`634`	`+ [],`
	`635`	`+"Iterating again over the same results should produce no rows.",`
	`636`	`+ )`
	`637`	`+`
`614`	`638`	`deftest__format_operation_w_dict(self):`
`615`	`639`	`fromgoogle.cloud.bigquery.dbapiimportcursor`
`616`	`640`

Comments

(0)