Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion +dj/+internal/TableAccessor.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
tierClass = dj.Schema.tierClasses{2}; % default to Manual table
for k=1:numel(dj.Schema.tierPrefixes)
tierCharLen = length(dj.Schema.tierPrefixes{k});
if tierCharLen > 0 && ~isempty(regexp(dj.Schema.tierPrefixes{k}, tableName(1:tierCharLen), 'ONCE'))
if tierCharLen > 0 && ~isempty(regexp(dj.Schema.tierPrefixes{k}, ...
tableName(1:tierCharLen), 'ONCE'))
tierClass = dj.Schema.tierClasses{k};
break;
end
Expand Down
5 changes: 5 additions & 0 deletions +dj/+internal/UserRelation.m
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
classdef UserRelation < dj.Relvar & dj.internal.Master
methods
function self = UserRelation(varargin)
self@dj.Relvar(varargin{:})
end
end
end
5 changes: 5 additions & 0 deletions +dj/Computed.m
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
classdef Computed < dj.internal.AutoPopulate
% defines a computed table
methods
function self = Computed(varargin)
self@dj.internal.AutoPopulate(varargin{:})
end
end
end
5 changes: 5 additions & 0 deletions +dj/Imported.m
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
classdef Imported < dj.internal.AutoPopulate
% defines an imported table
methods
function self = Imported(varargin)
self@dj.internal.AutoPopulate(varargin{:})
end
end
end
5 changes: 5 additions & 0 deletions +dj/Jobs.m
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
classdef Jobs < dj.Relvar
methods
function self = Jobs(varargin)
self@dj.Relvar(varargin{:})
end
end
end
3 changes: 2 additions & 1 deletion +dj/Lookup.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
% defines a lookup table

methods
function self = Lookup()
function self = Lookup(varargin)
self@dj.internal.UserRelation(varargin{:})
if isprop(self, 'contents')
if length(self.contents) > count(self)
self.inserti(self.contents)
Expand Down
5 changes: 5 additions & 0 deletions +dj/Manual.m
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
classdef Manual < dj.internal.UserRelation
% Defines a manual table
methods
function self = Manual(varargin)
self@dj.internal.UserRelation(varargin{:})
end
end
end
2 changes: 1 addition & 1 deletion tests/TestSchema.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function TestSchema_testUnsupportedDJTypes(testCase)
' X''1d751e2e1e74faf84ab485fde8ef72ca''),' ...
'(X''1d751e2e1e74faf84ab485fde8ef72bf'', 2, ''attach_name'', ''filepath'',' ...
'X''1d751e2e1e74faf84ab485fde8ef72cb'')']);
c1.query(['insert into `' testCase.PREFIX '_' lower(package) '`.`document` ' ...
c1.query(['insert into `' testCase.PREFIX '_' lower(package) '`.`#document` ' ...
'values (' num2str(id) ', ''raphael'', ''hello'',' ...
'X''1d751e2e1e74faf84ab485fde8ef72be'',' ...
'X''1d751e2e1e74faf84ab485fde8ef72bf'')']);
Expand Down
2 changes: 1 addition & 1 deletion tests/test_schemas/+External/Document.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
document_data2 : attach@main
document_data3 : filepath@main
%}
classdef Document < dj.Manual
classdef Document < dj.Lookup
end