CRF #219, also added status().

Author: fantix

gino/dialects/asyncpg.py

@@ -115,11 +115,12 @@ async def _execute(self, params, one):
  if one:
  rv = await self._prepared.fetchrow(*params)
  if rv is None:
- return []
+ rv = []
  else:
- return [rv]
+ rv = [rv]
  else:
- return await self._prepared.fetch(*params)
+ rv = await self._prepared.fetch(*params)
+ return self._prepared.get_statusmsg(), rv
 
 
 class DBAPICursor(base.DBAPICursor):

gino/dialects/base.py

@@ -75,19 +75,20 @@ def iterate(self, *params, **kwargs):
  return _PreparedIterableCursor(self, params, kwargs)
 
  async def _do_execute(self, multiparams, params, one=False,
- return_model=True):
+ return_model=True, status=False):
  ctx = self.context.connection.execute(
  self.clause, *multiparams, **params).context
  if ctx.executemany:
  raise ValueError('PreparedStatement does not support multiple '
  'parameters.')
- assert ctx.statement == self.context.statement, 'Please report a bug'
+ assert ctx.statement == self.context.statement, (
+ 'Prepared statement generated different SQL with parameters')
  params = []
  for val in ctx.parameters[0]:
- if asyncio.iscoroutine(val):
- val = await val
  params.append(val)
- rows = await self._execute(params, one)
+ msg, rows = await self._execute(params, one)
+ if status:
+ return msg
  item = self.context.process_rows(rows, return_model=return_model)
  if one:
  if item:
@@ -110,6 +111,9 @@ async def scalar(self, *multiparams, **params):
  else:
  return None
 
+ async def status(self, *multiparams, **params):
+ return await self._do_execute(multiparams, params, status=True)
+
  def _get_iterator(self, *params, **kwargs):
  raise NotImplementedError
 

tests/test_prepared_stmt.py

@@ -28,6 +28,12 @@ async def test_compiled_and_bindparam(bind):
  with pytest.raises(ValueError, match='does not support multiple'):
  await get.all([dict(uid=1), dict(uid=2)])
 
+ delete = await conn.prepare(
+ User.delete.where(User.nickname == db.bindparam('name')))
+ for name in '12345':
+ msg = await delete.status(name=name)
+ assert msg == 'DELETE 1'
+
 
 async def test_statement(engine):
  async with engine.acquire() as conn: