postgres_ext 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8eff00c75c70dcf28c108a470e187fb6c62d01
-  data.tar.gz: 41af271c607addeee1883185aa52602f37227767
+  metadata.gz: 04e9453088f60586e98a2f2213afe6e64c075aa7
+  data.tar.gz: 25d1bf9062740090514152e513cc684b4e42a582
 SHA512:
-  metadata.gz: 17fa65379b957864bb359d6ccccd85672422361b6f5126c78f113d8c05ea0c39595fa790d991c3d79d6778b1ce790f133fdb65458f9da8f99f395c2f5fe19bdf
-  data.tar.gz: 80a96500066d32ac9547f5960b3bced0a27a47a20a3c233f7a4c0d78ae06b7febd03be367b901b9ef62747d3f6258da5839ff9ed5d464c8055c6b7a9fe122c1c
+  metadata.gz: 22a8dd126361df619dbd44c45ecaf645ef90f8eb5b23c08b5b4252a2faad6a1d92ec490c7c705645f273c9a8c08ba4154714d466967baed2a0203d1f06868d59
+  data.tar.gz: 45f1d420e3dcb6a3cf295fe60cabcdf35a40dbc8239d50832f4b9c2d5e54adcfa6db0aced323b397a0f7a017251fbcd7d8ddc6d22890cdb1a13c8befb158334f

data/README.md

@@ -8,15 +8,11 @@ Adds support for missing PostgreSQL data types to ActiveRecord.
 ## Looking for help? ##
 
 If it is a bug [please open an issue on
-Github](https://github.com/dockyard/party_foul/issues). If you need help using
+Github](https://github.com/dockyard/postgres_ext/issues). If you need help using
 the gem please ask the question on
 [Stack Overflow](http://stackoverflow.com). Be sure to tag the
 question with `DockYard` so we can find it.
 
-## Note ##
-PostgresExt is dropping support for Ruby 1.8.7 with the next minor
-release.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -84,7 +80,6 @@ supported in postgres\_ext at this time.
 
 
 
-
 ## Authors
 
 Dan McClain [twitter](http://twitter.com/_danmcclain) [github](http://github.com/danmcclain)

data/docs/querying.md

@@ -30,7 +30,7 @@ would be:
 User.where.overlap(:nick_names => ['Bob', 'Fred'])
 ``` 
 
-Postgres\_ext defines `array_overlap`, an [Arel](https://github.com/rails/arel)
+Postgres\_ext defines `overlap`, an [Arel](https://github.com/rails/arel)
 predicate for the `&&` operator. This is utilized by the `where.overlap`
 call above.
 
@@ -38,7 +38,7 @@ call above.
 user_arel = User.arel_table
 
 # Execute the query
-User.where(user_arel[:tags].array_overlap(['one','two']))
+User.where(user_arel[:tags].overlap(['one','two']))
 # => SELECT \"users\".* FROM \"users\" WHERE \"users\".\"tags\" && '{one,two}'
 ```
 
@@ -62,15 +62,15 @@ adding a `contains` method. To make a contains query, you can do:
 User.where.contains(:nick_names => ['Bob', 'Fred'])
 ```
 
-Postgres\_ext defines `array_contains`, an [Arel](https://github.com/rails/arel)
-predicate for the `@>` operator. This is utilized by the
-`where.array_contains` call above.
+Postgres\_ext overrides `contains`, an [Arel](https://github.com/rails/arel)
+predicate, to use the `@>` operator for arrays. This is utilized by the
+`where.contains` call above.
 
 ```ruby
 user_arel = User.arel_table
 
 # Execute the query
-User.where(user_arel[:tags].array_contains(['one','two']))
+User.where(user_arel[:tags].contains(['one','two']))
 # => SELECT "users".* FROM "users" WHERE "users"."tags" @> '{"one","two"}'
 ```
 

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

@@ -59,11 +59,7 @@ module ActiveRecord
           value
         else
           string_array = parse_pg_array value
-          if type == :string || type == :text
-            force_character_encoding(string_array)
-          else
-            type_cast_array(string_array)
-          end
+          type_cast_array(string_array)
         end
       end
 
@@ -178,12 +174,6 @@ module ActiveRecord
 
       private
 
-      def force_character_encoding(string_array)
-        string_array.map do |item|
-          item.respond_to?(:force_encoding) ? item.force_encoding(ActiveRecord::Base.connection.encoding_for_ruby) : item
-        end
-      end
-
       def simplified_type_with_extended_types(field_type)
         case field_type
         when 'uuid'
@@ -287,19 +277,6 @@ module ActiveRecord
 
       NATIVE_DATABASE_TYPES.merge!(EXTENDED_TYPES)
 
-      # Translate from the current database encoding to the encoding we
-      # will force string array components into on retrievial.
-      def encoding_for_ruby
-        @database_encoding ||= case ActiveRecord::Base.connection.encoding
-                               when 'UTF8'
-                                 'UTF-8'
-                               when 'SQL_ASCII'
-                                 'ASCII'
-                               else
-                                 ActiveRecord::Base.connection.encoding
-                               end
-      end
-
       def supports_extensions?
         postgresql_version > 90100
       end
@@ -485,7 +462,11 @@ module ActiveRecord
           clear_cache!
           quoted_table_name = quote_table_name(table_name)
 
-          execute "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}[]"
+          if type.to_s =~ /string|text/
+            execute "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}[] USING string_to_array(#{quote_column_name(column_name)}, ',')"
+          else
+            execute "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}[]"
+          end
 
           change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
           change_column_null(table_name, column_name, options[:null], options[:default]) if options.key?(:null)

data/lib/postgres_ext/version.rb

@@ -1,3 +1,3 @@
 module PostgresExt
-  VERSION = '0.4.0'
+  VERSION = '1.0.0'
 end

data/postgres_ext.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Adds missing native PostgreSQL data types to ActiveRecord}
   gem.summary       = %q{Extends ActiveRecord to handle native PostgreSQL data types}
   gem.homepage      = ""
+  gem.licenses      = ['MIT']
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -16,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.version       = PostgresExt::VERSION
 
   gem.add_dependency 'activerecord', '~> 3.2.0'
-  gem.add_dependency 'pg_array_parser', '~> 0.0.8'
+  gem.add_dependency 'pg_array_parser', '~> 0.0.9'
 
   gem.add_development_dependency 'rails', '~> 3.2.0'
   gem.add_development_dependency 'rspec-rails', '~> 2.12.0'

data/spec/migrations/array_spec.rb

@@ -83,22 +83,80 @@ describe 'Array migrations' do
   end
 
   context 'Change Column' do
-    after { connection.drop_table :data_types }
-    it 'updates the column definitions' do
-      lambda do
-        connection.create_table :data_types do |t|
-          t.integer :array_1, :array => true, :default => []
+    describe 'Change with column existing as array' do
+      after { connection.drop_table :data_types }
+      it 'updates the column definitions' do
+        lambda do
+          connection.create_table :data_types do |t|
+            t.integer :array_1, :array => true, :default => []
+          end
+
+          connection.change_column :data_types, :array_1, :integer, :array => true, :default => [], :null => false
+        end.should_not raise_exception
+
+        columns = connection.columns(:data_types)
+
+        array_1 = columns.detect { |c| c.name == 'array_1'}
+        array_1.sql_type.should eq 'integer[]'
+        array_1.default.should  eq []
+        array_1.null.should     be_false
+      end
+    end
+
+    describe 'Change string column to array' do
+      after { connection.drop_table :data_types }
+      it 'updates the column definitions' do
+        lambda do
+          connection.create_table :data_types do |t|
+            t.string :string_1
+          end
+
+          connection.exec_query "INSERT INTO data_types (string_1) VALUES ('some,values,here')"
+          connection.change_column :data_types, :string_1, :string, :array => true, :default => [], :null => false
+        end.should_not raise_exception
+
+        columns = connection.columns(:data_types)
+
+        string_1 = columns.detect { |c| c.name == 'string_1'}
+        string_1.sql_type.should eq 'character varying(255)[]'
+        string_1.default.should  eq []
+        string_1.null.should     be_false
+
+        new_string_value = connection.exec_query "SELECT array_length(string_1, 1) FROM data_types LIMIT 1"
+        if RUBY_PLATFORM =~ /java/
+          new_string_value.first['array_length'].should eq 3
+        else
+          new_string_value.rows.first.should == ['3']
         end
+      end
+    end
+
+    describe 'Change text column to array' do
+      after { connection.drop_table :data_types }
+      it 'updates the column definitions' do
+        lambda do
+          connection.create_table :data_types do |t|
+            t.text :text_1
+          end
+
+          connection.exec_query "INSERT INTO data_types (text_1) VALUES ('some,values,here')"
+          connection.change_column :data_types, :text_1, :text, :array => true, :default => [], :null => false
+        end.should_not raise_exception
 
-        connection.change_column :data_types, :array_1, :integer, :array => true, :default => [], :null => false
-      end.should_not raise_exception
+        columns = connection.columns(:data_types)
 
-      columns = connection.columns(:data_types)
+        text_1 = columns.detect { |c| c.name == 'text_1'}
+        text_1.sql_type.should eq 'text[]'
+        text_1.default.should  eq []
+        text_1.null.should     be_false
 
-      array_1 = columns.detect { |c| c.name == 'array_1'}
-      array_1.sql_type.should eq 'integer[]'
-      array_1.default.should  eq []
-      array_1.null.should     be_false
+        new_text_value = connection.exec_query "SELECT array_length(text_1, 1) FROM data_types LIMIT 1"
+        if RUBY_PLATFORM =~ /java/
+          new_text_value.first['array_length'].should eq 3
+        else
+          new_text_value.rows.first.should eq ['3']
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- LICENSE
 - README.md
 - Rakefile
 - docs/indexes.md
@@ -238,7 +237,8 @@ files:
 - spec/schema_dumper/uuid_spec.rb
 - spec/spec_helper.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Extends ActiveRecord to handle native PostgreSQL data types

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Dan Seaver
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.