minor fixes

datajoint · Aug 21, 2014 · 44cf5eb · 44cf5eb
1 parent a9f3f7b
commit 44cf5eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/datajoint/base.py b/datajoint/base.py
@@ -73,7 +73,7 @@ def _compile(self):
         Compiles SQL string and heading for the table to be
         used in relational algebra
         """
-        return self.fullTableName, self.heading
+        return self.fullTableName + self._whereClause, self.heading
 
 
     @property

diff --git a/datajoint/fetch.py b/datajoint/fetch.py
@@ -44,7 +44,7 @@ def __call__(self, *attrs, **renames):
 
     def _cursor(self, *attrs, **renames):
         sql, heading = self.rel.pro(*attrs, **renames)._compile()
-
+        sql = 'SELECT ' + heading.asSQL + ' FROM ' + sql 
         # add ORDER BY clause
         if self._orderBy:
             sql += ' ORDER BY ' + ', '.join(self._orderBy)

diff --git a/datajoint/relational.py b/datajoint/relational.py
@@ -74,9 +74,9 @@ def count(self):
         cur = self.conn.query(sql)
         return cur.fetchone()[0]
 
+    @property    
     def fetch(self):
         return Fetch(self)
-
 
     ########  iterator  ###############
     def __iter__(self):