foreigner 1.7.0 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7afaa93e891d1a95c671e0703a70c4fbae46eb84
-  data.tar.gz: 8eb8278d682088f6b57aef3962abb224bc4b8727
+  metadata.gz: dd7dbe28f6138244683eb3608d4bac19560dda16
+  data.tar.gz: 584f38f853a0f97d15600e48f7f8b01b4bee182d
 SHA512:
-  metadata.gz: 254c861fe2c7299e1157dc186f25e0649a4724095e6eebde0dcf94b223169f08e4ea3730d97cdca6d67308640138c3f2e92bf07b84d87c67b8a30490236e2133
-  data.tar.gz: a6f39ca36faf91a20d61b76326c47b360891b98adbc3685c02be6d3f52ec070bc74006f84d3d261b0f472462de44e1dd465b2dd7ecea7780ecb6cdfd91fcf60b
+  metadata.gz: 4a61ab89633713aa621dc783ec6a9fa87764e307b2a579f342410a2cadd53013b7dbec3f9034298166cb3d035f866eb58959d312687eb57c1d891f624f306613
+  data.tar.gz: df79723061e8ffe3bc5e11f69728874740ccef05f87c55d6e6fbd870851d569c16b035c9a6287d02da6b08d8ebf647ec01c8e2f21cd1fe7932b4ec4afdfa7d78

data/lib/foreigner/connection_adapters/mysql2_adapter.rb

@@ -26,13 +26,13 @@ module Foreigner
         fk_info.map do |row|
           options = {column: row['column'], name: row['name'], primary_key: row['primary_key']}
 
-          if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .*\)( ON DELETE (CASCADE|SET NULL|RESTRICT))? ?(.*)$/
-            options[:dependent] = case $2
+          if create_table_info =~ /CONSTRAINT #{quote_column_name(row['name'])} FOREIGN KEY .* REFERENCES .*\)(?: ON DELETE (CASCADE|SET NULL|RESTRICT))?(?: (.+?))?,?$/
+            options[:dependent] = case $1
               when 'CASCADE'  then :delete
               when 'SET NULL' then :nullify
               when 'RESTRICT' then :restrict
             end
-            options[:options] = $3 # e.g. ON UPDATE ...
+            options[:options] = $2 # e.g. ON UPDATE ...
           end
           ForeignKeyDefinition.new(table_name, row['to_table'], options)
         end

data/lib/foreigner/helper.rb

@@ -0,0 +1,13 @@
+module Foreigner
+  module Helper
+    def self.active_record_version
+      if ::ActiveRecord.respond_to? :version
+        ActiveRecord.version
+      elsif ::ActiveRecord::VERSION::STRING
+        Gem::Version.new(::ActiveRecord::VERSION::STRING)
+      else
+        raise "Unknown ActiveRecord Version API"
+      end
+    end
+  end
+end

data/lib/foreigner/schema_dumper.rb

@@ -40,8 +40,17 @@ module Foreigner
       module_function :remove_prefix_and_suffix
     end
 
+    def requires_foreigner_load?
+      major, minor, patch = Foreigner::Helper.active_record_version.segments
+      major == 4 && minor == 1 && patch >= 9
+    end
+
     def tables_with_foreign_keys(stream)
       tables_without_foreign_keys(stream)
+      # Ensure Foreigner to be initialized before running foreign_keys.
+      # This is required since schema::load is not initializing the environment
+      # anymore in Rails 4.1.9 (https://github.com/rails/rails/commit/5d6bb89f)
+      stream.puts '  Foreigner.load' if requires_foreigner_load?
       @connection.tables.sort.each do |table|
         next if ['schema_migrations', ignore_tables].flatten.any? do |ignored|
           case ignored

data/lib/foreigner.rb

@@ -33,4 +33,5 @@ Foreigner::Adapter.register 'jdbcpostgresql', 'foreigner/connection_adapters/pos
 Foreigner::Adapter.register 'sqlite3', 'foreigner/connection_adapters/noop_adapter'
 
 require 'foreigner/loader'
+require 'foreigner/helper'
 require 'foreigner/railtie' if defined?(Rails)

data/test/foreigner/connection_adapters/mysql2_adapter_test.rb

@@ -9,6 +9,45 @@ class Foreigner::Mysql2AdapterTest < Foreigner::UnitTest
 
   setup do
     @adapter = Mysql2Adapter.new
+    @adapter.instance_variable_set(:@config, database: 'foo')
+  end
+
+  test 'foreign_keys parsing' do
+    @adapter.expects(:select_all).at_least_once.returns([
+      {'column' => 'foo_id', 'name' => 'foo_bar_foo_id_fk', 'primary_key' => 'id', 'to_table' => 'foo'}
+    ])
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`)\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent:nil, options:nil}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`),\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent:nil, options:nil}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`) ON DELETE CASCADE\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent: :delete, options:nil}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`) ON DELETE CASCADE,\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent: :delete, options:nil}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`) FOO BAR\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent:nil, options:'FOO BAR'}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`) FOO BAR,\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent:nil, options:'FOO BAR'}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`) ON DELETE CASCADE FOO BAR,\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent: :delete, options:'FOO BAR'}),
+                 @adapter.foreign_keys('bar').first
+
+    @adapter.expects(:select_one).returns('Create Table' => "CONSTRAINT `foo_bar_foo_id_fk` FOREIGN KEY (`foo_id`) REFERENCES `foo` (`id`) ON DELETE CASCADE FOO BAR,\n")
+    assert_equal Foreigner::ConnectionAdapters::ForeignKeyDefinition.new('bar', 'foo', {column:"foo_id", name:"foo_bar_foo_id_fk", primary_key:"id", dependent: :delete, options:'FOO BAR'}),
+                 @adapter.foreign_keys('bar').first
   end
 
   test 'remove_foreign_key_sql by table' do
@@ -31,4 +70,4 @@ class Foreigner::Mysql2AdapterTest < Foreigner::UnitTest
       @adapter.remove_foreign_key_sql(:suppliers, column: "ship_to_id")
     )
   end
-end
+end

data/test/foreigner/schema_dumper_test.rb

@@ -11,7 +11,7 @@ class Foreigner::SchemaDumperTest < Foreigner::UnitTest
   class MockSchemaDumper
     cattr_accessor :ignore_tables
 
-    attr_accessor :processed_tables
+    attr_accessor :processed_tables, :stream
     def initialize
       @connection = MockConnection.new
       @processed_tables = []
@@ -21,6 +21,7 @@ class Foreigner::SchemaDumperTest < Foreigner::UnitTest
     end
 
     def foreign_keys(table, stream)
+      self.stream = stream
       processed_tables << table
     end
 
@@ -49,6 +50,15 @@ class Foreigner::SchemaDumperTest < Foreigner::UnitTest
     assert_equal ['bar'].to_set, dumper.processed_tables.to_set
   end
 
+  test '4.1.9 loading error' do
+    Foreigner::Helper.stubs(:active_record_version).returns Gem::Version.new("4.1.9")
+    MockSchemaDumper.ignore_tables = []
+    dumper = MockSchemaDumper.new
+    dumper.tables(StringIO.new)
+
+    assert_match(/Foreigner\.load/, dumper.stream.string)
+  end
+
   test 'removes table name suffix and prefix' do
     begin
       ActiveRecord::Base.table_name_prefix = 'pre_'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreigner
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.4
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -73,6 +73,7 @@ files:
 - lib/foreigner/connection_adapters/noop_adapter.rb
 - lib/foreigner/connection_adapters/postgresql_adapter.rb
 - lib/foreigner/connection_adapters/sql2003.rb
+- lib/foreigner/helper.rb
 - lib/foreigner/loader.rb
 - lib/foreigner/migration/command_recorder.rb
 - lib/foreigner/railtie.rb
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: foreigner
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreign Keys for Rails