Merge pull request #434 from JaerongA/master

Fix regexp

Author: dimitri-yatsenko

+dj/ERD.m

@@ -113,14 +113,14 @@ function draw(self)
             % draw the diagram
 
             % exclude auxiliary tables (job tables, etc.)
-            j = cellfun(@isempty, regexp(self.nodes, '^`[a-z]\w*`\.`~\w+`$'));
+            j = cellfun(@isempty, regexp(self.nodes, '^`[a-zA-z0-9_-]+`\.`~\w+`$'));
             self.nodes = self.nodes(j);
 
             self.makeGraph
 
-            rege = cellfun(@(s) sprintf('^`[a-z]\\w*`\\.`%s[a-z]\\w*`$',s), ...
+            rege = cellfun(@(s) sprintf('^`[a-zA-z0-9_-]+`\\.`%s[a-z]\\w*`$',s), ...
                            dj.Schema.tierPrefixes, 'uni', false);
-            rege{end+1} = '^`[a-z]\w*`\.`\W?\w+__\w+`$';   % for part tables
+            rege{end+1} = '^`[a-zA-z0-9_-]+`\.`\W?\w+__\w+`$';   % for part tables
             rege{end+1} = '^\d+$';  % for numbered nodes
             tiers = cellfun(@(l) find(~cellfun(@isempty, regexp(l, rege)), 1, 'last'), ...
                             self.graph.Nodes.Name);