lol_dba 1.4.0 → 1.4.1

data/.gitignore

@@ -1,4 +1,4 @@
 .bundle
 .rvmrc
 .DS_Store
-coverage/
+.gem

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'activerecord', :require => 'active_record'
+gem 'activerecord'
 gem 'actionpack'
 gem 'railties'
 gem 'rspec-rails'

data/lib/lol_dba.rb

@@ -6,7 +6,7 @@ module LolDba
 
   def self.form_migration_content(migration_name, index_array)
     migration = <<EOM
-    ## run `rails g migration AddMissingIndexes` and add the following content
+* run `rails g migration AddMissingIndexes` and add the following content:
 
 
     class #{migration_name} < ActiveRecord::Migration
@@ -77,22 +77,17 @@ EOM
     Dir.glob(Rails.root + "app/models/**/*.rb").each {|file| require file }
 
     model_classes = []
-    ActiveRecord::Base.subclasses.each do |klass|
-      if !klass.abstract_class? && klass != ActiveRecord::SessionStore::Session
-        model_classes << klass
+    ObjectSpace.each_object(Module) do |obj|
+      if Class == obj.class && obj != ActiveRecord::Base && obj.ancestors.include?(ActiveRecord::Base) && obj != ActiveRecord::SessionStore::Session
+        model_classes << obj
       end
     end
 
     @index_migrations = Hash.new([])
 
     model_classes.each do |class_name|
-
-      # check if this is an STI child instance
-      #if class_name.base_class.name != class_name.name && (class_name.column_names.include?(class_name.base_class.inheritance_column) || class_name.column_names.include?(class_name.inheritance_column))
-      unless class_name < ActiveRecord::Base
-        # add the inharitance column on the parent table
-        # index migration for STI should require both the primary key and the inheritance_column in a composite index.
-        @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.base_class.inheritance_column].sort)
+      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)
       end
       class_name.reflections.each_pair do |reflection_name, reflection_options|
         begin
@@ -111,7 +106,6 @@ EOM
             end
           when :has_and_belongs_to_many
             table_name = reflection_options.options[:join_table] ||= [class_name.table_name, reflection_name.to_s].sort.join('_')
-            
 
             association_foreign_key = reflection_options.options[:association_foreign_key] ||= "#{reflection_name.to_s.singularize}_id"
 
@@ -124,13 +118,13 @@ EOM
             # has_many tables are threaten by the other side of the relation
             next unless reflection_options.options[:through]
 
-            association_clazz = class_name.reflections[reflection_options.options[:through]].klass
-            table_name = association_clazz.table_name
+            through_class = class_name.reflections[reflection_options.options[:through]].klass
+            table_name = through_class.table_name
 
             foreign_key = get_through_foreign_key(class_name, reflection_options)
 
             if reflection_options.options[:source]
-              association_class = association_clazz.reflections[reflection_options.options[:source]].klass
+              association_class = through_class.reflections[reflection_options.options[:source]].klass
               association_foreign_key = get_through_foreign_key(association_class, reflection_options)
             else
               # go to joining model through has_many and find belongs_to
@@ -152,7 +146,7 @@ EOM
 
             #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]
+            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)
           end
         rescue Exception => e
@@ -184,6 +178,9 @@ EOM
     if indexes.keys.empty?
       puts "Yey, no missing indexes found!"
     else
+      tip = "* TIP: if you have a problem with the index name('index name too long') you can solve with the :name option. "
+      tip += "Something like :name => 'my_index'."
+      puts tip
       add = form_data_for_migration(indexes)
       puts form_migration_content(migration_name, add)
     end

data/lib/lol_dba/version.rb

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

data/spec/associations_index_spec.rb

@@ -2,83 +2,69 @@ require 'spec_helper'
 
 describe "Collect indexes based on associations:" do
 
-  before(:all) do
-    @relationship_indexes, @warning_messages = LolDba.check_for_indexes
-  end
+  let!(:lol_dba){ LolDba.check_for_indexes }
+  let(:relationship_indexes){ lol_dba[0] }
+  let(:warning_messages){ lol_dba[1] }
 
   it "find relationship indexes" do
-    @relationship_indexes.should_not be_empty
+    relationship_indexes.should_not be_empty
 
-    @relationship_indexes.should have_key("companies")
-    @relationship_indexes.should have_key("companies_freelancers")
-    @relationship_indexes.should have_key("addresses")
-    @relationship_indexes.should have_key("purchases")
+    relationship_indexes.should have_key("companies")
+    relationship_indexes.should have_key("companies_freelancers")
+    relationship_indexes.should have_key("addresses")
+    relationship_indexes.should have_key("purchases")
   end
 
   it "find indexes for belongs_to" do
-    @relationship_indexes["addresses"].should include("country_id")
+    relationship_indexes["addresses"].should include("country_id")
   end
 
   it "find indexes for belongs_to with custom foreign key" do
-    @relationship_indexes["companies"].should include("owner_id")
+    relationship_indexes["companies"].should include("owner_id")
   end
 
   it "find indexes for has_and_belongs_to_many" do
-    @relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
+    relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
   end
 
   it "find indexes for has_and_belongs_to_many with custom join_table, primary and foreign keys" do
-    @relationship_indexes["purchases"].should include(["present_id", "buyer_id"])
-  end
-
-  it "find two combinations for the combined index for has_and_belongs_to_many" do
-    @relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
-    @relationship_indexes["companies_freelancers"].should include(["company_id", "freelancer_id"])
-    @relationship_indexes["purchases"].should include(["present_id", "buyer_id"])
-    @relationship_indexes["purchases"].should include(["buyer_id", "present_id"])
+    relationship_indexes["purchases"].should include(["present_id", "buyer_id"])
   end
 
   it "do not add an already existing index" do
-    @relationship_indexes["companies"].should_not include("country_id")
+    relationship_indexes["companies"].should_not include("country_id")
   end
 
   it "find indexes for has_many :through" do
-    @relationship_indexes["billable_weeks"].should include(["remote_worker_id", "timesheet_id"])
+    relationship_indexes["billable_weeks"].should include(["remote_worker_id", "timesheet_id"])
   end
 
   it "find indexes for has_many :through with source and foreign key" do
-    @relationship_indexes["complex_billable_week"].should include(["freelancer_id", "id_complex_timesheet"])
-  end
-
-  it "find two combinations for the combined index for has_many :through" do
-    @relationship_indexes["billable_weeks"].should include(["remote_worker_id", "timesheet_id"])
-    @relationship_indexes["billable_weeks"].should include(["timesheet_id", "remote_worker_id"])
-    @relationship_indexes["complex_billable_week"].should include(["freelancer_id", "id_complex_timesheet"])
-    @relationship_indexes["complex_billable_week"].should include(["id_complex_timesheet", "freelancer_id"])
+    relationship_indexes["complex_billable_week"].should include(["freelancer_id", "id_complex_timesheet"])
   end
 
   it "do not include wrong class" do
-    @relationship_indexes["wrongs"].should be_nil
-    @relationship_indexes["addresses_wrongs"].should be_nil
+    relationship_indexes["wrongs"].should be_nil
+    relationship_indexes["addresses_wrongs"].should be_nil
   end
 
   it "have warnings(non-existent table) on test data" do
-    @warning_messages.should_not be_empty
-    @warning_messages.should =~ /\'wrongs\'/
-    @warning_messages.should =~ /\'addresses_wrongs\'/
+    warning_messages.should_not be_empty
+    warning_messages.should =~ /\'wrongs\'/
+    warning_messages.should =~ /\'addresses_wrongs\'/
   end
 
   it "find indexes for STI" do
-    @relationship_indexes["users"].should include(["id", "type"])
+    relationship_indexes["users"].should include(["id", "type"])
   end
 
   it "find indexes for STI with custom inheritance column" do
-    @relationship_indexes["freelancers"].should include(["id", "worker_type"])
+    relationship_indexes["freelancers"].should include(["id", "worker_type"])
   end
 
   it "find indexes, than use custom class name option in association" do
-    @relationship_indexes["employers_freelancers"].should be_nil
-    @relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
+    relationship_indexes["employers_freelancers"].should be_nil
+    relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
   end
 
-end
+end

data/spec/common_function_spec.rb

@@ -75,9 +75,10 @@ describe "Function puts_migration_content:" do
   end
 
   it "print migration code" do
-     $stdout.should_receive(:puts).with("")
-     $stdout.should_receive(:puts).with(/TestMigration/i)
-     LolDba.puts_migration_content("TestMigration", @relationship_indexes, "")
+    $stdout.should_receive(:puts).with("")
+    $stdout.should_receive(:puts).with(/TIP/)
+    $stdout.should_receive(:puts).with(/TestMigration/i)
+    LolDba.puts_migration_content("TestMigration", @relationship_indexes, "")
   end
 
   it "print warning messages if they exist" do

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

@@ -12,8 +12,3 @@ class Freelancer < ActiveRecord::Base
   has_many :complex_timesheets, :through => :complex_billable_weeks
 
 end
-
-# Check custom STI
-class Worker
-
-end

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

@@ -0,0 +1,5 @@
+
+# Check custom STI
+class Worker < Freelancer
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,6 +103,7 @@ files:
 - spec/fixtures/app/models/god.rb
 - spec/fixtures/app/models/timesheet.rb
 - spec/fixtures/app/models/user.rb
+- spec/fixtures/app/models/worker.rb
 - spec/fixtures/app/models/worker_user.rb
 - spec/fixtures/app/models/wrong.rb
 - spec/fixtures/app/sweepers/user_sweeper.rb
@@ -150,6 +151,7 @@ test_files:
 - spec/fixtures/app/models/god.rb
 - spec/fixtures/app/models/timesheet.rb
 - spec/fixtures/app/models/user.rb
+- spec/fixtures/app/models/worker.rb
 - spec/fixtures/app/models/worker_user.rb
 - spec/fixtures/app/models/wrong.rb
 - spec/fixtures/app/sweepers/user_sweeper.rb