schema_plus 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8894d9c9a340bef4433ef8cdafeda27802aea3d7
-  data.tar.gz: e9f724492b719a928460d071891af9aa98ab2a9e
+  metadata.gz: f00387f0bf66660aab6b1f709a62fce866066d56
+  data.tar.gz: 5ade39b8c3bc992972ee8abbebfd875a5184da5a
 SHA512:
-  metadata.gz: 1959ab185f75834d483af81b45009ea13678528bab3f3fdfa9799cb2a136fac56167a6683e31144fded7e26399b6f02f75bc82951ee937d5b1167a83112874cc
-  data.tar.gz: ef5155047bc0700c50f0a8d8dee7c8632c0c7c7025ea37ee6181801cf59d5aa316bf23856106e67d9d8742173a8726bf3730df25000dc7fdd5077a6c31d85ac1
+  metadata.gz: 4108531c8c1eba2925ceca04f2e40d859f53cbd9c8f32a45630cd4f29435cc593378ea18bbb188cf5bc7f1344ebe840802987b5909bbea63f7ac877bf889b765
+  data.tar.gz: 70f615c970117764694a12739e2fa461a88775fff9e9d969106558cb4c71e994e6a8dd6be8386a31b42d7e4ebf7b277b3bb3b42487d2c79fb3027506cb825032

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Change Log
 
+## 1.8.1
+
+* Bug fix for AR 4.2, spurious add_foreign_key statements at the top of schema dump.  Thanks to [@tovodeverett](https://github.com/tovodeverett) for doing better testing than me!
+
 ## 1.8.0
 
 * Rails 4.2 now supported.  Thanks to [@methodmissing](https://github.com/methodmissing) and [@dimonzozo](https://github.com/dimonzozo)

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -26,11 +26,17 @@ module SchemaPlus
           alias_method_chain :table, :schema_plus
           alias_method_chain :tables, :schema_plus
           alias_method_chain :indexes, :schema_plus
+          alias_method_chain :foreign_keys, :schema_plus if private_method_defined? :foreign_keys
         end
       end
 
       private
 
+      def foreign_keys_with_schema_plus(*)
+        # do nothing.  this overrides AR 4.2's foreign key dumping method, which isn't needed
+        # because we're dong them inline
+      end
+
       def break_fk_cycles #:nodoc:
         strongly_connected_components.select{|component| component.size > 1}.each do |tables|
           table = tables.sort.first

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/spec/schema_dumper_spec.rb

@@ -59,6 +59,13 @@ describe "Schema dump" do
     end
   end
 
+  it "should include foreign_key exactly once" do
+    with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
+      expect(dump_posts.scan(/foreign_key.*yippee"/).length).to eq 1
+    end
+  end
+
+
   it "should sort foreign_key definitions" do
     with_foreign_keys Comment, [ [ :post_id, :posts, :id ], [ :commenter_id, :users, :id ]] do
       expect(dump_schema).to match(/foreign_key.+commenter_id.+foreign_key.+post_id/m)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord