Merge pull request #703 from dimitri-yatsenko/master

fix #700

Author: guzman-raphael

datajoint/connection.py

@@ -39,10 +39,10 @@ def translate_query_error(client_error, query):
         return errors.DuplicateError(*client_error.args[1:])
     if isinstance(client_error, client.err.IntegrityError) and client_error.args[0] == 1452:
         return errors.IntegrityError(*client_error.args[1:])
-    # Syntax Errors
+    # Syntax errors
     if isinstance(client_error, client.err.ProgrammingError) and client_error.args[0] == 1064:
         return errors.QuerySyntaxError(client_error.args[1], query)
-    # Existence Errors
+    # Existence errors
     if isinstance(client_error, client.err.ProgrammingError) and client_error.args[0] == 1146:
         return errors.MissingTableError(client_error.args[1], query)
     if isinstance(client_error, client.err.InternalError) and client_error.args[0] == 1364:
@@ -286,4 +286,3 @@ def transaction(self):
             raise
         else:
             self.commit_transaction()
-            

datajoint/jobs.py

@@ -2,7 +2,8 @@
 import os
 import platform
 from .table import Table
-from .errors import DuplicateError, IntegrityError
+from .settings import config
+from .errors import DuplicateError
 
 ERROR_MESSAGE_LENGTH = 2047
 TRUNCATION_APPENDIX = '...truncated'
@@ -76,7 +77,8 @@ def reserve(self, table_name, key):
             key=key,
             user=self._user)
         try:
-            self.insert1(job, ignore_extra_fields=True)
+            with config(enable_python_native_blobs=True):
+                self.insert1(job, ignore_extra_fields=True)
         except DuplicateError:
             return False
         return True
@@ -101,15 +103,17 @@ def error(self, table_name, key, error_message, error_stack=None):
         """
         if len(error_message) > ERROR_MESSAGE_LENGTH:
             error_message = error_message[:ERROR_MESSAGE_LENGTH-len(TRUNCATION_APPENDIX)] + TRUNCATION_APPENDIX
-        job_key = dict(table_name=table_name, key_hash=key_hash(key))
-        self.insert1(
-            dict(job_key,
-                 status="error",
-                 host=platform.node(),
-                 pid=os.getpid(),
-                 connection_id=self.connection.connection_id,
-                 user=self._user,
-                 key=key,
-                 error_message=error_message,
-                 error_stack=error_stack),
-            replace=True, ignore_extra_fields=True)
+        with config(enable_python_native_blobs=True):
+            self.insert1(
+                dict(
+                    table_name=table_name,
+                    key_hash=key_hash(key),
+                    status="error",
+                    host=platform.node(),
+                    pid=os.getpid(),
+                    connection_id=self.connection.connection_id,
+                    user=self._user,
+                    key=key,
+                    error_message=error_message,
+                    error_stack=error_stack),
+                replace=True, ignore_extra_fields=True)

datajoint/table.py

@@ -19,7 +19,7 @@
 logger = logging.getLogger(__name__)
 
 
-class _rename_map(tuple):
+class _RenameMap(tuple):
     """ for internal use """
     pass
 
@@ -375,7 +375,7 @@ def delete(self, verbose=True):
         graph = conn.dependencies
         graph.load()
         delete_list = collections.OrderedDict(
-            (name, _rename_map(next(iter(graph.parents(name).items()))) if name.isdigit() else FreeTable(conn, name))
+            (name, _RenameMap(next(iter(graph.parents(name).items()))) if name.isdigit() else FreeTable(conn, name))
             for name in graph.descendants(self.full_table_name))
 
         # construct restrictions for each relation
@@ -405,7 +405,7 @@ def delete(self, verbose=True):
                 table.restrict([
                     r.proj() if isinstance(r, FreeTable) else (
                         delete_list[r[0]].proj(**{a: b for a, b in r[1]['attr_map'].items()})
-                        if isinstance(r, _rename_map) else r)
+                        if isinstance(r, _RenameMap) else r)
                     for r in restrictions[name]])
         if safe:
             print('About to delete:')

tests/schema.py

@@ -5,7 +5,7 @@
 import random
 import numpy as np
 import datajoint as dj
-import os, signal
+import inspect
 from . import PREFIX, CONN_INFO
 
 schema = dj.schema(PREFIX + '_test1', connection=dj.conn(**CONN_INFO))
@@ -277,6 +277,29 @@ def make(self, key):
         raise SystemExit('SIGTERM received')
 
 
+@schema
+class DjExceptionName(dj.Lookup):
+    definition = """
+    dj_exception_name:    char(64)
+    """
+
+    @property
+    def contents(self):
+        return [[member_name] for member_name, member_type in inspect.getmembers(dj.errors)
+                if inspect.isclass(member_type) and issubclass(member_type, Exception)]
+
+
+@schema
+class ErrorClass(dj.Computed):
+    definition = """
+    -> DjExceptionName
+    """
+
+    def make(self, key):
+        exception_name = key['dj_exception_name']
+        raise getattr(dj.errors, exception_name)
+
+
 @schema
 class DecimalPrimaryKey(dj.Lookup):
     definition = """

tests/test_alter.py

@@ -39,4 +39,5 @@ def test_alter():
     Experiment().alter(prompt=False)
     restored = schema.connection.query("SHOW CREATE TABLE " + Experiment.full_table_name).fetchone()[1]
     assert_equal(original, restored)
-    assert_not_equal(original, altered)
+    assert_not_equal(original, altered)
+

tests/test_jobs.py

@@ -1,4 +1,3 @@
-from decimal import Decimal
 from nose.tools import assert_true, assert_false, assert_equals
 from . import schema
 from datajoint.jobs import ERROR_MESSAGE_LENGTH, TRUNCATION_APPENDIX
@@ -46,6 +45,7 @@ def test_reserve_job():
     assert_false(schema.schema.jobs,
                  'failed to clear error jobs')
 
+
 def test_restrictions():
     # clear out jobs table
     jobs = schema.schema.jobs
@@ -62,6 +62,7 @@ def test_restrictions():
                 'There should be only one entries with error status in table a')
     jobs.delete()
 
+
 def test_sigint():
     # clear out job table
     schema.schema.jobs.delete()
@@ -75,6 +76,7 @@ def test_sigint():
     assert_equals(error_message, 'KeyboardInterrupt')
     schema.schema.jobs.delete()
 
+
 def test_sigterm():
     # clear out job table
     schema.schema.jobs.delete()
@@ -88,6 +90,17 @@ def test_sigterm():
     assert_equals(error_message, 'SystemExit: SIGTERM received')
     schema.schema.jobs.delete()
 
+
+def test_suppress_dj_errors():
+    """ test_suppress_dj_errors: dj errors suppressable w/o native py blobs """
+    schema.schema.jobs.delete()
+    with dj.config(enable_python_native_blobs=False):
+        schema.ErrorClass.populate(reserve_jobs=True, suppress_errors=True)
+    number_of_exceptions = len(schema.DjExceptionName())
+    assert_true(number_of_exceptions > 0)
+    assert_equals(number_of_exceptions, len(schema.schema.jobs))
+
+
 def test_long_error_message():
     # clear out jobs table
     schema.schema.jobs.delete()