schema_plus_foreign_keys 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd82359f12e9dfcd2ee7413a727637098fa160a3
-  data.tar.gz: c8b86be4f354952b4f64c5681c28336b4c77153a
+  metadata.gz: 18b2164c375e6447f51ff241d12deaa5748736e4
+  data.tar.gz: 0c46ee8eb9792365ae22ecc13ecf305afde81a39
 SHA512:
-  metadata.gz: ac770774c777fbae496152c989b884f613148eefbcc2574a7e0359fa8f95ec34514b58329b965200aa46f3da628ae5b026104bdd6a3f75df0a9e4ea6aff360a4
-  data.tar.gz: fd9687b783c5204c743f9646187751b8f519f1e847326a796cb88817a1a0e79d3d6d63c71cad4b99f15545a6aa820420ea4552cf78c50d7d1e068ddf85ca99ea
+  metadata.gz: b930008367e71b0c7b53771be9974d61e37c5ed8ba2c3a6ec049a41185299656c8126c1f097155b0776d9210c7bf295ea8a5a7e4014df52bbc9a954e87a8de64
+  data.tar.gz: bc1f9db77881d39cc24f418458711b486cabed9a7c3b1d479d1af9eb3ac8fe4ab1129cac8c0efe66938b437a0626e6e1b25ae63cb75637b6bdada084a89d6f7c

data/README.md

@@ -149,6 +149,7 @@ SchemaPlus::ForeignKeys is tested on:
 
 ## History
 
+* 0.1.1 - Cleanup; use (new) core Migration::RenameTable stack rather than monkey patching.
 * 0.1.0 - Initial release, brought over from schema_plus 1.x via 2.0.0.pre*
 
 ## Development & Testing

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract_adapter.rb

@@ -126,29 +126,6 @@ module SchemaPlus::ForeignKeys
         end
 
 
-        # called from individual adpaters, after renaming table from old
-        # name to
-        def rename_foreign_keys(oldname, newname) #:nodoc:
-          foreign_keys(newname).each do |fk|
-            index = indexes(newname).find{|index| index.name == ForeignKeyDefinition.auto_index_name(oldname, fk.column)}
-            begin
-              remove_foreign_key(newname, name: fk.name)
-            rescue NotImplementedError
-              # sqlite3 can't remove foreign keys, so just skip it
-            end
-            # rename the index only when the fk constraint doesn't exist.
-            # mysql doesn't allow the rename (which is a delete & add)
-            # if the index is on a foreign key constraint
-            rename_index(newname, index.name, ForeignKeyDefinition.auto_index_name(newname, index.columns)) if index
-            begin
-              add_foreign_key(newname, fk.to_table, :column => fk.column, :primary_key => fk.primary_key, :name => fk.name.sub(/#{oldname}/, newname), :on_update => fk.on_update, :on_delete => fk.on_delete, :deferrable => fk.deferrable)
-            rescue NotImplementedError
-              # sqlite3 can't add foreign keys, so just skip it
-            end
-          end
-        end
-
-
         #####################################################################
         #
         # The functions below here are abstract; each subclass should

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/foreign_key_definition.rb

@@ -116,10 +116,6 @@ module SchemaPlus::ForeignKeys
           "fk_#{fixup_schema_name(from_table)}_#{Array.wrap(column).join('_and_')}"
         end
 
-        def self.auto_index_name(from_table, column_name)
-          "fk__#{fixup_schema_name(from_table)}_#{Array.wrap(column_name).join('_and_')}"
-        end
-
         def self.fixup_schema_name(table_name)
           # replace . with _
           table_name.to_s.gsub(/[.]/, '_')

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/mysql2_adapter.rb

@@ -14,11 +14,6 @@ module SchemaPlus::ForeignKeys
           super table_name, column_name, type, options
         end
 
-        def rename_table(oldname, newname)
-          super
-          rename_foreign_keys(oldname, newname)
-        end
-
         def remove_foreign_key(*args)
           from_table, to_table, options = normalize_remove_foreign_key_args(*args)
           if options[:if_exists]

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/postgresql_adapter.rb

@@ -6,11 +6,6 @@ module SchemaPlus::ForeignKeys
       # enhancements
       module PostgresqlAdapter
 
-        def rename_table(oldname, newname) #:nodoc:
-          super
-          rename_foreign_keys(oldname, newname)
-        end
-
         def foreign_keys(table_name, name = nil) #:nodoc:
           load_foreign_keys(<<-SQL, name)
         SELECT f.conname, pg_get_constraintdef(f.oid), t.relname

data/lib/schema_plus/foreign_keys/middleware/migration.rb

@@ -15,6 +15,21 @@ module SchemaPlus::ForeignKeys
         end
       end
 
+      module RenameTable
+        def after(env)
+          oldname = env.table_name
+          newname = env.new_name
+          env.connection.foreign_keys(newname).each do |fk|
+            begin
+              env.connection.remove_foreign_key(newname, name: fk.name)
+              env.connection.add_foreign_key(newname, fk.to_table, :column => fk.column, :primary_key => fk.primary_key, :name => fk.name.sub(/#{oldname}/, newname), :on_update => fk.on_update, :on_delete => fk.on_delete, :deferrable => fk.deferrable)
+            rescue NotImplementedError
+              # sqlite3 can't remote or add foreign keys, so just skip it
+            end
+          end
+        end
+      end
+
       module Column
 
         #

data/lib/schema_plus/foreign_keys/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module ForeignKeys
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/schema_plus_foreign_keys.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 0.4"
+  gem.add_dependency "schema_plus_core", "~> 0.5"
   gem.add_dependency "valuable"
 
   gem.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_foreign_keys
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement