Merge pull request pytest-dev#28 from dgelvin/master

Fix for Proxy database support

Author: rudyryk

peewee_async.py

@@ -347,7 +347,9 @@ def _swap_database(self, query):
         If query database can't be swapped and differs from manager's
         database, it's **WRONG AND DANGEROUS**, so assertion is raised.
         """
-        if query.database == self.database:
+        if query.database == self.database or \
+            (isinstance(query.database, peewee.Proxy) and
+             query.database.obj == self.database):
             return query
         elif self._subclassed(peewee.PostgresqlDatabase,
                               query.database,