Merge 9e9eb21 into a7d890c

m-housh · May 24, 2018 · d013727 · d013727
2 parents a7d890c + 9e9eb21
commit d013727
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/asyncpg_simpleorm/async_model.py b/asyncpg_simpleorm/async_model.py
@@ -491,7 +491,7 @@ async def get_one(cls, record: bool=None, **kwargs) -> typing.Any:
                 # get the result from the database.
                 res = await conn.fetchrow(*stmt)
 
-                if record is False:
+                if res and record is False:
                     # return instances of the class, not records
                     return cls.from_record(res)
                 # return instances of the asyncpg record class

diff --git a/asyncpg_simpleorm/statements/__init__.py b/asyncpg_simpleorm/statements/__init__.py
@@ -187,7 +187,7 @@ def _parse_where_items(self,
             raise TypeError()
 
         # return the partial ``where`` string and args.
-        return ' AND'.join(strings), tuple(args)
+        return ' AND '.join(strings), tuple(args)
 
     def _parse_where(self, primary_keys=False):
         """Parses the ``model`` or ``kwargs`` set on an instance and builds