lol_dba 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9641b91bac129bd6c79d4283c72ecaa32dc2f1b
-  data.tar.gz: dcbdfafeb25f68cf9ed8b330994b148e60279d38
+  metadata.gz: ac0b85b66b11cef7a5a9f061f9882e174ebd6873
+  data.tar.gz: dc82fa017c77d78ba1d29e2ab7eea95713f0d7a7
 SHA512:
-  metadata.gz: 865bc86214659eda2e6ad1b588d57904349ffa34af15c99b2b1baec6a1981b7ddce319a4d16d1cf2dd80c06ad5cfdcf0ead04b55e9b80bc44c1d7e212b127b1a
-  data.tar.gz: 6364656d074e6e2029d7fc62658d76026b26258ac3274f12183f291394e2e52e48da751c24d5d85bf881032fb51ed59d048d782dfac5f1d1f8299872d6a7c691
+  metadata.gz: 4104dea3e0f47a9af87cebd86baa446088b2e4bbebceedadfa57f753fa2e55cccd2c47278ae1906d7d77eb7464c8fb70c75c65e4da3f868bbaddec1fc579af6c
+  data.tar.gz: 772690ccc91087cec77b7b2451fdf246638351f3d821b8c581b828bdff64777c9d94847d4d934d8ca9b155a3397b3213f8dd7dedfab6d3a5f4365b576c7a2c2a

data/README.md

@@ -74,6 +74,7 @@ All feedback, bug reports and thoughts on this gratefully received.
 * [Adrian Hooper](https://twitter.com/PaReeOhNos)
 * [Ray Zane](https://github.com/rzane)
 * [Grant Gongaware](https://github.com/ggongaware)
+* [Przemysław “Szeryf” Kowalczyk](https://szeryf.wordpress.com)
 * [Philipp Weissensteiner](http://philippweissensteiner.com)
 
 ### License

data/lib/lol_dba.rb

@@ -28,8 +28,6 @@ EOM
     # Guess foreign key?
     if reflection.options[:foreign_key]
       association_foreign_key = reflection.options[:foreign_key]
-    elsif reflection.options[:class_name]
-      association_foreign_key = reflection.options[:class_name].foreign_key
     else
       association_foreign_key = "#{target_class.name.tableize.singularize}_id"
     end
@@ -99,10 +97,10 @@ EOM
               poly_type = "#{reflection_options.name.to_s}_type"
               poly_id = "#{reflection_options.name.to_s}_id"
 
-              @index_migrations[@table_name.to_s] += [[poly_type, poly_id].sort] unless @index_migrations[@table_name.to_s].include?([poly_type, poly_id].sort)
+              @index_migrations[@table_name] += [[poly_type, poly_id].sort] unless @index_migrations[@table_name].include?([poly_type, poly_id].sort)
             else
               foreign_key = reflection_options.options[:foreign_key] ||= reflection_options.respond_to?(:primary_key_name) ? reflection_options.primary_key_name : reflection_options.foreign_key
-              @index_migrations[@table_name.to_s] += [foreign_key] unless @index_migrations[@table_name.to_s].include?(foreign_key)
+              @index_migrations[@table_name] += [foreign_key.to_s] unless @index_migrations[@table_name].include?(foreign_key) || reflection_options.options.include?(:class)
             end
           when :has_and_belongs_to_many
             table_name = reflection_options.options[:join_table] ||= [class_name.table_name, reflection_name.to_s].sort.join('_')
@@ -111,8 +109,7 @@ EOM
 
             foreign_key = get_through_foreign_key(class_name, reflection_options)
 
-            composite_keys = [association_foreign_key, foreign_key]
-
+            composite_keys = [association_foreign_key, foreign_key].sort
             @index_migrations[table_name.to_s] += [composite_keys] unless @index_migrations[table_name].include?(composite_keys)
           when :has_many
             # has_many tables are threaten by the other side of the relation

data/lib/lol_dba/version.rb

@@ -1,3 +1,3 @@
 module LolDba
-  VERSION = "1.6.5" unless defined? LolDba::VERSION
+  VERSION = "1.6.6" unless defined? LolDba::VERSION
 end

data/spec/associations_index_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Collect indexes based on associations:" do
 
-  let!(:lol_dba){ LolDba.check_for_indexes }
+  let(:lol_dba){ LolDba.check_for_indexes }
   let(:relationship_indexes){ lol_dba[0] }
   let(:warning_messages){ lol_dba[1] }
 
@@ -24,11 +24,17 @@ describe "Collect indexes based on associations:" do
   end
 
   it "find indexes for has_and_belongs_to_many" do
-    expect(relationship_indexes["companies_freelancers"]).to include(["freelancer_id", "company_id"])
+    expect(relationship_indexes["companies_freelancers"]).to include(["company_id", "freelancer_id"])
+    expect(relationship_indexes["companies_freelancers"]).not_to include(["freelancer_id", "company_id"])
   end
 
   it "find indexes for has_and_belongs_to_many with custom join_table, primary and foreign keys" do
-    expect(relationship_indexes["purchases"]).to include(["present_id", "buyer_id"])
+    expect(relationship_indexes["purchases"]).to include(["buyer_id", "present_id"])
+    expect(relationship_indexes["purchases"]).not_to include(["present_id", "buyer_id"])
+  end
+
+  it "find indexes for has_and_belongs_to_many but don't create the left_side index" do
+    expect(relationship_indexes["purchases"]).not_to include("left_side_id")
   end
 
   it "do not add an already existing index" do
@@ -37,6 +43,7 @@ describe "Collect indexes based on associations:" do
 
   it "find indexes for has_many :through" do
     expect(relationship_indexes["billable_weeks"]).to include(["remote_worker_id", "timesheet_id"])
+    expect(relationship_indexes["billable_weeks"]).not_to include(["billable_week_id", "remote_worker_id"])
   end
 
   it "find indexes for has_many :through with source and foreign key" do
@@ -64,7 +71,8 @@ describe "Collect indexes based on associations:" do
 
   it "find indexes, than use custom class name option in association" do
     expect(relationship_indexes["employers_freelancers"]).to be_nil
-    expect(relationship_indexes["companies_freelancers"]).to include(["freelancer_id", "company_id"])
+    expect(relationship_indexes["companies_freelancers"]).to include(["company_id", "freelancer_id"])
+    expect(relationship_indexes["companies_freelancers"]).not_to include(["freelancer_id", "company_id"])
   end
 
 end

data/spec/fixtures/app/models/gift.rb

@@ -3,8 +3,4 @@ class Gift < ActiveRecord::Base
   self.primary_key = :custom_primary_key
   has_and_belongs_to_many :users, :join_table => "purchases", :association_foreign_key => 'buyer_id', :foreign_key => 'present_id'
 
-  def search_all(name, price)
-    Gift.find_all_by_name_and_price(name, price)
-  end
-
-end
+end

data/spec/fixtures/app/models/user.rb

@@ -7,11 +7,4 @@ class User < ActiveRecord::Base
 
   validates_uniqueness_of :name
 
-  def search_via_email(email = "user@domain.com")
-    self.find_by_email(email)
-  end
-
-  def search_via_email_and_name(email, name)
-    self.find_by_email_and_name(email, name)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Diego Plentz