From bbd1e6e100ae0dc314c3ee71cfca8ea47e524417 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Fri, 4 Sep 2020 13:32:07 -0500 Subject: [PATCH] Fix regex and be more explicit on default for class tier. --- +dj/+internal/Declare.m | 4 ++-- +dj/+internal/TableAccessor.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/+dj/+internal/Declare.m b/+dj/+internal/Declare.m index 34e3d4d2..66651b05 100644 --- a/+dj/+internal/Declare.m +++ b/+dj/+internal/Declare.m @@ -11,10 +11,10 @@ 'STRING', '^((var)?char|enum|date|(var)?year|time|timestamp)', ... 'INTERNAL_BLOB', '^(tiny|medium|long)?blob$', ... 'EXTERNAL_BLOB', '^blob@(?[a-z]\w*)$', ... - 'INTERNAL_ATTACH', 'attach$', ... + 'INTERNAL_ATTACH', '^attach$', ... 'EXTERNAL_ATTACH', '^attach@(?[a-z]\w*)$', ... 'FILEPATH', '^filepath@(?[a-z]\w*)$', ... - 'UUID', 'uuid$' ... + 'UUID', '^uuid$' ... ) SPECIAL_TYPES = {'UUID', 'INTERNAL_ATTACH', 'EXTERNAL_ATTACH', 'EXTERNAL_BLOB', ... 'FILEPATH', 'ADAPTED'} diff --git a/+dj/+internal/TableAccessor.m b/+dj/+internal/TableAccessor.m index 85eb1c3b..af8d69db 100644 --- a/+dj/+internal/TableAccessor.m +++ b/+dj/+internal/TableAccessor.m @@ -27,7 +27,7 @@ name = splitName{2}; addprop(self, name); tableName = schema.tableNames(className{1}); - tierClass = dj.Schema.tierClasses{2}; % default to Manual table + tierClass = 'dj.Manual'; for k=1:numel(dj.Schema.tierPrefixes) tierCharLen = length(dj.Schema.tierPrefixes{k}); if tierCharLen > 0 && ~isempty(regexp(dj.Schema.tierPrefixes{k}, ...