activerecord-postgresql-extensions 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e521403cd36cf7625c8ccd2824cae61db46ca6
-  data.tar.gz: 068388117de07b1cf28a342b6135cf1879ba7623
+  metadata.gz: 884595fe6ca7f7decbe13587cfd320816f6fe1aa
+  data.tar.gz: e655d1e1363ce3089488c383a1a86bf5dc7ac2a1
 SHA512:
-  metadata.gz: 2644c7baf1ada6bae7f49c7755dc81de31db289294ddff377c7ff990a4a73f4ad3614dd9bee0981d2a463743ce50536909da4b48ff4ed885a7d1c5bb945c03b1
-  data.tar.gz: 9deb3cd3329c7c28be94d1cf162e597e9176cfeccdf82353635153e7024b74ae739b22666760f528c93d429a95b7ab859354b73b792bfc9928ae54b6e9b7d284
+  metadata.gz: 1982f5f26ac5b40052c3d7a92000e6594c0a1d9b44c828e802c6f91623a106428129d74316529b9591754560254ce32f788558984f46f5bf35c95c5d0958b7ae
+  data.tar.gz: b3b04fa975238f7381d3f324d32bd195601fd7c38506983be39fafbe2c8656567ff12e4750459fed4f8de5a7ff2e2516cfa4c6a65e814fe7937397403f68cdc7

data/lib/active_record/postgresql_extensions/adapter_extensions.rb

@@ -712,6 +712,21 @@ module ActiveRecord
       end
       alias_method_chain :add_column_options!, :expression
 
+      def change_column_with_using(table_name, column_name, type, options = {}) #:nodoc:
+        if options.has_key?(:using) && options[:using].present?
+          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])} USING #{options[:using]}"
+
+          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)
+        else
+          change_column_without_using(table_name, column_name, type, options)
+        end
+      end
+      alias_method_chain :change_column, :using
+
       def change_column_default_with_expression(table_name, column_name, default) #:nodoc:
         if default.is_a?(Hash) && default.has_key?(:expression)
           execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{default[:expression]};"

data/lib/active_record/postgresql_extensions/version.rb

@@ -1,7 +1,7 @@
 
 module ActiveRecord
   module PostgreSQLExtensions
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end
 

data/test/adapter_extensions_tests.rb

@@ -186,6 +186,28 @@ class AdapterExtensionTests < PostgreSQLExtensionsTestCase
     end
   end
 
+  def test_change_column_with_using
+    Mig.change_column(:foo, :bar, :integer, :using => '100', :default => 100)
+    Mig.change_column(:foo, :bar, :integer, :using => '100', :default => {
+      :expression => '1 + 1'
+    })
+
+    Mig.change_column(:foo, :bar, :integer, :null => false, :using => '100', :default => {
+      :expression => '1 + 1'
+    })
+
+    assert_equal([
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" TYPE integer USING 100},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" SET DEFAULT 100},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" TYPE integer USING 100},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" SET DEFAULT 1 + 1;},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" TYPE integer USING 100},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" SET DEFAULT 1 + 1;},
+      %{UPDATE "foo" SET "bar" = 1 + 1 WHERE "bar" IS NULL},
+      %{ALTER TABLE "foo" ALTER "bar" SET NOT NULL},
+    ], statements)
+  end
+
   def test_change_column_with_expression
     Mig.change_column(:foo, :bar, :integer, :default => 100)
     Mig.change_column(:foo, :bar, :integer, :default => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgresql-extensions
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A whole bunch of extensions the ActiveRecord PostgreSQL adapter.