Merge branch 'dev' of https://github.com/datajoint/datajoint-python into blob-migrate

Author: dimitri-yatsenko

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Release notes
 
-### 0.12.0 -- April 15, 2019
+### 0.12.0 -- August 15, 2019 (planned)
 
 * Configurable blob storage (#497, #532, #475)
 * Support file attachments: (#480, #532, #475)
@@ -12,6 +12,7 @@
 * `query_expr.fetch("KEY", as_dict=False)` returns results as `np.recarray`(#414, #574)
 * `dj.ERD` is now called `dj.Diagram` (#255, #565)
 * `dj.Diagram` underlines "distinguished" classes (#378, #557)
+* Bugfixes: #629, #633
 
 ### 0.11.1 -- Nov 15, 2018
 * Fix ordering of attributes in proj (#483 and #516)

datajoint/declare.py

@@ -393,7 +393,7 @@ def compile_attribute(line, in_key, foreign_key_sql):
         match = attribute_parser.parseString(line + '#', parseAll=True)
     except pp.ParseException as err:
         raise DataJointError('Declaration error in position {pos} in line:\n  {line}\n{msg}'.format(
-            line=err.args[0], pos=err.args[1], msg=err.args[2]))
+            line=err.args[0], pos=err.args[1], msg=err.args[2])) from None
     match['comment'] = match['comment'].rstrip('#')
     if 'default' not in match:
         match['default'] = ''
@@ -414,6 +414,9 @@ def compile_attribute(line, in_key, foreign_key_sql):
     match['comment'] = match['comment'].replace('"', '\\"')   # escape double quotes in comment
     category, type_match = match_type(match['type'])
 
+    if match['comment'].startswith(':'):
+        raise DataJointError('An attribute comment must not start with a colon in comment "{comment}"'.format(**match))
+
     if category in CUSTOM_TYPES:
         match['comment'] = ':{type}:{comment}'.format(**match)  # insert custom type into comment
         if category == 'UUID':

datajoint/heading.py

@@ -219,7 +219,7 @@ def init_from_database(self, conn, database, table_name):
             attr.pop('Extra')
 
             # process custom DataJoint types
-            custom_type = re.match(r':(?P<type>.+):(?P<comment>.*)', attr['comment'])
+            custom_type = re.match(r':(?P<type>[^:]+):(?P<comment>.*)', attr['comment'])
             if custom_type:
                 attr.update(custom_type.groupdict(), unsupported=False)
                 try:

datajoint/version.py

@@ -1 +1 @@
-__version__ = "0.12.dev4"
+__version__ = "0.12.dev5"

tests/schema_external.py

@@ -95,7 +95,7 @@ class Attach(dj.Manual):
     # table for storing attachments
     attach : int
     ----
-    img : attach@share    #  attachments are stored as specified by dj.config['stores']['raw']
+    img : attach@share    #  attachments are stored as specified by: dj.config['stores']['raw']
     txt : attach      #  attachments are stored directly in the database
     """
 
@@ -104,7 +104,7 @@ class Attach(dj.Manual):
 class Filepath(dj.Manual):
     definition = """
     # table for file management 
-    fnum : int 
+    fnum : int # test comment containing :
     ---
     img : filepath@repo  # managed files 
     """