mini_record 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e4dc06c60db297bde1fa28fc64dc5e05c33a7d8
-  data.tar.gz: cd4c70eb0948b45cc0320e9909f5db4285815a74
+  metadata.gz: ea0ce6ed20bb680e42d5f368b217d35da8cc604f
+  data.tar.gz: 8e8c428ebb7757f08d9cbe6a58eb26e298305668
 SHA512:
-  metadata.gz: 0b892d72b036a1d9be13cb12a49da31bc6242e15039260f9a449c8bb11ba961a9b4e88dfadff1fd294a8c741b3502b82aa591f10ed158d50ad719516c30b61cb
-  data.tar.gz: 0f7d088dc27778e79096f6a3ccc8ae6a43d9c97ae09bc34463df241da8a8e7a648fb7d50d7a0ba6963015895ace7ec790a1e183ea71acc4ec93af9c71ba6d199
+  metadata.gz: 3c1802bb520244e113e46d475c87af7424f1e295238a8cc931afc2357a5dc9a46c2903f44885fb2000b1538a3f4904a60c87d09d178faf34de2c959d88bdca74
+  data.tar.gz: cd615e68bd67c671e49ba836a36a619a4cdd70d7c5c2fbbfbe532f62ec7fce382d9a24167fde115b791ceabd4970557548b06cb0ae8b82729188d11d6ffdaca9

data/Gemfile

@@ -7,6 +7,7 @@ gem 'sqlite3'
 gem 'mysql2'
 gem 'mysql'
 gem 'pg'
+gem 'activerecord', '<= 3.2'
 
 group :test do
   gem 'foreigner', '>= 1.4.2'

data/README.md

@@ -98,6 +98,9 @@ end
 ```
 The same as in the previous case, but foreign key will be added to the database with help of [foreigner](https://github.com/matthuhiggins/foreigner) gem.
 
+To remove the key please use :foreign => false
+If you simple remove the index, the foreign key will not be removed.
+
 #### belongs_to (polymorphic)
 ```ruby
 class Address < ActiveRecord::Base

data/lib/mini_record/auto_schema.rb

@@ -120,16 +120,20 @@ module MiniRecord
         end
       end
 
-      # Remove foreign keys for indexes without :foreign=>true option
-      def remove_foreign_keys
+      def foreign_keys
         # fk cache to minimize quantity of sql queries
-        @foreign_keys = connection.foreign_keys(table_name)
+        @foreign_keys ||= {}
+        @foreign_keys[:table_name] ||= connection.foreign_keys(table_name)
+      end
+
+      # Remove foreign keys for indexes with :foreign=>false option
+      def remove_foreign_keys
         indexes.each do |name, options|
-          unless options[:foreign]
-            foreign_key = @foreign_keys.detect { |fk| fk.options[:column] == options[:column].to_s }
+          if options[:foreign]==false
+            foreign_key = foreign_keys.detect { |fk| fk.options[:column] == options[:column].to_s }
             if foreign_key
               connection.remove_foreign_key(table_name, :name => foreign_key.options[:name])
-              @foreign_keys.delete(foreign_key)
+              foreign_keys.delete(foreign_key)
             end
           end
         end
@@ -140,10 +144,10 @@ module MiniRecord
         indexes.each do |name, options|
           if options[:foreign]
             column = options[:column].to_s
-            unless @foreign_keys.detect { |fk| fk[:options][:column] == column }
-              to_table = (reflect_on_all_associations.detect { |a| a.foreign_key==column }).table_name
+            unless foreign_keys.detect { |fk| fk[:options][:column] == column }
+              to_table = reflect_on_all_associations.detect { |a| a.foreign_key.to_s==column }.table_name
               connection.add_foreign_key(table_name, to_table, options)
-              @foreign_keys << { :options=> { :column=>column } }
+              foreign_keys << { :options=> { :column=>column } }
             end
           end
         end

data/lib/mini_record/version.rb

@@ -1,3 +1,3 @@
 module MiniRecord
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

data/test/test_mini_record.rb

@@ -226,6 +226,7 @@ describe MiniRecord do
   end
 
   describe 'relation #belongs_to' do
+
     it 'creates a column and index based on relation' do
       Article.create(:title => 'Hello', :publisher_id => 1)
       Article.first.tap do |a|
@@ -356,6 +357,7 @@ describe MiniRecord do
       Object.send(:remove_const, :Book)
       class Book < ActiveRecord::Base
         belongs_to :publisher
+         index :publisher_id, :foreign => false
       end
       Book.auto_upgrade!
 
@@ -379,7 +381,7 @@ describe MiniRecord do
       Object.send(:remove_const, :Book)
       class Book < ActiveRecord::Base
         belongs_to :publisher
-        index :publisher_id, :name => 'my_super_publisher_id_fk'
+        index :publisher_id, :name => 'my_super_publisher_id_fk', :foreign => false
       end
       Book.auto_upgrade!
 
@@ -404,6 +406,7 @@ describe MiniRecord do
       Object.send(:remove_const, :Book)
       class Book < ActiveRecord::Base
         belongs_to :second_publisher, :foreign_key => 'second_publisher_id', :class_name => 'Publisher'
+        index :second_publisher_id, :foreign => false
       end
       Book.auto_upgrade!
 
@@ -575,5 +578,4 @@ describe MiniRecord do
     assert_equal 2, Foo.db_fields[:currency].scale
     assert_equal 4, Foo.db_fields[:currency].limit
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_record
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Davide D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord