Add postgresql range types support

2 files changed, 281 insertions, 106 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index 2254be8612..8d7a78c513 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -3,6 +3,9 @@ require "cases/helper"
 class PostgresqlArray < ActiveRecord::Base
 end
 
+class PostgresqlRange < ActiveRecord::Base
+end
+
 class PostgresqlTsvector < ActiveRecord::Base
 end
 
@@ -43,7 +46,104 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     @connection.execute("INSERT INTO postgresql_arrays (id, commission_by_quarter, nicknames) VALUES (1, '{35000,21000,18000,17000}', '{foo,bar,baz}')")
     @first_array = PostgresqlArray.find(1)
 
+    @connection.execute <<_SQL
+    INSERT INTO postgresql_ranges (
+      date_range,
+      num_range,
+      ts_range,
+      tstz_range,
+      int4_range,
+      int8_range
+    ) VALUES (
+      '[''2012-01-02'', ''2012-01-04'']',
+      '[0.1, 0.2]',
+      '[''2010-01-01 14:30'', ''2011-01-01 14:30'']',
+      '[''2010-01-01 14:30:00+05'', ''2011-01-01 14:30:00-03'']',
+      '[1, 10]',
+      '[10, 100]'
+    )
+_SQL
+
+    @connection.execute <<_SQL
+    INSERT INTO postgresql_ranges (
+      date_range,
+      num_range,
+      ts_range,
+      tstz_range,
+      int4_range,
+      int8_range
+    ) VALUES (
+      '(''2012-01-02'', ''2012-01-04'')',
+      '[0.1, 0.2)',
+      '[''2010-01-01 14:30'', ''2011-01-01 14:30'')',
+      '[''2010-01-01 14:30:00+05'', ''2011-01-01 14:30:00-03'')',
+      '(1, 10)',
+      '(10, 100)'
+    )
+_SQL
+
+    @connection.execute <<_SQL
+    INSERT INTO postgresql_ranges (
+      date_range,
+      num_range,
+      ts_range,
+      tstz_range,
+      int4_range,
+      int8_range
+    ) VALUES (
+      '(''2012-01-02'',]',
+      '[0.1,]',
+      '[''2010-01-01 14:30'',]',
+      '[''2010-01-01 14:30:00+05'',]',
+      '(1,]',
+      '(10,]'
+    )
+_SQL
+
+    @connection.execute <<_SQL
+    INSERT INTO postgresql_ranges (
+      date_range,
+      num_range,
+      ts_range,
+      tstz_range,
+      int4_range,
+      int8_range
+    ) VALUES (
+      '[,]',
+      '[,]',
+      '[,]',
+      '[,]',
+      '[,]',
+      '[,]'
+    )
+_SQL
+
+    @connection.execute <<_SQL
+    INSERT INTO postgresql_ranges (
+      date_range,
+      num_range,
+      ts_range,
+      tstz_range,
+      int4_range,
+      int8_range
+    ) VALUES (
+      '(''2012-01-02'', ''2012-01-02'')',
+      '(0.1, 0.1)',
+      '(''2010-01-01 14:30'', ''2010-01-01 14:30'')',
+      '(''2010-01-01 14:30:00+05'', ''2010-01-01 06:30:00-03'')',
+      '(1, 1)',
+      '(10, 10)'
+    )
+_SQL
+
+    @first_range = PostgresqlRange.find(1)
+    @second_range = PostgresqlRange.find(2)
+    @third_range = PostgresqlRange.find(3)
+    @fourth_range = PostgresqlRange.find(4)
+    @empty_range = PostgresqlRange.find(5)
+
     @connection.execute("INSERT INTO postgresql_tsvectors (id, text_vector) VALUES (1, ' ''text'' ''vector'' ')")
+
     @first_tsvector = PostgresqlTsvector.find(1)
 
     @connection.execute("INSERT INTO postgresql_moneys (id, wealth) VALUES (1, '567.89'::money)")
@@ -82,6 +182,15 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal :text, @first_array.column_for_attribute(:nicknames).type
   end
 
+  def test_data_type_of_range_types
+    assert_equal :daterange, @first_range.column_for_attribute(:date_range).type
+    assert_equal :numrange, @first_range.column_for_attribute(:num_range).type
+    assert_equal :tsrange, @first_range.column_for_attribute(:ts_range).type
+    assert_equal :tstzrange, @first_range.column_for_attribute(:tstz_range).type
+    assert_equal :int4range, @first_range.column_for_attribute(:int4_range).type
+    assert_equal :int8range, @first_range.column_for_attribute(:int8_range).type
+  end
+
   def test_data_type_of_tsvector_types
     assert_equal :tsvector, @first_tsvector.column_for_attribute(:text_vector).type
   end
@@ -128,11 +237,183 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     assert_equal "'text' 'vector'", @first_tsvector.text_vector
   end
 
+  def test_int4range_values
+    assert_equal 1...11, @first_range.int4_range
+    assert_equal 2...10, @second_range.int4_range
+    assert_equal 2...Float::INFINITY, @third_range.int4_range
+    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.int4_range)
+    assert_equal nil, @empty_range.int4_range
+  end
+
+  def test_int8range_values
+    assert_equal 10...101, @first_range.int8_range
+    assert_equal 11...100, @second_range.int8_range
+    assert_equal 11...Float::INFINITY, @third_range.int8_range
+    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.int8_range)
+    assert_equal nil, @empty_range.int8_range
+  end
+
+  def test_daterange_values
+    assert_equal Date.new(2012, 1, 2)...Date.new(2012, 1, 5), @first_range.date_range
+    assert_equal Date.new(2012, 1, 3)...Date.new(2012, 1, 4), @second_range.date_range
+    assert_equal Date.new(2012, 1, 3)...Float::INFINITY, @third_range.date_range
+    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.date_range)
+    assert_equal nil, @empty_range.date_range
+  end
+
+  def test_numrange_values
+    assert_equal BigDecimal.new('0.1')..BigDecimal.new('0.2'), @first_range.num_range
+    assert_equal BigDecimal.new('0.1')...BigDecimal.new('0.2'), @second_range.num_range
+    assert_equal BigDecimal.new('0.1')...BigDecimal.new('Infinity'), @third_range.num_range
+    assert_equal BigDecimal.new('-Infinity')...BigDecimal.new('Infinity'), @fourth_range.num_range
+    assert_equal nil, @empty_range.num_range
+  end
+
+  def test_tsrange_values
+    tz = ::ActiveRecord::Base.default_timezone
+    assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)..Time.send(tz, 2011, 1, 1, 14, 30, 0), @first_range.ts_range
+    assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 1, 1, 14, 30, 0), @second_range.ts_range
+    assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)...Float::INFINITY, @third_range.ts_range
+    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.ts_range)
+    assert_equal nil, @empty_range.ts_range
+  end
+
+  def test_tstzrange_values
+    assert_equal Time.parse('2010-01-01 09:30:00 UTC')..Time.parse('2011-01-01 17:30:00 UTC'), @first_range.tstz_range
+    assert_equal Time.parse('2010-01-01 09:30:00 UTC')...Time.parse('2011-01-01 17:30:00 UTC'), @second_range.tstz_range
+    assert_equal Time.parse('2010-01-01 09:30:00 UTC')...Float::INFINITY, @third_range.tstz_range
+    assert_equal(-Float::INFINITY...Float::INFINITY, @fourth_range.tstz_range)
+    assert_equal nil, @empty_range.tstz_range
+  end
+
   def test_money_values
     assert_equal 567.89, @first_money.wealth
     assert_equal(-567.89, @second_money.wealth)
   end
 
+  def test_create_tstzrange
+    tstzrange = Time.parse('2010-01-01 14:30:00 +0100')...Time.parse('2011-02-02 14:30:00 CDT')
+    range = PostgresqlRange.new(:tstz_range => tstzrange)
+    assert range.save
+    assert range.reload
+    assert_equal range.tstz_range, tstzrange
+    assert_equal range.tstz_range, Time.parse('2010-01-01 13:30:00 UTC')...Time.parse('2011-02-02 19:30:00 UTC')
+  end
+
+  def test_update_tstzrange
+    new_tstzrange = Time.parse('2010-01-01 14:30:00 CDT')...Time.parse('2011-02-02 14:30:00 CET')
+    assert @first_range.tstz_range = new_tstzrange
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.tstz_range, new_tstzrange
+    assert @first_range.tstz_range = Time.parse('2010-01-01 14:30:00 +0100')...Time.parse('2010-01-01 13:30:00 +0000')
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.tstz_range, nil
+  end
+
+  def test_create_tsrange
+    tz = ::ActiveRecord::Base.default_timezone
+    tsrange = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 2, 2, 14, 30, 0)
+    range = PostgresqlRange.new(:ts_range => tsrange)
+    assert range.save
+    assert range.reload
+    assert_equal range.ts_range, tsrange
+  end
+
+  def test_update_tsrange
+    tz = ::ActiveRecord::Base.default_timezone
+    new_tsrange = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 2, 2, 14, 30, 0)
+    assert @first_range.ts_range = new_tsrange
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.ts_range, new_tsrange
+    assert @first_range.ts_range = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2010, 1, 1, 14, 30, 0)
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.ts_range, nil
+  end
+
+  def test_create_numrange
+    numrange = BigDecimal.new('0.5')...BigDecimal.new('1')
+    range = PostgresqlRange.new(:num_range => numrange)
+    assert range.save
+    assert range.reload
+    assert_equal range.num_range, numrange
+  end
+
+  def test_update_numrange
+    new_numrange = BigDecimal.new('0.5')...BigDecimal.new('1')
+    assert @first_range.num_range = new_numrange
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.num_range, new_numrange
+    assert @first_range.num_range = BigDecimal.new('0.5')...BigDecimal.new('0.5')
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.num_range, nil
+  end
+
+  def test_create_daterange
+    daterange = Range.new(Date.new(2012, 1, 1), Date.new(2013, 1, 1), true)
+    range = PostgresqlRange.new(:date_range => daterange)
+    assert range.save
+    assert range.reload
+    assert_equal range.date_range, daterange
+  end
+
+  def test_update_daterange
+    new_daterange = Date.new(2012, 2, 3)...Date.new(2012, 2, 10)
+    assert @first_range.date_range = new_daterange
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.date_range, new_daterange
+    assert @first_range.date_range = Date.new(2012, 2, 3)...Date.new(2012, 2, 3)
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.date_range, nil
+  end
+
+  def test_create_int4range
+    int4range = Range.new(3, 50, true)
+    range = PostgresqlRange.new(:int4_range => int4range)
+    assert range.save
+    assert range.reload
+    assert_equal range.int4_range, int4range
+  end
+
+  def test_update_int4range
+    new_int4range = 6...10
+    assert @first_range.int4_range = new_int4range
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.int4_range, new_int4range
+    assert @first_range.int4_range = 3...3
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.int4_range, nil
+  end
+
+  def test_create_int8range
+    int8range = Range.new(30, 50, true)
+    range = PostgresqlRange.new(:int8_range => int8range)
+    assert range.save
+    assert range.reload
+    assert_equal range.int8_range, int8range
+  end
+
+  def test_update_int8range
+    new_int8range = 60000...10000000
+    assert @first_range.int8_range = new_int8range
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.int8_range, new_int8range
+    assert @first_range.int8_range = 39999...39999
+    assert @first_range.save
+    assert @first_range.reload
+    assert_equal @first_range.int8_range, nil
+  end
+
   def test_update_tsvector
     new_text_vector = "'new' 'text' 'vector'"
     assert @first_tsvector.text_vector = new_text_vector
diff --git a/activerecord/test/cases/adapters/postgresql/intrange_test.rb b/activerecord/test/cases/adapters/postgresql/intrange_test.rb
deleted file mode 100644
index 5f6a64619d..0000000000
--- a/activerecord/test/cases/adapters/postgresql/intrange_test.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# encoding: utf-8
-
-require "cases/helper"
-require 'active_record/base'
-require 'active_record/connection_adapters/postgresql_adapter'
-
-class PostgresqlIntrangesTest < ActiveRecord::TestCase
-  class IntRangeDataType < ActiveRecord::Base
-    self.table_name = 'intrange_data_type'
-  end
-
-  def setup
-    @connection = ActiveRecord::Base.connection
-    begin
-      @connection.transaction do
-        @connection.create_table('intrange_data_type') do |t|
-          t.intrange 'int_range', :default => (1..10)
-          t.intrange 'long_int_range', :limit => 8, :default => (1..100)
-        end
-      end
-    rescue ActiveRecord::StatementInvalid
-      return skip "do not test on PG without ranges"
-    end
-    @int_range_column = IntRangeDataType.columns.find { |c| c.name == 'int_range' }
-    @long_int_range_column = IntRangeDataType.columns.find { |c| c.name == 'long_int_range' }
-  end
-
-  def teardown
-    @connection.execute 'drop table if exists intrange_data_type'
-  end
-
-  def test_columns
-    assert_equal :intrange, @int_range_column.type
-    assert_equal :intrange, @long_int_range_column.type
-  end
-
-  def test_type_cast_intrange
-    assert @int_range_column
-    assert_equal(true, @int_range_column.has_default?)
-    assert_equal((1..10), @int_range_column.default)
-    assert_equal("int4range", @int_range_column.sql_type)
-
-    data = "[1,10)"
-    hash = @int_range_column.class.string_to_intrange data
-    assert_equal((1..9), hash)
-    assert_equal((1..9), @int_range_column.type_cast(data))
-
-    assert_equal((nil..nil), @int_range_column.type_cast("empty"))
-    assert_equal((1..5), @int_range_column.type_cast('[1,5]'))
-    assert_equal((2..4), @int_range_column.type_cast('(1,5)'))
-    assert_equal((2..39), @int_range_column.type_cast('[2,40)'))
-    assert_equal((10..20), @int_range_column.type_cast('(9,20]'))
-  end
-
-  def test_type_cast_long_intrange
-    assert @long_int_range_column
-    assert_equal(true, @long_int_range_column.has_default?)
-    assert_equal((1..100), @long_int_range_column.default)
-    assert_equal("int8range", @long_int_range_column.sql_type)
-  end
-
-  def test_rewrite
-    @connection.execute "insert into intrange_data_type (int_range) VALUES ('(1, 6)')"
-    x = IntRangeDataType.first
-    x.int_range = (1..100)
-    assert x.save!
-  end
-
-  def test_select
-    @connection.execute "insert into intrange_data_type (int_range) VALUES ('(1, 4]')"
-    x = IntRangeDataType.first
-    assert_equal((2..4), x.int_range)
-  end
-
-  def test_empty_range
-    @connection.execute %q|insert into intrange_data_type (int_range) VALUES('empty')|
-    x = IntRangeDataType.first
-    assert_equal((nil..nil), x.int_range)
-  end
-
-  def test_rewrite_to_nil
-    @connection.execute %q|insert into intrange_data_type (int_range) VALUES('(1, 4]')|
-    x = IntRangeDataType.first
-    x.int_range = nil
-    assert x.save!
-    assert_equal(nil, x.int_range)
-  end
-
-  def test_invalid_intrange
-    assert IntRangeDataType.create!(int_range: ('a'..'d'))
-    x = IntRangeDataType.first
-    assert_equal(nil, x.int_range)
-  end
-
-  def test_save_empty_range
-    assert IntRangeDataType.create!(int_range: (nil..nil))
-    x = IntRangeDataType.first
-    assert_equal((nil..nil), x.int_range)
-  end
-
-  def test_save_invalid_data
-    assert_raises(ActiveRecord::StatementInvalid) do
-      IntRangeDataType.create!(int_range: "empty1")
-    end
-  end
-end