lol_dba 1.6.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d22c2c708f37f6cc0d362a4f14a5cc793f7500a
-  data.tar.gz: 40ef7243e0925d1cf8f6578ba17cf828954303ce
+  metadata.gz: 0ba7fdc2c7953969c50ccd82353b9e9162b6e21c
+  data.tar.gz: 4e15e8ce2c0c07dd96a8cbd29a6eac62b06fe117
 SHA512:
-  metadata.gz: 53602c33e18f3660ec3ec01741edf97dd5a328cb524e5651cad67eae4483e8402178bf745aa5e40e158451971bd416c19098381b80855355d467d3d9c7af4b72
-  data.tar.gz: d3de40d77b479e81d8523389a1b4e668b11706997113bfd4a67f0421c898ed25cfc410aa652b254bc8c072ab2f528cbed9e4485dd82222155d0853d8699fcf17
+  metadata.gz: e05dbb7d70f02e178a53a28014b3bd0ca56be77bde892512e8b6f4e124e4c25853548f44bbb4a531a7c1545d69c7925c9986b67ef3b881d547a056bbfa020afc
+  data.tar.gz: 0b005f850e1dc737e699c9052591c0a4e54454a3cda1deac9680e79f94384f332c2ff4ad271726e6721001e0ad4bfc1eeaff0908507b54f0946b78c891a2c840

data/Gemfile

@@ -3,5 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 gem "rails"
-gem "rspec-rails", "~> 3.0.0"
+gem "rspec-rails"
+gem "test-unit"
 gem "sqlite3"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lol_dba (1.6.6)
+    lol_dba (1.6.7)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)
@@ -96,22 +96,23 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-rails (3.0.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -137,6 +138,6 @@ DEPENDENCIES
   appraisal (~> 1.0)
   lol_dba!
   rails
-  rspec-rails (~> 3.0.0)
+  rspec-rails
   sqlite3
-  test-unit (~> 3.0)
+  test-unit

data/README.md

@@ -41,7 +41,7 @@ Use it the same way you use other rake commands
 
 ### Compatibility
 
-Compatible with Ruby 2.x and Rails 4.x (for now, we still support Ruby 1.9 and Rails 3.x).
+Compatible with Ruby 2.x and Rails 3.x, 4.x.
 
 ### About primary_key
 

data/gemfiles/rails_3_2.gemfile

@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails"
-gem "rspec-rails", "~> 3.0.0"
+gem "rspec-rails"
+gem "test-unit"
 gem "sqlite3"
 gem "activerecord", "~> 3.2.21"
 gem "actionpack", "~> 3.2.21"

data/gemfiles/rails_3_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.6)
+    lol_dba (1.6.7)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)
@@ -121,6 +121,6 @@ DEPENDENCIES
   lol_dba!
   rails
   railties (~> 3.2.21)
-  rspec-rails (~> 3.0.0)
+  rspec-rails
   sqlite3
-  test-unit (~> 3.0)
+  test-unit

data/gemfiles/rails_4_0.gemfile

@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails"
-gem "rspec-rails", "~> 3.0.0"
+gem "rspec-rails"
+gem "test-unit"
 gem "sqlite3"
 gem "activerecord", "~> 4.0.13"
 gem "actionpack", "~> 4.0.13"

data/gemfiles/rails_4_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.6)
+    lol_dba (1.6.7)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)
@@ -109,6 +109,6 @@ DEPENDENCIES
   lol_dba!
   rails
   railties (~> 4.0.13)
-  rspec-rails (~> 3.0.0)
+  rspec-rails
   sqlite3
-  test-unit (~> 3.0)
+  test-unit

data/gemfiles/rails_4_1.gemfile

@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails"
-gem "rspec-rails", "~> 3.0.0"
+gem "rspec-rails"
+gem "test-unit"
 gem "sqlite3"
 gem "activerecord", "~> 4.1.9"
 gem "actionpack", "~> 4.1.9"

data/gemfiles/rails_4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.6)
+    lol_dba (1.6.7)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)
@@ -115,6 +115,6 @@ DEPENDENCIES
   lol_dba!
   rails
   railties (~> 4.1.9)
-  rspec-rails (~> 3.0.0)
+  rspec-rails
   sqlite3
-  test-unit (~> 3.0)
+  test-unit

data/gemfiles/rails_4_2.gemfile

@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails"
-gem "rspec-rails", "~> 3.0.0"
+gem "rspec-rails"
+gem "test-unit"
 gem "sqlite3"
 gem "activerecord", "~> 4.2.0"
 gem "actionpack", "~> 4.2.0"

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.6)
+    lol_dba (1.6.7)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)
@@ -140,6 +140,6 @@ DEPENDENCIES
   lol_dba!
   rails
   railties (~> 4.2.0)
-  rspec-rails (~> 3.0.0)
+  rspec-rails
   sqlite3
-  test-unit (~> 3.0)
+  test-unit

data/lib/lol_dba.rb

@@ -18,10 +18,10 @@ EOM
   end
 
   def self.get_through_foreign_key(target_class, reflection_options)
-    if target_class.reflections[reflection_options.options[:through].to_s]
-      # has_many :through
-      reflection = target_class.reflections[reflection_options.options[:through].to_s]
-    else
+    # has_many :through
+    reflection = target_class.reflections[reflection_options.options[:through].to_s]
+
+    unless reflection
       # has_and_belongs_to_many
       reflection = reflection_options
     end
@@ -85,22 +85,25 @@ EOM
 
     model_classes.each do |class_name|
       unless class_name.descends_from_active_record?
-        @index_migrations[class_name.base_class.table_name] += [[class_name.inheritance_column, class_name.base_class.primary_key].sort] unless @index_migrations[class_name.base_class.table_name].include?([class_name.inheritance_column, class_name.base_class.primary_key].sort)
+        index_name = [class_name.inheritance_column, class_name.base_class.primary_key].sort
+        @index_migrations[class_name.base_class.table_name] += [index_name]
       end
-      class_name.reflections.each_pair do |reflection_name, reflection_options|
+      reflections = class_name.reflections.stringify_keys
+      reflections.each_pair do |reflection_name, reflection_options|
         begin
+          index_name = ""
           case reflection_options.macro
           when :belongs_to
             # polymorphic?
-            @table_name = class_name.table_name.to_s
-            if reflection_options.options.has_key?(:polymorphic) && (reflection_options.options[:polymorphic] == true)
+            table_name = class_name.table_name
+            if reflection_options.options[:polymorphic]
               poly_type = "#{reflection_options.name.to_s}_type"
               poly_id = "#{reflection_options.name.to_s}_id"
 
-              @index_migrations[@table_name] += [[poly_type, poly_id].sort] unless @index_migrations[@table_name].include?([poly_type, poly_id].sort)
+              index_name = [[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] += [foreign_key.to_s] unless @index_migrations[@table_name].include?(foreign_key) || reflection_options.options.include?(:class)
+              index_name = foreign_key.to_s
             end
           when :has_and_belongs_to_many
             table_name = reflection_options.options[:join_table] ||= [class_name.table_name, reflection_name.to_s].sort.join('_')
@@ -109,12 +112,11 @@ EOM
 
             foreign_key = get_through_foreign_key(class_name, reflection_options)
 
-            composite_keys = [association_foreign_key, foreign_key].sort
-            @index_migrations[table_name.to_s] += [composite_keys] unless @index_migrations[table_name].include?(composite_keys)
+            index_name = [association_foreign_key, foreign_key].sort
           when :has_many
             # has_many tables are threaten by the other side of the relation
             next unless reflection_options.options[:through]
-            through_class = class_name.reflections.stringify_keys[reflection_options.options[:through].to_s].klass
+            through_class = reflections[reflection_options.options[:through].to_s].klass
             table_name = through_class.table_name
 
             foreign_key = get_through_foreign_key(class_name, reflection_options)
@@ -124,18 +126,18 @@ EOM
               association_foreign_key = get_through_foreign_key(association_class, reflection_options)
             else
               # go to joining model through has_many and find belongs_to
-              blg_to_reflection = class_name.reflections.stringify_keys[reflection_options.options[:through].to_s]
-              blg_to_class = blg_to_reflection.class_name.constantize
-
-              # get foreign_key from belongs_to
-              association_foreign_key = blg_to_class.reflections.stringify_keys[reflection_name.to_s.singularize.to_s].options[:foreign_key]
+              association_foreign_key = through_class.reflections.stringify_keys[reflection_name.singularize].options[:foreign_key]
             end
 
             #FIXME currently we don't support :through => :another_regular_has_many_and_non_through_relation
             next if association_foreign_key.nil?
-            composite_keys = [association_foreign_key.to_s, foreign_key.to_s].sort
-            @index_migrations[table_name] += [composite_keys] unless @index_migrations[table_name].include?(composite_keys)
+            index_name = [association_foreign_key.to_s, foreign_key.to_s].sort
           end
+
+          unless index_name == "" || reflection_options.options.include?(:class)
+            @index_migrations[table_name] += [index_name]
+          end
+
         rescue Exception => e
           puts "Some errors here:"
           puts "Please, create an issue with the following information here https://github.com/plentz/lol_dba/issues:"

data/lib/lol_dba/version.rb

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

data/lol_dba.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |s|
   s.add_dependency "railties", ">= 3.0", "< 5.0"
 
   s.add_development_dependency "appraisal", "~> 1.0"
-  s.add_development_dependency "test-unit", "~> 3.0"
 end

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ module Rails
   end
 end
 Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require_dependency file }
+
+ActiveRecord::Schema.verbose = false
 load 'fixtures/schema.rb'
 
 root_dir = File.dirname(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Diego Plentz
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,20 +88,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 description: lol_dba is a small package of rake tasks that scan your application models
   and displays a list of columns that probably should be indexed. Also, it can generate
   .sql migration scripts.