add test for create_virtual_module and for issue #516

datajoint/__init__.py

@@ -76,7 +76,7 @@ class key:
 from .errors import DataJointError, DuplicateError
 
 
-def create_virtual_module(module_name, schema_name, create_schema=False, create_tables=False):
+def create_virtual_module(module_name, schema_name, create_schema=False, create_tables=False, connection=None):
     """
     Creates a python module with the given name from the name of a schema on the server and
     automatically adds classes to it corresponding to the tables in the schema.
@@ -88,7 +88,7 @@ def create_virtual_module(module_name, schema_name, create_schema=False, create_
     :return: the python module containing classes from the schema object and the table classes
     """
     module = ModuleType(module_name)
-    _schema = schema(schema_name, create_schema=create_schema, create_tables=create_tables)
+    _schema = schema(schema_name, create_schema=create_schema, create_tables=create_tables, connection=connection)
     _schema.spawn_missing_classes(context=module.__dict__)
     module.__dict__['schema'] = _schema
     return module

tests/schema.py

@@ -29,6 +29,7 @@ class Test2(dj.Manual):
     value   :   int     # value
     """
 
+
 @schema
 class Test3(dj.Manual):
     definition = """
@@ -37,6 +38,7 @@ class Test3(dj.Manual):
     value : varchar(300)
     """
 
+
 @schema
 class TestExtra(dj.Manual):
     """
@@ -47,7 +49,9 @@ class TestExtra(dj.Manual):
 
 @schema
 class TestNoExtra(dj.Manual):
-    ''' clone of Test but with no extra fields '''
+    """
+    clone of Test but with no extra fields
+    """
     definition = Test.definition
 
 
@@ -142,7 +146,7 @@ def make(self, key):
 @schema
 class Trial(dj.Imported):
     definition = """   # a trial within an experiment
-    -> Experiment.proj(exp='experiment_id')
+    -> Experiment.proj(animal='subject_id')
     trial_id  :smallint   # trial number
     ---
     start_time                 :double      # (s)

tests/schema_simple.py

@@ -154,8 +154,7 @@ class TestUpdate(dj.Lookup):
 
     contents = [
         (0, 'my_string', 0.0, np.random.randn(10, 2)),
-        (1, 'my_other_string', 1.0, np.random.randn(20, 1)),
-    ]
+        (1, 'my_other_string', 1.0, np.random.randn(20, 1))]
 
 
 @schema

tests/test_declare.py

@@ -84,20 +84,20 @@ def test_attributes():
         assert_list_equal(experiment.primary_key,
                           ['subject_id', 'experiment_id'])
 
-        assert_list_equal(trial.heading.names,
-                          ['subject_id', 'exp', 'trial_id', 'start_time'])
+        assert_list_equal(trial.heading.names,   # tests issue #516
+                          ['animal', 'experiment_id', 'trial_id', 'start_time'])
         assert_list_equal(trial.primary_key,
-                          ['subject_id', 'exp', 'trial_id'])
+                          ['animal', 'experiment_id', 'trial_id'])
 
         assert_list_equal(ephys.heading.names,
-                          ['subject_id', 'exp', 'trial_id', 'sampling_frequency', 'duration'])
+                          ['animal', 'experiment_id', 'trial_id', 'sampling_frequency', 'duration'])
         assert_list_equal(ephys.primary_key,
-                          ['subject_id', 'exp', 'trial_id'])
+                          ['animal', 'experiment_id', 'trial_id'])
 
         assert_list_equal(channel.heading.names,
-                          ['subject_id', 'exp', 'trial_id', 'channel', 'voltage', 'current'])
+                          ['animal', 'experiment_id', 'trial_id', 'channel', 'voltage', 'current'])
         assert_list_equal(channel.primary_key,
-                          ['subject_id', 'exp', 'trial_id', 'channel'])
+                          ['animal', 'experiment_id', 'trial_id', 'channel'])
         assert_true(channel.heading.attributes['voltage'].is_blob)
 
     @staticmethod

tests/test_virtual_module.py

@@ -0,0 +1,10 @@
+from nose.tools import assert_true
+import datajoint as dj
+from datajoint.user_tables import UserTable
+from . import schema
+from . import CONN_INFO
+
+
+def test_virtual_module():
+    module = dj.create_virtual_module('module', schema.schema.database, connection=dj.conn(**CONN_INFO))
+    assert_true(issubclass(module.Experiment, UserTable))