postgres_ext 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.0.6
+
+Lots of array related fixes:
+ * Model creation should no longer fail when not assigning a value to an
+   array column
+ * Array columns follow database defaults
+Migration fix (rn0 and gilltots)
+Typos in README (bcardarella)

data/README.md

@@ -142,9 +142,9 @@ person.favorite_numbers
 person.save
 
 person_2 = Person.first
-person_2.favoite_numbers
+person_2.favorite_numbers
 # => [1,2,3]
-person_2.favoite_numbers.first.class
+person_2.favorite_numbers.first.class
 # => Fixnum
 ```
 

data/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb

@@ -30,8 +30,10 @@ module ActiveRecord
         return coder.load(value) if encoded?
 
         klass = self.class
-        if self.array && value.start_with?('{') && value.end_with?('}')
+        if self.array && String === value && value.start_with?('{') && value.end_with?('}')
           string_to_array value
+        elsif self.array && Array === value
+          value
         else
           case type
           when :inet, :cidr   then klass.string_to_cidr_address(value)
@@ -42,11 +44,15 @@ module ActiveRecord
       end
       alias_method_chain :type_cast, :extended_types
       def string_to_array(value)
-        string_array = parse_pg_array value
-        if type == :string
-          string_array
+        if Array === value
+          value
         else
-          type_cast_array(string_array)
+          string_array = parse_pg_array value
+          if type == :string
+            string_array
+          else
+            type_cast_array(string_array)
+          end
         end
       end
 
@@ -65,10 +71,14 @@ module ActiveRecord
       def type_cast_code_with_extended_types(var_name)
         klass = self.class.name
 
-        case type
-        when :inet, :cidr   then "#{klass}.string_to_cidr_address(#{var_name})"
+        if self.array
+          "#{klass}.new('#{self.name}', #{self.default.nil? ? 'nil' : "'#{self.default}'"}, '#{self.sql_type}').string_to_array(#{var_name})"
         else
-          type_cast_code_without_extended_types(var_name)
+          case type
+          when :inet, :cidr   then "#{klass}.string_to_cidr_address(#{var_name})"
+          else
+            type_cast_code_without_extended_types(var_name)
+          end
         end
       end
       alias_method_chain :type_cast_code, :extended_types
@@ -165,17 +175,19 @@ module ActiveRecord
       NATIVE_DATABASE_TYPES.merge!(EXTENDED_TYPES)
 
       def add_column_options!(sql, options)
-        if options[:column].array
+        if options[:array] || options[:column].try(:array)
           sql << '[]'
         end
         super
       end
 
-      def type_cast_with_extended_types(value, column)
+      def type_cast_with_extended_types(value, column, part_array = false)
         case value
         when NilClass
-          if column.array
+          if column.array && part_array
             'NULL'
+          elsif column.array && !part_array
+            value
           else
             type_cast_without_extended_types(value, column)
           end
@@ -200,7 +212,7 @@ module ActiveRecord
       end
 
       def array_to_string(value, column)
-        "{#{value.map{|val| type_cast(val, column)}.join(',')}}"
+        "{#{value.map{|val| type_cast(val, column, true)}.join(',')}}"
       end
     end
   end

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/columns/array_spec.rb

@@ -54,4 +54,5 @@ describe 'Array column' do
       end
     end
   end
+
 end

data/spec/migrations/active_record_migration_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'activerecord migrations' do
+  let!(:connection) { ActiveRecord::Base.connection }
+  it 'creates non-postgres_ext columns' do
+
+    lambda do
+      DoMigration.new.up
+    end.should_not raise_exception
+
+    columns = connection.columns(:generic_data_types)
+    col_1 = columns.detect { |c| c.name == 'col_1'}
+    col_2 = columns.detect { |c| c.name == 'col_2'}
+    col_3 = columns.detect { |c| c.name == 'col_3'}
+    col_4 = columns.detect { |c| c.name == 'col_4'}
+
+
+    col_1.sql_type.should eq 'integer'
+    col_2.sql_type.should eq 'character varying(255)'
+    col_3.sql_type.should eq 'timestamp without time zone'
+    col_4.sql_type.should eq 'text'
+  end
+end
+
+
+class DoMigration < ActiveRecord::Migration
+  def up
+    create_table :generic_data_types do |t|
+      t.integer :col_1
+      t.string :col_2
+      t.datetime :col_3
+    end
+    add_column :generic_data_types, :col_4, :text
+  end
+end
+

data/spec/models/array_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'Models with array columns' do
+  context 'no default value, string array' do
+    let!(:adapter) { ActiveRecord::Base.connection }
+
+    before do
+      adapter.create_table :users, :force => true do |t|
+        t.string :nick_names, :array => true
+      end
+      class User < ActiveRecord::Base
+        attr_accessible :nick_names
+      end
+    end
+
+    after do
+      adapter.drop_table :users
+      Object.send(:remove_const, :User)
+    end
+
+    describe '#create' do
+      it 'creates a user when there is no array assignment' do
+        u = User.create()
+        u.reload
+        u.nick_names.should eq nil
+      end
+
+      it 'creates a user with an empty array' do
+        u = User.create(:nick_names => [])
+        u.reload
+        u.nick_names.should eq []
+      end
+
+      it 'creates a user with an array of some values' do
+        u = User.create(:nick_names => ['some', 'things'])
+        u.reload
+        u.nick_names.should eq ['some', 'things']
+      end
+    end
+  end
+
+  context 'default value, string array' do
+    let!(:adapter) { ActiveRecord::Base.connection }
+    before do
+      adapter.create_table :defaulted_users, :force => true do |t|
+        t.string :nick_names, :array => true, :default => '{}'
+      end
+      class DefaultedUser < ActiveRecord::Base
+        attr_accessible :nick_names
+      end
+    end
+
+    after do
+      adapter.drop_table :defaulted_users
+      Object.send(:remove_const, :DefaultedUser)
+    end
+
+    describe '#create' do
+      it 'creates a user when there is no array assignment' do
+        u = DefaultedUser.create()
+        u.reload
+        u.nick_names.should eq []
+      end
+
+      it 'creates a user with an nil' do
+        u = DefaultedUser.create(:nick_names => nil)
+        u.reload
+        u.nick_names.should eq nil
+      end
+
+      it 'creates a user with an array of some values' do
+        u = DefaultedUser.create(:nick_names => ['some', 'things'])
+        u.reload
+        u.nick_names.should eq ['some', 'things']
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -165,6 +165,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -235,11 +236,13 @@ files:
 - spec/dummy/vendor/assets/javascripts/.gitkeep
 - spec/dummy/vendor/assets/stylesheets/.gitkeep
 - spec/dummy/vendor/plugins/.gitkeep
+- spec/migrations/active_record_migration_spec.rb
 - spec/migrations/array_spec.rb
 - spec/migrations/cidr_spec.rb
 - spec/migrations/inet_spec.rb
 - spec/migrations/macaddr_spec.rb
 - spec/migrations/uuid_spec.rb
+- spec/models/array_spec.rb
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
 - spec/schema_dumper/inet_spec.rb
@@ -260,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2955778538883923768
+      hash: -1872786162985157385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -269,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2955778538883923768
+      hash: -1872786162985157385
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -330,11 +333,13 @@ test_files:
 - spec/dummy/vendor/assets/javascripts/.gitkeep
 - spec/dummy/vendor/assets/stylesheets/.gitkeep
 - spec/dummy/vendor/plugins/.gitkeep
+- spec/migrations/active_record_migration_spec.rb
 - spec/migrations/array_spec.rb
 - spec/migrations/cidr_spec.rb
 - spec/migrations/inet_spec.rb
 - spec/migrations/macaddr_spec.rb
 - spec/migrations/uuid_spec.rb
+- spec/models/array_spec.rb
 - spec/schema_dumper/array_spec.rb
 - spec/schema_dumper/cidr_spec.rb
 - spec/schema_dumper/inet_spec.rb