foreigner 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53d6f236ea03953ecaa96a130900e955fbb6835
-  data.tar.gz: c97abd90d8c7cc6b85868b06d52e6744ad9ff220
+  metadata.gz: 9659be7bd66b453f51a66ce111a04948edd03019
+  data.tar.gz: 1690901601fc8957e2bf57bad7c9ea7403c82733
 SHA512:
-  metadata.gz: 215f8987ede00716f3e3335d4db4cb5cb353cdfe599b4b2c40b8e138a491bde1638a03dc51417bb3741733915f1ecdc5480bcb7d983b5582a46f66ff3fa4782e
-  data.tar.gz: c21f84ba666b4aabb79ea0e8f42f2e98fb9dbae0cf2a3c94cb296d12e38dafedef66e51920fab8b0a09cda722f5b394b17ae68934899493fd0ae60efd719d3cb
+  metadata.gz: ffd1cd048c62f8711d3f552f1bab29a9b8fe9585160804f5a8de4b3cb032f3cc45a30d05451ab8b1156ec65fee0dc58f7e1feb831999e7591c0c3dab75e6ca9f
+  data.tar.gz: 41230bd111817bcb7ac80b20377c8945f7975fdc4e54a9757f1de2a0cc38b19b9d9002461600bd18aa5e9cc8a0c98951e5008aa2e83f9693524c7ed783233f9a

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/lib/foreigner/helper.rb

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

data/lib/foreigner/schema_dumper.rb

@@ -42,6 +42,10 @@ module Foreigner
 
     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 Foreigner::Helper.active_record_version == '4.1.9'
       @connection.tables.sort.each do |table|
         next if ['schema_migrations', ignore_tables].flatten.any? do |ignored|
           case ignored

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("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.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-10 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