Merge pull request #448 from dimitri-yatsenko/master

Fix #438 - raise an error when calling populate on a restricted table

Author: eywalker

datajoint/autopopulate.py

@@ -69,6 +69,9 @@ def _jobs_to_do(self, restrictions):
         """
         :return: the relation containing the keys to be computed (derived from self.key_source)
         """
+        if self.restriction:
+            raise DataJointError('Cannot call populate on a restricted table. '
+                                 'Instead, pass conditions to populate() as arguments.')
         todo = self.key_source
         if not isinstance(todo, RelationalOperand):
             raise DataJointError('Invalid key_source value')

datajoint/user_relations.py

@@ -12,7 +12,7 @@
 
 # attributes that trigger instantiation of user classes
 supported_class_attrs = set((
-    'key_source', 'describe', 'populate', 'progress',
+    'key_source', 'describe', 'populate', 'progress', 'primary_key',
     'proj', 'aggr', 'heading', 'fetch', 'fetch1',
     'insert', 'insert1', 'drop', 'drop_quick',
     'delete', 'delete_quick'))