Allow to specify the precision of time clauses in the query builder

Author: EnricSala

influxdb-client/QueryBuilder.m

@@ -107,67 +107,79 @@
         end
 
         % Specify before time constraint
-        function obj = before(obj, before)
+        function obj = before(obj, before, precision)
+            if nargin < 3 || isempty(precision)
+                precision = 'ms';
+            end
             if isempty(before)
                 obj.Before = [];
             elseif ischar(before)
                 obj.Before = ['time < ''' before ''''];
             elseif isdatetime(before)
-                str = TimeUtils.formatDatetime(before, 'ms', true);
+                str = TimeUtils.formatDatetime(before, precision, true);
                 obj.Before = ['time < ' str];
             elseif isfloat(before)
-                str = TimeUtils.formatDatenum(before, 'ms', true);
+                str = TimeUtils.formatDatenum(before, precision, true);
                 obj.Before = ['time < ' str];
             else
                 error('unsupported before type');
             end
         end
 
         % Specify before or equals time constraint
-        function obj = beforeEquals(obj, before)
+        function obj = beforeEquals(obj, before, precision)
+            if nargin < 3 || isempty(precision)
+                precision = 'ms';
+            end
             if isempty(before)
                 obj.Before = [];
             elseif ischar(before)
                 obj.Before = ['time <= ''' before ''''];
             elseif isdatetime(before)
-                str = TimeUtils.formatDatetime(before, 'ms', true);
+                str = TimeUtils.formatDatetime(before, precision, true);
                 obj.Before = ['time <= ' str];
             elseif isfloat(before)
-                str = TimeUtils.formatDatenum(before, 'ms', true);
+                str = TimeUtils.formatDatenum(before, precision, true);
                 obj.Before = ['time <= ' str];
             else
                 error('unsupported before type');
             end
         end
 
         % Specify after time constraint
-        function obj = after(obj, after)
+        function obj = after(obj, after, precision)
+            if nargin < 3 || isempty(precision)
+                precision = 'ms';
+            end
             if isempty(after)
                 obj.After = [];
             elseif ischar(after)
                 obj.After = ['time > ''' after ''''];
             elseif isdatetime(after)
-                str = TimeUtils.formatDatetime(after, 'ms', true);
+                str = TimeUtils.formatDatetime(after, precision, true);
                 obj.After = ['time > ' str];
             elseif isfloat(after)
-                str = TimeUtils.formatDatenum(after, 'ms', true);
+                str = TimeUtils.formatDatenum(after, precision, true);
                 obj.After = ['time > ' str];
             else
                 error('unsupported before type');
             end
         end
 
         % Specify after time constraint
-        function obj = afterEquals(obj, after)
+        function obj = afterEquals(obj, after, precision)
+            if nargin < 3 || isempty(precision)
+                precision = 'ms';
+            end
             if isempty(after)
                 obj.After = [];
             elseif ischar(after)
                 obj.After = ['time >= ''' after ''''];
             elseif isdatetime(after)
-                str = TimeUtils.formatDatetime(after, 'ms', true);
+                str = TimeUtils.formatDatetime(after, precision, true);
                 obj.After = ['time >= ' str];
             elseif isfloat(after)
-                str = TimeUtils.formatDatenum(after, 'ms', true);
+                str = TimeUtils.formatDatenum(after, precision, true);
                 obj.After = ['time >= ' str];
             else
                 error('unsupported before type');

tests/QueryBuilderTest.m

@@ -246,6 +246,34 @@ function before_and_after_are_combined_with_others(test)
                 ' AND temperature > 24.3'];
             test.verifyEqual(q.build(), exp);
         end
+        
+        function before_and_equals_support_different_precisions(test)
+            time = datetime(1529933525520 / 1000, 'ConvertFrom', 'posixtime');
+            precisions = struct( ...
+                'ns', '1529933525520000000ns', ...
+                'u', '1529933525520000u', ...
+                'ms', '1529933525520ms', ...
+                's', '1529933526s', ...
+                'm', '25498892m', ...
+                'h', '424982h');
+            names = fieldnames(precisions);
+            for i = 1:length(names)
+                name = names{i};
+                value = precisions.(name);
+                % Before
+                q = QueryBuilder('weather').before(time, name);
+                test.verifyTrue(endsWith(q.build(), ['time < ' value]));
+                % BeforeEquals
+                q = QueryBuilder('weather').beforeEquals(time, name);
+                test.verifyTrue(endsWith(q.build(), ['time <= ' value]));
+                % After
+                q = QueryBuilder('weather').after(time, name);
+                test.verifyTrue(endsWith(q.build(), ['time > ' value]));
+                % AfterEquals
+                q = QueryBuilder('weather').afterEquals(time, name);
+                test.verifyTrue(endsWith(q.build(), ['time >= ' value]));
+            end
+        end
     end
 
 end