fix #691

Author: dimitri-yatsenko

datajoint/connection.py

@@ -47,6 +47,10 @@ def translate_query_error(client_error, query):
         return errors.MissingTableError(client_error.args[1], query)
     if isinstance(client_error, client.err.InternalError) and client_error.args[0] == 1364:
         return errors.MissingAttributeError(*client_error.args[1:])
+    if isinstance(client_error, client.err.InternalError) and client_error.args[0] == 1054:
+        return errors.UnknownAttributeError(*client_error.args[1:])
+    # all the other errors are re-raised in original form
+    return client_error
 
 
 logger = logging.getLogger(__name__)

datajoint/errors.py

@@ -6,7 +6,7 @@
 
 
 # --- Top Level ---
-class DataJointError(Exception):
+class DataJointError(BaseException):
     """
     Base class for errors specific to DataJoint internal operation.
     """
@@ -45,12 +45,6 @@ class AccessError(QueryError):
     """
 
 
-class UnknownAttributeError(DataJointError):
-    """
-    Error caused by referencing to a non-existing attributes
-    """
-
-
 class MissingTableError(DataJointError):
     """
     Query on a table that has not been declared
@@ -69,6 +63,12 @@ class IntegrityError(QueryError):
     """
 
 
+class UnknownAttributeError(QueryError):
+    """
+    User requests an attribute name not found in query heading
+    """
+
+
 class MissingAttributeError(QueryError):
     """
     An error arising when a required attribute value is not provided in INSERT

datajoint/table.py

@@ -188,7 +188,7 @@ def insert(self, rows, replace=False, skip_duplicates=False, ignore_extra_fields
         :param replace: If True, replaces the existing tuple.
         :param skip_duplicates: If True, silently skip duplicate inserts.
         :param ignore_extra_fields: If False, fields that are not in the heading raise error.
-        :param allow_direct_insert: applies only in auto-populated tables. Set True to insert outside populate calls.
+        :param allow_direct_insert: applies only in auto-populated tables. If False (default), insert are allowed only from inside the make callback.
 
         Example::
         >>> relation.insert([
@@ -200,10 +200,10 @@ def insert(self, rows, replace=False, skip_duplicates=False, ignore_extra_fields
             rows = rows.to_records()
 
         # prohibit direct inserts into auto-populated tables
-        if not (allow_direct_insert or getattr(self, '_allow_insert', True)):  # _allow_insert is only present in AutoPopulate
+        if not allow_direct_insert and not getattr(self, '_allow_insert', True):  # allow_insert is only used in AutoPopulate
             raise DataJointError(
-                'Auto-populate tables can only be inserted into from their make methods during populate calls.'
-                ' To override, use the the allow_direct_insert argument.')
+                'Inserts into an auto-populated table can only done inside its make method during a populate call.'
+                ' To override, set keyword argument allow_direct_insert=True.')
 
         heading = self.heading
         if inspect.isclass(rows) and issubclass(rows, QueryExpression):   # instantiate if a class

tests/test_fetch.py

@@ -145,6 +145,10 @@ def test_fetch1_step1(self):
             assert_true(k == c == (self.lang & key).fetch1(ke),
                         'Values are not the same')
 
+    @raises(dj.DataJointError)
+    def test_misspelled_attribute(self):
+        f = (schema.Language & 'lang = "ENGLISH"').fetch()
+
     def test_repr(self):
         """Test string representation of fetch, returning table preview"""
         repr = self.subject.fetch.__repr__()