fixed issue #30. dj.AutoPopulate can now populate ancestor tables rec…

…ursively.

+dj/AutoPopulate.m

@@ -76,16 +76,29 @@
             %   [failedKeys, errs] = populate(tp.OriMaps);  % skip errors and return their list
             %
             % See also dj.AutoPopulate/parpopulate
+
+            if ~dj.set('populateAncestors')
+                rels = self;
+            else
+                % get all ancestors to be populated before self
+                assert(nargout==0, ...
+                    'parpopulate cannot return output when populateAncestors is true')
+                rels = cellfun(@feval, self.ancestors, 'uni', false);
+                rels = rels(cellfun(@(x) isa(x,'dj.AutoPopulate'), rels));
+            end
 
             self.schema.conn.cancelTransaction  % rollback any unfinished transaction
-            self.useReservations = false;
-            self.populateSanityChecks
-            self.executionEngine = @(key, fun, args) fun(args{:});
-            [varargout{1:nargout}] = self.populate_(varargin{:});
+
+            for i=1:length(rels)
+                rels{i}.useReservations = false;
+                rels{i}.populateSanityChecks
+                rels{i}.executionEngine = @(key, fun, args) fun(args{:});
+                [varargout{1:nargout}] = rels{i}.populate_(varargin{:});
+            end
         end
 
 
-        function varargout = parpopulate(self, varargin)
+        function parpopulate(self, varargin)
             % dj.AutoPopulate/parpopulate works identically to dj.AutoPopulate/populate
             % except that it uses a job reservation mechanism to enable multiple
             % processes to populate the same table in parallel without collision.
@@ -124,13 +137,25 @@
             %
             % See also dj.AutoPopulate/populate
 
+            if ~dj.set('populateAncestors')
+                rels = self;
+            else
+                % get all ancestors to be populated before self
+                rels = cellfun(@feval, self.ancestors, 'uni', false);
+                rels = rels(cellfun(@(x) isa(x,'dj.AutoPopulate'), rels));
+            end
+
             self.schema.conn.cancelTransaction  % rollback any unfinished transaction
-            self.useReservations = true;
-            self.populateSanityChecks
-            self.executionEngine = @(key, fun, args) fun(args{:});
-            [varargout{1:nargout}] = self.populate_(varargin{:});
+
+            for i=1:length(rels)
+                rels{i}.useReservations = true;
+                rels{i}.populateSanityChecks
+                rels{i}.executionEngine = @(key, fun, args) fun(args{:});
+                rels{i}.populate_(varargin{:});
+            end
         end
 
+
         function taskCore(self, key)
             % The work unit that is submitted to the cluster
             % or executed locally

+dj/Relvar.m

@@ -282,5 +282,16 @@ function update(self, attrname, value)
             self.schema.conn.query(queryStr, value{:})
         end
 
+
+        function export(self, declarationFile, dataFile, varargin)
+            [limit, args] = makeLimitClause(varargin{:});
+            self = self.pro(args{:});
+            [header, sql] = self.compile;
+            ret = self.conn.query(sprintf('SELECT %s FROM %s%s', ...
+                header.sql, sql, limit));
+            ret = dj.struct.fromFields(ret);
+
+        end
+
     end
 end

+dj/Table.m

@@ -146,7 +146,7 @@
             map = containers.Map('KeyType','char','ValueType','uint16');
             recurse(self,0)
             levels = map.values;
-            [~,order] = sort([levels{:}]);
+            [~,order] = sort([levels{:}],'descend');
             list = map.keys;
             list = list(order);
 

+dj/set.m

@@ -14,7 +14,8 @@
         'reconnectTimedoutTransaction', true, ...
         'populateCheck', true, ...
         'tableErdRadius', [2 1], ...
-        'verbose', false ...
+        'verbose', false, ...
+        'populateAncestors', false ...
         );
 end
 

+dj/version.m

@@ -1,7 +1,7 @@
 function varargout = version
 % report DataJoint version
 
-v = struct('major',2,'minor',7,'bugfix',3);
+v = struct('major',2,'minor',7,'bugfix',4);
 
 if nargout
     varargout{1}=v;