diff --git a/VERSION b/VERSION
index 497bbb0c..fa9cee3a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.01.08.06.40
+Version 2.6.0-development+timestamp.2013.09.01.09.34.39
diff --git a/gluon/dal.py b/gluon/dal.py
index 1edd16b8..44ee1d61 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -690,7 +690,11 @@ class BaseAdapter(ConnectionPool):
         return isinstance(exception, self.driver.ProgrammingError)
 
     def id_query(self, table):
-        return table._id != None
+        pkeys = getattr(table,'_primarykey',None)
+        if pkeys:
+            return table[pkeys[0]] != None
+        else:
+            return table._id != None
 
     def adapt(self, obj):
         return "'%s'" % obj.replace("'", "''")