schema_plus_pg_types 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8c1d45e50a98115b2794690905697521819a2a
-  data.tar.gz: d20941350da12ca252504e923683b1809e9a7783
+  metadata.gz: 0197b125994ba886389559a240f881d856818f7a
+  data.tar.gz: 9c47a6c798a6f031c48622016a96f8883420a02b
 SHA512:
-  metadata.gz: c04aef0c17a5ef56363a4a5585ad893caeb6e585e0707e2175aa698df7621f99b444fba1c7143ccff5d8c4d1e81649c0bd9f4831f5a3bb48614fb70f3eb9cdae
-  data.tar.gz: ae033ed292e5c7d0ef043b7c7b667316b1ba3e89e362f9568686a373725f141dd448ef65789ffa683da62f062b6d05f1960ab84f861c22882736632ff4adc157
+  metadata.gz: e4cb6dc33e28c527cdadbe55841e5cd52ed5e4e4195ab6e86ec38c502b03dda11306a521178ea2ecef9f13f29f7a0b580232dfb24d29d12ef2ffd080fe1d7d4c
+  data.tar.gz: 4ec366d08c9cbbf581865bf6b47b005054ce42ce2a2e1c793fca622948c50b035b2a7eed71d228ee1bb319967dc0b697d54cbfd4356100a776198c4e20f86376

data/README.md

@@ -65,6 +65,7 @@ SchemaPlus::PgTypes is part of the [SchemaPlus](https://github.com/SchemaPlus/)
 
 ## History
 
+* 0.1.1 - Improve test coverage (no change to production code)
 * 0.1.0 - Initial release
 
 ## Development & Testing

data/lib/schema_plus/pg_types/active_record/connection_adapters/postgresql/adapter.rb

@@ -1,14 +1,16 @@
 require 'active_record/connection_adapters/postgresql_adapter'
 require_relative 'oid/interval'
+require_relative 'schema_statements'
 
 module SchemaPlus::PgTypes
   module ActiveRecord
     module ConnectionAdapters
       module PostgreSQLAdapter
+        include PostgreSQL::SchemaStatements
+
         def configure_connection
           super
 
-
           # Set interval output format to ISO 8601 for ease of parsing by ActiveSupport::Duration.parse
           execute('SET intervalstyle = iso_8601', 'SCHEMA')
         end

data/lib/schema_plus/pg_types/active_record/connection_adapters/postgresql/column_methods.rb

@@ -7,16 +7,13 @@ module SchemaPlus::PgTypes
             args.each { |name| column(name, :interval, options) }
           end
         end
+
         module Table
-          def interval(*args, **options)
-            args.each { |name| column(name, :interval, options) }
-          end
+          include ColumnMethods
         end
 
         module TableDefinition
-          def interval(*args, **options)
-            args.each { |name| column(name, :interval, options) }
-          end
+          include ColumnMethods
         end
       end
     end

data/lib/schema_plus/pg_types/active_record/connection_adapters/postgresql/schema_statements.rb

@@ -5,15 +5,18 @@ module SchemaPlus::PgTypes
     module ConnectionAdapters
       module PostgreSQL
         module SchemaStatements
-          def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+          def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
             case type.to_s
               when 'interval'
-                return super(type, limit, precision, scale) unless precision
-
-                case precision
-                  when 0..6; "interval(#{precision})"
-                  else raise(ActiveRecordError, "No interval type has precision of #{precision}. The allowed range of precision is from 0 to 6")
+                sql = 'interval'
+                if precision
+                  sql << case precision
+                    when 0..6; "(#{precision})"
+                    else raise(::ActiveRecord::ActiveRecordError, "No interval type has precision of #{precision}. The allowed range of precision is from 0 to 6")
+                  end
                 end
+                sql << '[]' if array
+                sql
               else
                 super(type, limit, precision, scale)
             end

data/lib/schema_plus/pg_types/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module PgTypes
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/conversion_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+require 'active_record/schema_dumper'
+
+class Item < ActiveRecord::Base
+end
+
+class DefaultItem < ActiveRecord::Base
+
+end
+
+describe 'Conversion' do
+
+  let(:migration) { ActiveRecord::Migration }
+  let(:connection) { ActiveRecord::Base.connection }
+  let(:schema) { ActiveRecord::Schema }
+
+  before(:each) do
+    define_schema
+  end
+
+  context 'INTERVAL data type' do
+    TEST_DURATIONS = [
+      0.seconds,
+      0.days,
+      0.years,
+      27.seconds,
+      28.minutes,
+      3.hours,
+      15.days,
+      3.weeks,
+      2.months,
+      1.year,
+      5.years,
+      5.years + 7.months + 10.days + 6.hours + 7.minutes + 8.seconds
+    ]
+
+    it 'should convert numeric values to proper durations (round trip)' do
+      [0, 3600].each{|numeric_duration| Item.create(duration: numeric_duration)}
+      durations = Item.pluck(:duration)
+      expect(durations).to all(be_an(ActiveSupport::Duration))
+      expect(durations).to eq([0.seconds, 1.hour])
+    end
+
+    it 'should convert data from ActiveSupport::Duration (round trip)' do
+      TEST_DURATIONS.each{|duration| Item.create(duration: duration)}
+      durations = Item.pluck(:duration)
+      expect(durations).to all(be_an(ActiveSupport::Duration))
+      expect(durations).to eq(TEST_DURATIONS)
+    end
+
+    it 'should convert data to ActiveSupport::Duration' do
+      connection.execute(<<~EOF
+        INSERT INTO items (duration)
+        VALUES
+          ('0 seconds'),
+          ('0'),
+          ('0 years'),
+          ('27 seconds'),
+          ('28 minutes'),
+          ('3 hours'),
+          ('15 days'),
+          ('3 weeks'),
+          ('2 months'),
+          ('1 year'),
+          ('5 years'),
+          ('5 years 7 months 10 days 6 hours 7 minutes 8 seconds');
+      EOF
+      )
+      durations = Item.pluck(:duration)
+      expect(durations).to all(be_an(ActiveSupport::Duration))
+      expect(durations).to eq(TEST_DURATIONS)
+    end
+
+    it 'should support default values' do
+      DefaultItem.create
+      item_with_default_value = DefaultItem.first
+      expect(item_with_default_value.duration).to be_an(ActiveSupport::Duration)
+      expect(item_with_default_value.duration).to eq(2.years + 5.minutes)
+    end
+
+    it 'should properly dump the schema' do
+      stream = StringIO.new
+      ActiveRecord::SchemaDumper.dump(connection, stream)
+    end
+
+  end
+
+  protected
+
+  def define_schema
+    connection.data_sources.each do |table| connection.drop_table table, cascade: true end
+
+    schema.define do
+
+      create_table :items, force: true do |t|
+        t.interval :duration
+      end
+
+      create_table :default_items, force: true do |t|
+        t.interval :duration, default: 2.years + 5.minutes
+      end
+    end
+  end
+end

data/spec/migration_spec.rb

@@ -15,83 +15,63 @@ describe 'Migration' do
   let(:schema) { ActiveRecord::Schema }
 
   before(:each) do
-    define_schema
+    clear_tables
   end
 
   context 'INTERVAL data type' do
-    TEST_DURATIONS = [
-      0.seconds,
-      0.days,
-      0.years,
-      27.seconds,
-      28.minutes,
-      3.hours,
-      15.days,
-      3.weeks,
-      2.months,
-      1.year,
-      5.years,
-      5.years + 7.months + 10.days + 6.hours + 7.minutes + 8.seconds
-    ]
-
-    it 'should convert data from ActiveSupport::Duration (round trip)' do
-      TEST_DURATIONS.each{|duration| Item.create(duration: duration)}
-      durations = Item.pluck(:duration)
-      expect(durations).to all(be_an(ActiveSupport::Duration))
-      expect(durations).to eq(TEST_DURATIONS)
-    end
-
-    it 'should convert data to ActiveSupport::Duration' do
-      connection.execute(<<~EOF
-        INSERT INTO items (duration)
-        VALUES
-          ('0 seconds'),
-          ('0'),
-          ('0 years'),
-          ('27 seconds'),
-          ('28 minutes'),
-          ('3 hours'),
-          ('15 days'),
-          ('3 weeks'),
-          ('2 months'),
-          ('1 year'),
-          ('5 years'),
-          ('5 years 7 months 10 days 6 hours 7 minutes 8 seconds');
-      EOF
-      )
-      durations = Item.pluck(:duration)
-      expect(durations).to all(be_an(ActiveSupport::Duration))
-      expect(durations).to eq(TEST_DURATIONS)
+    it 'supports interval type' do
+      sql = create_table_sql :items do |t|
+        t.interval :duration
+        t.integer :another_field
+      end
+      expect(sql).to match /"duration" interval/
     end
 
-    it 'should support default values' do
-      DefaultItem.create
-      item_with_default_value = DefaultItem.first
-      expect(item_with_default_value.duration).to be_an(ActiveSupport::Duration)
-      expect(item_with_default_value.duration).to eq(2.years + 5.minutes)
+    it 'supports interval type with precision and array' do
+      sql = create_table_sql :items do |t|
+        t.interval :duration, precision: 5, array: true
+      end
+      expect(sql).to match /"duration" interval\(5\)\[\]/
     end
 
-    it 'should properly dump the schema' do
-      stream = StringIO.new
-      ActiveRecord::SchemaDumper.dump(connection, stream)
+    it 'fails when precision is too high' do
+      expect do
+        create_table_sql :items do |t|
+          t.interval :duration, precision: 10
+        end
+      end.to raise_error /No interval type has precision of 10/
     end
-
   end
 
   protected
 
-  def define_schema
+  def clear_tables
     connection.data_sources.each do |table| connection.drop_table table, cascade: true end
+  end
 
-    schema.define do
-
-      create_table :items, force: true do |t|
-        t.interval :duration
-      end
+  class DummyConnectionAdapter < ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    attr_reader :sql
+
+    def initialize
+      @connection          = nil
+      @owner               = nil
+      @instrumenter        = ActiveSupport::Notifications.instrumenter
+      @logger              = nil
+      @config              = {}
+      @pool                = nil
+      @quoted_column_names, @quoted_table_names = {}, {}
+      @visitor             = arel_visitor
+      @sql                 = []
+    end
 
-      create_table :default_items, force: true do |t|
-        t.interval :duration, default: 2.years + 5.minutes
-      end
+    def execute(sql)
+      @sql << sql
     end
   end
+
+  def create_table_sql(*args, **opts, &block)
+    conn = DummyConnectionAdapter.new
+    conn.create_table *args, **opts, &block
+    conn.sql.join '; '
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_types
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Boaz Yaniv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -156,6 +156,7 @@ files:
 - migration_spec.rb
 - schema_dev.yml
 - schema_plus_pg_types.gemspec
+- spec/conversion_spec.rb
 - spec/migration_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb
@@ -184,6 +185,7 @@ signing_key:
 specification_version: 4
 summary: Adds supports for PostgreSQL types that were left out by Rails
 test_files:
+- spec/conversion_spec.rb
 - spec/migration_spec.rb
 - spec/sanity_spec.rb
 - spec/spec_helper.rb