automatic_foreign_key 1.1.5 → 1.1.6

data/README.rdoc

@@ -102,9 +102,9 @@ keys by default. However PostgreSQL users may have fun with that feature.
 === Configuration
 
 For customization purposes create config/initializers/automatic_foreign_key.rb file:
-AutomaticForeignKey.auto_index = true # create indices on FKs by default
-AutomaticForeignKey.on_update = :cascade # cascade as default on_update action
-AutomaticForeignKey.on_delete = :restrtic # restrict as default on_delete action
+    AutomaticForeignKey.auto_index = true # create indices on FKs by default
+    AutomaticForeignKey.on_update = :cascade # cascade as default on_update action
+    AutomaticForeignKey.on_delete = :restrict # restrict as default on_delete action
 
 === Rails 3 compatibility
 

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/automatic_foreign_key.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{automatic_foreign_key}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michał Łomnicki"]
-  s.date = %q{2010-09-07}
+  s.authors = ["Micha\305\202 \305\201omnicki"]
+  s.date = %q{2010-09-13}
   s.description = %q{Automatic Foreign Key automatically generates foreign-key
 constraints when creating tables or adding columns. It uses SQL-92 syntax and as such should be compatible with most databases that support foreign-key constraints.}
   s.email = %q{michal.lomnicki@gmail.com}
@@ -51,7 +51,7 @@ constraints when creating tables or adding columns. It uses SQL-92 syntax and as
   s.homepage = %q{http://github.com/mlomnicki/automatic_foreign_key}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Automatically generate foreign-key constraints when creating tables}
   s.test_files = [
     "spec/schema/schema.rb",
@@ -73,7 +73,7 @@ constraints when creating tables or adding columns. It uses SQL-92 syntax and as
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<redhillonrails_core>, [">= 1.0.4.1"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.2"])
     else

data/lib/automatic_foreign_key/active_record/connection_adapters/table_definition.rb

@@ -5,27 +5,31 @@ module AutomaticForeignKey::ActiveRecord::ConnectionAdapters
   module TableDefinition
     def self.included(base)
       base.class_eval do
-        attr_accessor_with_default :indices, Array.new
         alias_method_chain :column, :automatic_foreign_key
         alias_method_chain :primary_key, :automatic_foreign_key
       end
     end
-
+        
     def primary_key_with_automatic_foreign_key(name, options = {})
       column(name, :primary_key, options)
     end
 
+    def indices
+      @indices ||= []
+    end
+
     def column_with_automatic_foreign_key(name, type, options = {})
       column_without_automatic_foreign_key(name, type, options)
       references = ActiveRecord::Base.references(self.name, name, options)
       if references
         AutomaticForeignKey.set_default_update_and_delete_actions!(options)
         foreign_key(name, references.first, references.last, options) 
-      end
-      index = options.fetch(:index, AutomaticForeignKey.auto_index)
-      if index
-        # append [column_name, index_options] pair
-        self.indices << [name, AutomaticForeignKey.options_for_index(index)]
+        if index = options.fetch(:index, AutomaticForeignKey.auto_index)
+          # append [column_name, index_options] pair
+          self.indices << [name, AutomaticForeignKey.options_for_index(index)]
+        end
+      elsif options[:index]
+        self.indices << [name, AutomaticForeignKey.options_for_index(options[:index])]
       end
       self
     end

data/lib/automatic_foreign_key/active_record/migration.rb

@@ -30,13 +30,16 @@ module AutomaticForeignKey::ActiveRecord
       #
       def add_column(table_name, column_name, type, options = {})
         super
-        index = options.fetch(:index, AutomaticForeignKey.auto_index)
         references = ActiveRecord::Base.references(table_name, column_name, options)
         if references
           AutomaticForeignKey.set_default_update_and_delete_actions!(options)
           add_foreign_key(table_name, column_name, references.first, references.last, options) 
+          if index = options.fetch(:index, AutomaticForeignKey.auto_index)
+            add_index(table_name, column_name, AutomaticForeignKey.options_for_index(index))
+          end
+        elsif options[:index]
+          add_index(table_name, column_name, AutomaticForeignKey.options_for_index(options[:index]))
         end
-        add_index(table_name, column_name, AutomaticForeignKey.options_for_index(index)) if index
       end
 
     end

data/spec/migration_spec.rb

@@ -48,11 +48,15 @@ describe ActiveRecord::Migration do
       @model.should have_index.on(:state)
     end
     
-    it "should auto-create index if specified in global options" do
+    it "should auto-index foreign keys only" do
+      AutomaticForeignKey.auto_index = true
+      create_table(@model,  :user_id => {},
+                            :application_id => { :references => nil },
+                            :state => {})
+      @model.should have_index.on(:user_id)
+      @model.should_not have_index.on(:application_id)
+      @model.should_not have_index.on(:state)
       AutomaticForeignKey.auto_index = nil
-      create_table(@model, :state => {}) 
-      @model.should have_index.on(:state)
-      AutomaticForeignKey.auto_index = false
     end
 
   end
@@ -118,7 +122,7 @@ describe ActiveRecord::Migration do
       end
     end
 
-    it "should auto-create index if specified in global options" do
+    it "should auto-index if specified in global options" do
       AutomaticForeignKey.auto_index = true
       add_column(:post_id, :integer) do
         @model.should have_index.on(:post_id)
@@ -126,6 +130,14 @@ describe ActiveRecord::Migration do
       AutomaticForeignKey.auto_index = false
     end
 
+    it "should auto-index foreign keys only" do
+      AutomaticForeignKey.auto_index = true
+      add_column(:state, :integer) do
+        @model.should_not have_index.on(:state)
+      end
+      AutomaticForeignKey.auto_index = false
+    end
+
     it "should allow to overwrite auto_index options in column definition" do
       AutomaticForeignKey.auto_index = true
       add_column(:post_id, :integer, :index => false) do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redhillonrails_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -37,7 +36,6 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -98,7 +96,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -106,7 +103,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -116,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Automatically generate foreign-key constraints when creating tables