lib/influxer/metrics/relation/time_query.rb in influxer-1.1.6 vs lib/influxer/metrics/relation/time_query.rb in influxer-1.2.0

- old
+ new

@@ -1,19 +1,19 @@ # frozen_string_literal: true module Influxer module TimeQuery #:nodoc: TIME_ALIASES = { - hour: '1h', - minute: '1m', - second: '1s', - ms: '1ms', - u: '1u', - week: '1w', - day: '1d', - month: '30d', - year: '365d' + hour: "1h", + minute: "1m", + second: "1s", + ms: "1ms", + u: "1u", + week: "1w", + day: "1d", + month: "30d", + year: "365d" }.freeze FILL_RESERVED = %i[null previous none].freeze # Add group value to relation. To be used instead of `group("time(...)"). @@ -26,14 +26,14 @@ # # Metrics.time("4d", fill: 0) # # select * from metrics group by time(4d) fill(0) def time(val, options = {}) @values[:time] = if val.is_a?(Symbol) - TIME_ALIASES[val] || '1' + val.to_s - else - val - end + TIME_ALIASES[val] || "1" + val.to_s + else + val + end build_fill(options[:fill]) self end @@ -49,11 +49,11 @@ # Metrics.past(2.days) # # select * from metrics where time > now() - 172800s def past(val) case val when Symbol - where("time > now() - #{TIME_ALIASES[val] || ('1' + val.to_s)}") + where("time > now() - #{TIME_ALIASES[val] || ("1" + val.to_s)}") when String where("time > now() - #{val}") else where("time > now() - #{val.to_i}s") end @@ -74,9 +74,10 @@ private def build_fill(val) return if val.nil? + fill(FILL_RESERVED.include?(val) ? val.to_s : val.to_i) end end end