Merge branch 'master' into sqlite

Andrew Kane
2 parents 4edaed72 a0ed30ca
Showing 2 changed files with 6 additions and 6 deletions Show diff stats
lib/groupdate.rb
lib/groupdate/magic.rb
@@ -4,7 +4,7 @@ require &quot;groupdate/version&quot;
 require "groupdate/magic"
  
 module Groupdate
-  class Error < StandardError; end
+  class Error < RuntimeError; end
  
   PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
   # backwards compatibility for anyone who happened to use it
@@ -8,9 +8,9 @@ module Groupdate
       @field = field
       @options = options
  
-      raise "Unrecognized time zone" unless time_zone
+      raise Groupdate::Error, "Unrecognized time zone" unless time_zone
  
-      raise "Unrecognized :week_start option" if field == :week && !week_start
+      raise Groupdate::Error, "Unrecognized :week_start option" if field == :week && !week_start
     end
  
     def group_by(enum, &_block)
@@ -20,7 +20,7 @@ module Groupdate
  
     def relation(column, relation)
       if relation.default_timezone == :local
-        raise "ActiveRecord::Base.default_timezone must be :utc to use Groupdate"
+        raise Groupdate::Error, "ActiveRecord::Base.default_timezone must be :utc to use Groupdate"
       end
  
       time_zone = self.time_zone.tzinfo.name
@@ -131,7 +131,7 @@ module Groupdate
             ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{day_start} second'", time_zone, field, time_zone]
           end
         else
-          raise "Connection adapter not supported: #{adapter_name}"
+          raise Groupdate::Error, "Connection adapter not supported: #{adapter_name}"
         end
  
       if adapter_name == "MySQL" && field == :week
@@ -383,7 +383,7 @@ module Groupdate
         when :month_of_year
           time.month
         else
-          raise "Invalid field"
+          raise Groupdate::Error, "Invalid field"
         end
  
       time.is_a?(Time) ? time + day_start.seconds : time
...	...	@@ -4,7 +4,7 @@ require "groupdate/version"
4	4	require "groupdate/magic"
5	5
6	6	module Groupdate
7		- class Error < StandardError; end
	7	+ class Error < RuntimeError; end
8	8
9	9	PERIODS = [:second, :minute, :hour, :day, :week, :month, :quarter, :year, :day_of_week, :hour_of_day, :day_of_month, :month_of_year]
10	10	# backwards compatibility for anyone who happened to use it
...	...
...	...	@@ -8,9 +8,9 @@ module Groupdate
8	8	@field = field
9	9	@options = options
10	10
11		- raise "Unrecognized time zone" unless time_zone
	11	+ raise Groupdate::Error, "Unrecognized time zone" unless time_zone
12	12
13		- raise "Unrecognized :week_start option" if field == :week && !week_start
	13	+ raise Groupdate::Error, "Unrecognized :week_start option" if field == :week && !week_start
14	14	end
15	15
16	16	def group_by(enum, &_block)
...	...	@@ -20,7 +20,7 @@ module Groupdate
20	20
21	21	def relation(column, relation)
22	22	if relation.default_timezone == :local
23		- raise "ActiveRecord::Base.default_timezone must be :utc to use Groupdate"
	23	+ raise Groupdate::Error, "ActiveRecord::Base.default_timezone must be :utc to use Groupdate"
24	24	end
25	25
26	26	time_zone = self.time_zone.tzinfo.name
...	...	@@ -131,7 +131,7 @@ module Groupdate
131	131	["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{day_start} second'", time_zone, field, time_zone]
132	132	end
133	133	else
134		- raise "Connection adapter not supported: #{adapter_name}"
	134	+ raise Groupdate::Error, "Connection adapter not supported: #{adapter_name}"
135	135	end
136	136
137	137	if adapter_name == "MySQL" && field == :week
...	...	@@ -383,7 +383,7 @@ module Groupdate
383	383	when :month_of_year
384	384	time.month
385	385	else
386		- raise "Invalid field"
	386	+ raise Groupdate::Error, "Invalid field"
387	387	end
388	388
389	389	time.is_a?(Time) ? time + day_start.seconds : time
...	...