groupdate 6.6.0 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81c8d8bce77a4b40a6e612c9dac7017561e3083cbe3f232ca7326d4cbc45941
-  data.tar.gz: 993879fa7e1fd657e3362dd2e8edcda080c5c808cb5265ae9e14f46d5704a870
+  metadata.gz: 07ae05090ff5047136472fd30bc78ff078350c4fab330f73d84c36316dbbfbcf
+  data.tar.gz: 824c766fa826aeb15bcd0e21ed85b264a6d2f1a45c9e3f06d408b0df3c773e64
 SHA512:
-  metadata.gz: 867a01e2efd77e36617edcc345a1503194a32518115afcd6f952f0eecf1fb03a26c1e4abbbb8acf82255db650408403c4c6744008e17d0c6355375a37b4cc10f
-  data.tar.gz: d28f72bb69616b0389107d902758b41e1268c5785edb442406f9b213e8a1790185f3b61e91c7496edd992a6599b7bfd967721d861be79d78d3e28c3753b15cac
+  metadata.gz: 5716c00f5cfd9ef21a4500b8936cdc42cbe476ea1acaf8cf72df82ea69d9595284300cdeb4aac43af434dfe3ab192b021fc247910b6f294bb4dcc6cd72807fb1
+  data.tar.gz: 845d022ae8bba825fa3f6ee6ba91cb5939a60c5a2933a942a2aa8b0802cb4de7507226570dc648c597b5d8e7dc46211e8d57ea93c32d5fa63247a2a7262f6712

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.7.0 (2025-06-02)
+
+- Added time zone support for SQLite
+- Added `day_start` support for SQLite
+- Added `group_by_quarter` support for SQLite
+
 ## 6.6.0 (2025-05-04)
 
 - Dropped support for Ruby < 3.2 and Active Record < 7.1

data/README.md

@@ -11,7 +11,7 @@ The simplest way to group by:
 
 :cake: Get the entire series - **the other best part**
 
-Supports PostgreSQL, MySQL, MariaDB, and Redshift, plus arrays and hashes (and limited support for [SQLite](#for-sqlite))
+Supports PostgreSQL, MySQL, MariaDB, SQLite, and Redshift, plus arrays and hashes
 
 :cupid: Goes hand in hand with [Chartkick](https://www.chartkick.com)
 
@@ -25,7 +25,7 @@ Add this line to your application’s Gemfile:
 gem "groupdate"
 ```
 
-For MySQL, MariaDB, and SQLite, also follow [these instructions](#additional-instructions).
+For MySQL and MariaDB, also follow [these instructions](#additional-instructions).
 
 ## Getting Started
 
@@ -268,20 +268,6 @@ SELECT CONVERT_TZ(NOW(), '+00:00', 'Pacific/Honolulu');
 
 It should return the time instead of `NULL`.
 
-### For SQLite
-
-Groupdate has limited support for SQLite.
-
-- No time zone support
-- No `day_start` option
-- No `group_by_quarter` method
-
-If your application’s time zone is set to something other than `Etc/UTC` (the default), create an initializer with:
-
-```ruby
-Groupdate.time_zone = false
-```
-
 ## History
 
 View the [changelog](https://github.com/ankane/groupdate/blob/master/CHANGELOG.md)

data/lib/groupdate/adapters/sqlite_adapter.rb

@@ -2,9 +2,6 @@ module Groupdate
   module Adapters
     class SQLiteAdapter < BaseAdapter
       def group_clause
-        raise Groupdate::Error, "Time zones not supported for SQLite" unless @time_zone.utc_offset.zero?
-        raise Groupdate::Error, "day_start not supported for SQLite" unless day_start.zero?
-
         query =
           if period == :week
             ["strftime('%Y-%m-%d', #{column}, '-6 days', ?)", "weekday #{(week_start + 1) % 7}"]
@@ -36,7 +33,7 @@ module Groupdate
               when :month
                 "%Y-%m-01"
               when :quarter
-                raise Groupdate::Error, "Quarter not supported for SQLite"
+                nil
               else # year
                 "%Y-01-01"
               end
@@ -44,8 +41,46 @@ module Groupdate
             ["strftime(?, #{column})", format]
           end
 
+        if period != :custom && (@time_zone != SeriesBuilder.utc || day_start != 0 || period == :quarter)
+          setup_function
+          week_start = period == :week ? Groupdate::Magic::DAYS[self.week_start].to_s : nil
+          query = ["groupdate_internal(?, #{column}, ?, ?, ?)", period, @time_zone.tzinfo.name, day_start, week_start]
+        end
+
         @relation.send(:sanitize_sql_array, query)
       end
+
+      private
+
+      def setup_function
+        @relation.connection_pool.with_connection do |connection|
+          raw_connection = connection.raw_connection
+          return if raw_connection.instance_variable_defined?(:@groupdate_function)
+
+          utc = SeriesBuilder.utc
+          date_periods = %i[day week month quarter year]
+
+          # note: this function is part of the internal API and may change between releases
+          # TODO improve performance
+          raw_connection.create_function("groupdate_internal", 4) do |func, period, value, time_zone, day_start, week_start|
+            if value.nil?
+              func.result = nil
+            else
+              period = period.to_sym
+              # cast_result handles week_start for day_of_week
+              week_start = :sunday if period == :day_of_week
+              result = SeriesBuilder.round_time(utc.parse(value), period, ActiveSupport::TimeZone[time_zone], day_start.to_i, week_start&.to_sym)
+              if date_periods.include?(period)
+                result = result.strftime("%Y-%m-%d")
+              elsif result.is_a?(Time)
+                result = result.in_time_zone(utc).strftime("%Y-%m-%d %H:%M:%S")
+              end
+              func.result = result
+            end
+          end
+          raw_connection.instance_variable_set(:@groupdate_function, true)
+        end
+      end
     end
   end
 end

data/lib/groupdate/series_builder.rb

@@ -46,7 +46,12 @@ module Groupdate
         return time_zone.at((time.to_time.to_i / n_seconds) * n_seconds)
       end
 
-      time = time.to_time.in_time_zone(time_zone)
+      # TODO avoid calling to_time on dates
+      self.class.round_time(time.to_time, period, time_zone, day_start, @week_start_key)
+    end
+
+    def self.round_time(time, period, time_zone, day_start, week_start_key)
+      time = time.in_time_zone(time_zone)
 
       if day_start != 0
         # apply day_start to a time object that's not affected by DST
@@ -65,7 +70,7 @@ module Groupdate
         when :day
           time.beginning_of_day
         when :week
-          time.beginning_of_week(@week_start_key)
+          time.beginning_of_week(week_start_key)
         when :month
           time.beginning_of_month
         when :quarter
@@ -77,7 +82,7 @@ module Groupdate
         when :minute_of_hour
           time.min
         when :day_of_week
-          time.days_to_week_start(@week_start_key)
+          time.days_to_week_start(week_start_key)
         when :day_of_month
           time.day
         when :month_of_year
@@ -297,7 +302,7 @@ module Groupdate
       options.key?(:series) ? options[:series] : series_default
     end
 
-    def utc
+    def self.utc
       @utc ||= ActiveSupport::TimeZone["Etc/UTC"]
     end
   end

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "6.6.0"
+  VERSION = "6.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.7.0
 platform: ruby
 authors:
 - Andrew Kane