lol_dba 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24c219f8ce04a75238a85eb0706313076d2dd98
-  data.tar.gz: d3ea7d52f43f8cefa74a32d620da535bffdac8f3
+  metadata.gz: 095775b96e5bc0e22e261e1e55fc03d3f2c0dc94
+  data.tar.gz: 84ae3baeef1d90f247acde65f52518d3b2c4079d
 SHA512:
-  metadata.gz: 3497f9a65fbea82c2daa969811de3db7ed0ddebcfe785cdef85f04916a7193ccd2da5ffaca189dc9af2201680e13837242bc7bf8bdc7a2ab111f759e495ce57a
-  data.tar.gz: 6a506f4800a9db20ffbd4747da8c09432749d62f4fd2be58ff0adf26c0ec367ed69641344dd7210d1e32c023c836061df1a1efb93dc58f60ba2be1cea5f17b24
+  metadata.gz: 38aa20f992b87c89f3635dbded75b1236f09872a68f1c25268328fb5fb1b6acb5dd69fd428c7021759b3df8cd9613fe9afb871c6a253835d64762ea94f4b1c37
+  data.tar.gz: 481dfd01822e773ae806f85654a99e7bddf32fd60827cb60a133fd02edf61bc8cef9d6d0ee7735ba8dc639d4d31ca43019d0c0f80f18e01b4238dab82a9698ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lol_dba (2.1.0)
+    lol_dba (2.1.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)

data/gemfiles/rails_3_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (2.1.0)
+    lol_dba (2.1.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)

data/gemfiles/rails_4_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (2.1.0)
+    lol_dba (2.1.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)

data/gemfiles/rails_4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (2.1.0)
+    lol_dba (2.1.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (2.1.0)
+    lol_dba (2.1.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)

data/gemfiles/rails_5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (2.1.0)
+    lol_dba (2.1.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       railties (>= 3.0)

data/lib/lol_dba.rb

@@ -127,8 +127,9 @@ EOM
             foreign_key = get_through_foreign_key(class_name, reflection_options)
 
             if source = reflection_options.options[:source]
-              association_class = through_class.reflections.stringify_keys[source.to_s].klass
-              association_foreign_key = get_through_foreign_key(association_class, reflection_options)
+              association_reflection = through_class.reflections.stringify_keys[source.to_s]
+              next if association_reflection.options[:polymorphic]
+              association_foreign_key = get_through_foreign_key(association_reflection.klass, reflection_options)
             elsif through_reflections = through_class.reflections.stringify_keys[reflection_name.singularize]
               # go to joining model through has_many and find belongs_to
               association_foreign_key = through_reflections.options[:foreign_key]

data/lib/lol_dba/version.rb

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

data/spec/associations_index_spec.rb

@@ -2,80 +2,88 @@ require 'spec_helper'
 
 describe "Collect indexes based on associations:" do
 
-  let(:lol_dba){ LolDba.check_for_indexes }
-  let(:relationship_indexes){ lol_dba[0] }
-  let(:warning_messages){ lol_dba[1] }
+  before :all do
+    lol_dba = LolDba.check_for_indexes
+    @relationship_indexes = lol_dba[0]
+    @warning_messages = lol_dba[1]
+  end
 
   it "find relationship indexes" do
-    expect(relationship_indexes).not_to be_empty
+    expect(@relationship_indexes).not_to be_empty
 
-    expect(relationship_indexes).to have_key("companies")
-    expect(relationship_indexes).to have_key("companies_freelancers")
-    expect(relationship_indexes).to have_key("addresses")
-    expect(relationship_indexes).to have_key("purchases")
+    expect(@relationship_indexes).to have_key("companies")
+    expect(@relationship_indexes).to have_key("companies_freelancers")
+    expect(@relationship_indexes).to have_key("addresses")
+    expect(@relationship_indexes).to have_key("purchases")
   end
 
   it "find indexes for belongs_to" do
-    expect(relationship_indexes["addresses"]).to include("country_id")
+    expect(@relationship_indexes["addresses"]).to include("country_id")
   end
 
   it "find indexes for polymorphic belongs_to" do
-    expect(relationship_indexes["addresses"]).to include(["addressable_id", "addressable_type"])
+    expect(@relationship_indexes["addresses"]).to include(["addressable_id", "addressable_type"])
   end
 
   it "find indexes for belongs_to with custom foreign key" do
-    expect(relationship_indexes["companies"]).to include("owner_id")
+    expect(@relationship_indexes["companies"]).to include("owner_id")
   end
 
   it "find indexes for has_and_belongs_to_many" do
-    expect(relationship_indexes["companies_freelancers"]).to include(["company_id", "freelancer_id"])
-    expect(relationship_indexes["companies_freelancers"]).not_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(["buyer_id", "present_id"])
+    expect(@relationship_indexes["purchases"]).to include(["buyer_id", "present_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")
+    expect(@relationship_indexes["purchases"]).not_to include("left_side_id")
   end
 
   it "do not add an already existing index" do
-    expect(relationship_indexes["companies"]).not_to include("country_id")
+    expect(@relationship_indexes["companies"]).not_to include("country_id")
   end
 
   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"])
+    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
-    expect(relationship_indexes["complex_billable_week"]).to include(["freelancer_id", "id_complex_timesheet"])
+    expect(@relationship_indexes["complex_billable_week"]).to include(["freelancer_id", "id_complex_timesheet"])
   end
 
   it "do not include wrong class" do
-    expect(relationship_indexes["wrongs"]).to be_nil
-    expect(relationship_indexes["addresses_wrongs"]).to be_nil
+    expect(@relationship_indexes["wrongs"]).to be_nil
+    expect(@relationship_indexes["addresses_wrongs"]).to be_nil
   end
 
   it "have warnings(non-existent table) on test data" do
-    expect(warning_messages).not_to be_empty
-    expect(warning_messages).to match(/\'wrongs\'/)
-    expect(warning_messages).to match(/\'addresses_wrongs\'/)
+    expect(@warning_messages).not_to be_empty
+    expect(@warning_messages).to match(/\'wrongs\'/)
+    expect(@warning_messages).to match(/\'addresses_wrongs\'/)
   end
 
   it "find indexes for STI" do
-    expect(relationship_indexes["users"]).to include(["id", "type"])
+    expect(@relationship_indexes["users"]).to include(["id", "type"])
   end
 
   it "find indexes for STI with custom inheritance column" do
-    expect(relationship_indexes["freelancers"]).to include(["id", "worker_type"])
+    expect(@relationship_indexes["freelancers"]).to include(["id", "worker_type"])
   end
 
   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(["company_id", "freelancer_id"])
-    expect(relationship_indexes["companies_freelancers"]).not_to include(["freelancer_id", "company_id"])
+    expect(@relationship_indexes["employers_freelancers"]).to be_nil
+    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 "HABTM with polymorphic relationship" do
+    expect(@relationship_indexes["favourites"]).to include("user_id")
+    expect(@relationship_indexes["favourites"]).to include(["favourable_id", "favourable_type"])
+    expect(@relationship_indexes["favourites"]).not_to include(["project_id", "user_id"])
+    expect(@relationship_indexes["favourites"]).not_to include(["project_id", "worker_user_id"])
+  end
 end

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

@@ -0,0 +1,6 @@
+class Favourite < ActiveRecord::Base
+
+  belongs_to :user
+  belongs_to :favourable, polymorphic: true
+
+end

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

@@ -0,0 +1,6 @@
+class Project < ActiveRecord::Base
+
+  belongs_to :user
+  has_many :favourites, as: :favourable
+
+end

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

@@ -5,6 +5,10 @@ class User < ActiveRecord::Base
 
   has_and_belongs_to_many :users, join_table: :purchases, association_foreign_key: :present_id, foreign_key: :buyer_id
 
+  has_many :projects
+  has_many :favourites
+  has_many :favourite_projects, through: :favourites, source: :favourable, source_type: 'Project'
+
   validates_uniqueness_of :name
 
 end

data/spec/fixtures/schema.rb

@@ -78,5 +78,14 @@ ActiveRecord::Schema.define do
   create_table "groups", force: :cascade do |t|
   end
 
+  create_table "projects", :force => true do |t|
+    t.column "name", :string
+    t.column "user_id", :integer
+  end
 
+  create_table "favourites", :force => true do |t|
+    t.column "user_id", :integer
+    t.column "favourable_id", :integer
+    t.column "favourable_type", :string
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Diego Plentz
@@ -119,11 +119,13 @@ files:
 - spec/fixtures/app/models/complex_timesheet.rb
 - spec/fixtures/app/models/component.rb
 - spec/fixtures/app/models/country.rb
+- spec/fixtures/app/models/favourite.rb
 - spec/fixtures/app/models/freelancer.rb
 - spec/fixtures/app/models/gift.rb
 - spec/fixtures/app/models/god.rb
 - spec/fixtures/app/models/group.rb
 - spec/fixtures/app/models/group_component.rb
+- spec/fixtures/app/models/project.rb
 - spec/fixtures/app/models/timesheet.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/app/models/worker.rb
@@ -167,11 +169,13 @@ test_files:
 - spec/fixtures/app/models/complex_timesheet.rb
 - spec/fixtures/app/models/component.rb
 - spec/fixtures/app/models/country.rb
+- spec/fixtures/app/models/favourite.rb
 - spec/fixtures/app/models/freelancer.rb
 - spec/fixtures/app/models/gift.rb
 - spec/fixtures/app/models/god.rb
 - spec/fixtures/app/models/group.rb
 - spec/fixtures/app/models/group_component.rb
+- spec/fixtures/app/models/project.rb
 - spec/fixtures/app/models/timesheet.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/app/models/worker.rb