added tests for union and for external storage. Other minor fixes bas…

…ed PR commments.

datajoint/declare.py

@@ -194,9 +194,9 @@ def compile_attribute(line, in_key, foreign_key_sql):
             raise DataJointError('External attributes cannot be primary in:\n%s' % line)
         store_name = match['type'].split('-')
         if store_name[0] != 'external':
-            raise DataJointError('External store types must be in format external-<name>')
+            raise DataJointError('External store types must be specified as "external" or "external-<name>"')
         store_name = '-'.join(store_name[1:])
-        if not store_name.isidentifier():
+        if store_name != '' and not store_name.isidentifier():
             raise DataJointError(
                 'The external store name `{type}` is invalid. Make like a python identifier.'.format(**match))
         if len(store_name)>STORE_NAME_LENGTH:

datajoint/erd.py

@@ -35,6 +35,7 @@ def _get_tier(table_name):
         except StopIteration:
             return None
 
+
 if not erd_active:
     class ERD:
         """

datajoint/relational_operand.py

@@ -176,7 +176,7 @@ def make_condition(arg, _negate=False):
                 return arg, _negate
             elif isinstance(arg, AndList):
                 return '(' + ' AND '.join([make_condition(element)[0] for element in arg]) + ')', _negate
-            elif arg is True or arg is False:
+            elif isinstance(arg, bool):
                 return 'FALSE' if _negate == arg else 'TRUE', False
             # semijoin or antijoin
             elif isinstance(arg, RelationalOperand):
@@ -308,7 +308,7 @@ def __sub__(self, restriction):
         """
         return self & Not(restriction)
 
-    def restrict(self, arg):
+    def restrict(self, restriction):
         """
         In-place restriction.  Restricts the relation to a subset of its original tuples.
         rel.restrict(restriction)  is equivalent to  rel = rel & restriction  or  rel &= restriction
@@ -354,19 +354,18 @@ def restrict(self, arg):
 
         :param restriction: a sequence or an array (treated as OR list), another relation, an SQL condition string, or
             an AndList.
-        :param as_or: if True than the applied restriction becomes or-listed with already existing conditions
         """
-        assert not self.heading.expressions or isinstance(self, GroupBy), \
-            "Cannot restrict in place a projection with renamed attributes."
-        if not restricts_to_same(arg):
-            self.restrictions.append(arg)
-        elif restricts_to_empty(arg):
+        assert not self.heading.expressions or isinstance(self, GroupBy), "Cannot restrict in place" \
+                                                                          " a projection with renamed attributes."
+        if not restricts_to_same(restriction):
+            self.restrictions.append(restriction)
+        elif restricts_to_empty(restriction):
             self.restrictions.set(False)
         return self
 
     def allow(self, arg):
-        assert not self.heading.expressions or isinstance(self, GroupBy), \
-            "Cannot restrict in place a projection with renamed attributes."
+        assert not self.heading.expressions or isinstance(self, GroupBy), "Cannot restrict in place" \
+                                                                          " a projection with renamed attributes."
         if self.restrictions:
             if restricts_to_same(arg):
                 self.restrictions.clear()
@@ -637,8 +636,9 @@ def create(cls, arg1, arg2):
             raise DataJointError("Cannot operate on relations from different connections.")
         if set(arg1.heading.names) != set(arg2.heading.names):
             raise DataJointError('Union requires the same attributes in both arguments')
-        if not all(v.in_key for v in arg1.heading.attributes.values()):
-            raise DataJointError('The left argument of union must not have any secondary attributes')
+        if any(not v.in_key for v in arg1.heading.attributes.values()) or \
+                all(not v.in_key for v in arg2.heading.attributes.values()):
+            raise DataJointError('Union arguments must not have any secondary attributes.')
         obj._connection = arg1.connection
         obj._heading = arg1.heading
         obj._arg1 = arg1

tests/schema_advanced.py

@@ -58,27 +58,6 @@ def make_parent(pid, parent):
             (9, 11), (9, 12), (10, 13), (10, 14), (11, 14), (11, 15), (12, 14), (12, 15)))
 
 
-# @schema
-# class Type(dj.Lookup):
-#     definition = """
-#     type :  varchar(255)
-#     """
-#     contents = zip(('Type1', 'Type2', 'Type3'))
-#
-#
-# @schema
-# class TypeMaster(dj.Manual):
-#     definition= """
-#     master_id : int
-#     """
-#
-#     class Type(dj.Part):
-#         definition = """
-#         -> TypeMaster
-#         -> Type
-#         """
-
-
 @schema
 class Subject(dj.Manual):
     definition = """

tests/schema_external.py

@@ -65,8 +65,10 @@ class Image(dj.Computed):
     -> Dimension
     ----
     img  : external-raw    #  objects are stored as specified by dj.config['external-raw']
+    neg : external    # objects are stored as specified by dj.congif['external']
     """
 
     def make(self, key):
         np.random.seed(key['seed'])
-        self.insert1(dict(key, img=np.random.rand(*(Dimension() & key).fetch1('dimensions'))))
+        img = np.random.rand(*(Dimension() & key).fetch1('dimensions'))
+        self.insert1(dict(key, img=img, neg=-img.astype(np.float32)))

tests/test_declare.py

@@ -30,6 +30,32 @@ def test_describe():
         s2 = declare(rel.full_table_name, rel.describe(), context)
         assert_equal(s1, s2)
 
+    @staticmethod
+    def test_part():
+        # Lookup and part with the same name.  See issue #365
+        local_schema = dj.schema(schema.schema.database, locals())
+
+        @local_schema
+        class Type(dj.Lookup):
+            definition = """
+            type :  varchar(255)
+            """
+            contents = zip(('Type1', 'Type2', 'Type3'))
+
+        locals()   # this is to overcome the issue described in issue #368
+
+        @local_schema
+        class TypeMaster(dj.Manual):
+            definition = """
+            master_id : int
+            """
+
+            class Type(dj.Part):
+                definition = """
+                -> TypeMaster
+                -> Type
+                """
+
     @staticmethod
     def test_attributes():
         # test autoincrement declaration

tests/test_foreign_keys.py

@@ -1,6 +1,5 @@
 from nose.tools import assert_equal, assert_false, assert_true
 from datajoint.declare import declare
-from datajoint import AndList, OrList
 
 from . import schema_advanced
 

tests/test_relational_operand.py

@@ -2,9 +2,8 @@
 import string
 
 import numpy as np
-from nose.tools import assert_raises, assert_equal, \
-    assert_false, assert_true, assert_list_equal, \
-    assert_tuple_equal, assert_dict_equal, raises
+from nose.tools import assert_equal, assert_false, assert_true, raises, assert_set_equal
+
 import datajoint as dj
 from .schema_simple import A, B, D, E, L, DataA, DataB, TestUpdate, IJ, JI
 from .schema import Experiment
@@ -146,6 +145,14 @@ def test_project():
         assert_equal(len((D() & cond).proj()), len((D() & cond)),
                      'projection failed: altered its argument''s cardinality')
 
+    @staticmethod
+    def test_union():
+        x = set(zip(*IJ().fetch('i','j')))
+        y = set(zip(*JI().fetch('i','j')))
+        assert_true(len(x) > 0 and len(y) > 0 and len(IJ() * JI()) < len(x))  # ensure the IJ and JI are non-trivial
+        z = set(zip(*(IJ() + JI()).fetch('i','j')))   # union
+        assert_set_equal(x.union(y), z)
+
     @staticmethod
     def test_preview():
         with dj.config(display__limit=7):