Merge branch 'future'

Author: dimitri-yatsenko

+dj/GeneralRelvar.m

@@ -326,10 +326,8 @@ function restrict(self, varargin)
             for arg = varargin
                 if iscell(arg{1})
                     self.restrict(arg{1}{:})
-                end
-                % unless duplicate, append restriction
-                if ~any(cellfun(@(x) isequal(arg{1},x), self.restrictions))
-                    self.restrictions = [self.restrictions arg{1}];
+                else
+                    self.restrictions = [self.restrictions arg(1)];
                 end
             end
         end
@@ -346,11 +344,8 @@ function restrict(self, varargin)
             %   tp.Scans & struct('mouse_id',3, 'scannum', 4);
             %   tp.Scans & 'lens=10'
             %   tp.Mice & (tp.Scans & 'lens=10')
-            if ~iscell(arg)
-                arg = {arg};
-            end
             ret = self.copy;
-            ret.restrictions = [ret.restrictions arg];
+            ret.restrict(arg)
         end
 
         function ret = or(self, arg)
@@ -406,7 +401,7 @@ function restrict(self, varargin)
                     'Antijoin only accepts single restrictions'))
             end
             ret = self.copy;
-            ret.restrictions = [ret.restrictions {'not' arg}];
+            ret.restrict('not', arg)
         end
 
         function ret = pro(self, varargin)

+dj/Schema.m

@@ -493,11 +493,12 @@ function reload(self, force)
             % reload schema information into memory: table names and field named.
             fprintf('loading table definitions from %s... ', self.dbname)
             tic
-            self.tables = self.conn.query(sprintf([...
-                'SELECT table_name AS name, table_comment AS comment ' ...
-                'FROM information_schema.tables ' ...
-                'WHERE table_schema="%s" AND table_name REGEXP "{S}"'], ...
-                self.dbname),self.tableRegexp);
+            self.tables = self.conn.query(sprintf(...
+                'SHOW TABLE STATUS FROM `%s` WHERE name REGEXP "{S}"', ...
+                self.dbname),self.tableRegexp,'bigint_to_double');
+            self.tables.name = self.tables.Name;
+            self.tables.comment = self.tables.Comment;
+            self.tables = dj.struct.pro(self.tables,'name','comment');
 
             % determine table tier (see dj.Table)
             re = cellfun(@(x) sprintf('^%s%s[a-z][a-z0-9_]*$',self.prefix,x), ...