lol_dba 1.5.0 → 1.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b5f965e8e5463841860f579840400ff6a3464c62
+  data.tar.gz: 455fc4389cd58ba70158cfd9f10b14e34500fef0
+SHA512:
+  metadata.gz: 054bfcbe1203ed325c3b3cf07ada9a41410f830f2e18b46c59a5c10b0fe7167691e0143f10dd33f9a2c87f1fb6d2ad8bb15a6b6596073f5e4793958baceebebd
+  data.tar.gz: 836ebb3454366193e65a80b6d40504efec1f06c63a9a011cb8700c100df6eac462429cbc79829f915a166810a77c6ceccd23fef51f23c609fb9fdd42556db356

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 gemfile:

data/Gemfile.lock

@@ -1,72 +1,59 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    diff-lcs (1.2.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    hike (1.2.1)
     i18n (0.6.4)
-    journey (1.0.4)
-    json (1.7.7)
-    multi_json (1.6.1)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
+    rspec-mocks (2.14.1)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     sqlite3 (1.3.7)
-    thor (0.17.0)
-    tilt (1.3.5)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
     tzinfo (0.3.37)
 
 PLATFORMS

data/README.md

@@ -1,32 +1,47 @@
-#lol_dba ![travis](https://api.travis-ci.org/plentz/lol_dba.png?branch=master)
+#lol_dba [![travis](https://api.travis-ci.org/plentz/lol_dba.png?branch=master)](https://travis-ci.org/plentz/lol_dba)
 
 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. Most of the code come from rails_indexes and migration_sql_generator.
 
-### Installation
+### Quick example
 
-Add lol_dba to your Gemfile:
+To use lol_dba in the easiest way possible you have to do two things:
 
-    gem "lol_dba"
+	gem install lol_dba
 
-and install gem
+Then run one of the following commands...
 
-    bundle install
+To display a migration for adding/removing all necessary indexes based on associations:
+
+	lol_dba db:find_indexes
 
-### Usage
+To generate .sql files for your migrations inside db/migrate_sql folder:
 
-Display a migration for adding/removing all necessary indexes based on associations:
+	lol_dba db:migrate_sql # defaults to all migrations
+	lol_dba db:migrate_sql[pending] # only pending migrations
+	lol_dba db:migrate_sql[20120221205526] # generate sql only for migration 20120221205526
 
-    rake db:find_indexes
+### Not-so-quick example
 
-Generate .sql files for all your migrations inside db/migrate_sql folder:
+If you want to use lol_dba with rake, you should do a few more steps:
 
-    rake db:migrate_sql
+Add lol_dba to your Gemfile
 
-Note that create an index in a big database may take a long time.
+    gem "lol_dba"
+
+Run the install command
+
+    bundle install
+
+Use it the same way you use other rake commands
+
+	rake db:find_indexes
+	rake db:migrate_sql # defaults to all migrations
+	rake db:migrate_sql[pending] # only pending migrations
+	rake db:migrate_sql[20120221205526] # generate sql only for migration 20120221205526
 
 ### Compatibility
 
-Compatible with Ruby 1.9 and Rails 3.x. I think.
+Compatible with Ruby 2.x and Rails 4.x (for now, we still support Ruby 1.9 and Rails 3.x).
 
 ### About primary_key
 
@@ -36,8 +51,9 @@ For this reason, we no longer suggest to add indexes to primary keys.
 
 ### Tests
 
-    bundle install
-    rake
+To run lol_dba tests, just clone the repo and run:
+
+    bundle install && rake
 
 to run the tests.
 
@@ -53,6 +69,7 @@ All feedback, bug reports and thoughts on this gratefully received.
 * [Jay Fields](http://jayfields.com/)
 * [Muness Alrubaie](http://muness.blogspot.com/)
 * [Vladimir Sharshov](https://github.com/warpc)
+* [Fabio Rehm](http://fabiorehm.com/)
 
 ### License
 

data/lib/lol_dba.rb

@@ -78,7 +78,7 @@ EOM
 
     model_classes = []
     ObjectSpace.each_object(Module) do |obj|
-      if Class == obj.class && obj != ActiveRecord::Base && obj.ancestors.include?(ActiveRecord::Base) && obj != ActiveRecord::SessionStore::Session
+      if Class == obj.class && obj != ActiveRecord::Base && obj.ancestors.include?(ActiveRecord::Base) && (!defined?(ActiveRecord::SessionStore::Session) || obj != ActiveRecord::SessionStore::Session)
         model_classes << obj
       end
     end

data/lib/lol_dba/cli.rb

@@ -1,14 +1,18 @@
 require 'optparse'
+require 'lol_dba/sql_generator'
 
 module LolDba
   class CLI
 
     class << self
       def start
-        options = {:format => 'migration'}
+        options = {}
         OptionParser.new do |opts|
-          opts.on("-f", '--format=[FORMAT]', 'Specify the format to be used (migration or sql), defaults to migration.') { |v| options[:format] = v }
           opts.on('-d', '--debug', 'Show stack traces when an error occurs.') { |v| options[:debug] = v }
+          opts.on_tail("-v", "--version", "Show version") do
+            puts LolDba::VERSION
+            exit
+          end
         end.parse!
         new(Dir.pwd, options).start
       end
@@ -20,34 +24,25 @@ module LolDba
 
     def start
       load_application
-      validate_format!
-      send("generate_#{@options[:format]}")
+      arg = ARGV.first
+      if arg =~ /db:find_indexes/
+        LolDba.simple_migration
+      elsif arg !~ /\[/
+        LolDba::SqlGenerator.generate("all")
+      else
+        which = arg.match(/.*\[(.*)\].*/).captures[0]
+        LolDba::SqlGenerator.generate(which)
+      end
     rescue Exception => e
-      $stderr.puts "Failed: #{e.class}: #{e.message}"
+      $stderr.puts "Failed: #{e.class}: #{e.message}" if @options[:debug]
       $stderr.puts e.backtrace.map { |t| "    from #{t}" } if @options[:debug]
     end
 
     protected
 
-    def validate_format!
-      unless self.respond_to?("generate_#{@options[:format]}")
-        $stderr.puts "Unknown format: #{@options[:format]}"
-        exit 1
-      end
-    end
-
     # Tks to https://github.com/voormedia/rails-erd/blob/master/lib/rails_erd/cli.rb
     def load_application
-      $stderr.puts "Loading application in '#{File.basename(@path)}'..."
       require "#{@path}/config/environment"
     end
-
-    def generate_sql
-      LolDba::SqlGenerator.generate
-    end
-
-    def generate_migration
-      LolDba.simple_migration
-    end
   end
 end

data/lib/lol_dba/sql_generator.rb

@@ -7,13 +7,25 @@ module LolDba
       end
 
       def methods_to_modify
-        [:execute, :do_execute, :rename_column, :change_column, :column_for, :tables, :indexes, :select_all] & connection.class.methods
+        [:execute, :do_execute, :rename_column, :change_column, :column_for, :tables, :indexes, :select_all] & connection.methods
       end
-    
+
       def redefine_execute_methods
         save_original_methods
-        connection.class.send(:define_method, :execute) { |*args| Writer.write(args.first) }
-        connection.class.send(:define_method, :do_execute) { |*args| Writer.write(args.first) }
+        connection.class.send(:define_method, :execute) { |*args|
+          if args.first =~ /SELECT "schema_migrations"."version"/ || args.first =~ /^SHOW/
+            self.orig_execute(*args)
+          else
+            Writer.write(to_sql(args.first, args.last))
+          end
+        }
+        connection.class.send(:define_method, :do_execute) { |*args|
+          if args.first =~ /SELECT "schema_migrations"."version"/ || args.first =~ /^SHOW/
+             self.orig_do_execute(*args)
+          else
+            Writer.write(to_sql(args.first, args.last))
+          end
+        }
         connection.class.send(:define_method, :column_for) { |*args| args.last }
         connection.class.send(:define_method, :change_column) { |*args| [] }
         connection.class.send(:define_method, :rename_column) { |*args| [] }
@@ -31,7 +43,7 @@ module LolDba
         
       def reset_methods
         methods_to_modify.each do |method_name|
-          connection.class.send(:alias_method, method_name, "orig_#{method_name}".to_sym)
+          connection.class.send(:alias_method, method_name, "orig_#{method_name}".to_sym) rescue nil
         end
       end
     
@@ -42,12 +54,29 @@ module LolDba
         reset_methods
       end
     
-      def migrations
-        Dir.glob(File.join(Rails.root, "db", "migrate", '*.rb'))
+      def migrations(which)
+        migrator = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations_path)
+        if which == "all"
+          migrator.migrations.collect { |m| m.filename }
+        elsif which == "pending"
+          pending = migrator.pending_migrations
+          if pending.empty?
+            puts "No pending migrations."
+            exit
+          end
+          migrator.pending_migrations.collect { |m| m.filename }
+        else
+          if migration = migrator.migrations.find {|m| m.version == which.to_i}
+            [migration.filename]
+          else
+            puts "There are no migrations for version #{which}."
+            exit
+          end
+        end
       end
         
-      def generate
-        generate_instead_of_executing { migrations.each { |file| up_and_down(file) } }
+      def generate(which)
+        generate_instead_of_executing { migrations(which).each { |file| up_and_down(file) } }
       end
     
       def up_and_down(file)

data/lib/lol_dba/version.rb

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

data/lib/tasks/lol_dba.rake

@@ -6,9 +6,10 @@ namespace :db do
   task :find_indexes => :environment do
     LolDba.simple_migration
   end
-  desc "Generate .sql files for all your migrations inside db/migrate_sql folder"
-  task :migrate_sql => :environment do
-    LolDba::SqlGenerator.generate
+  desc "Generate .sql files for your migrations inside db/migrate_sql folder"
+  task :migrate_sql, [:which] => :environment do |t, args|
+    args.with_defaults(:which => 'all')
+    LolDba::SqlGenerator.generate(args[:which])
   end
   
 end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ ActiveRecord::Base.establish_connection(
   :database => ":memory:"
 )
 
-class Rails
+module Rails
   def self.root
     "spec/fixtures/"
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Diego Plentz
@@ -13,54 +12,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 description: lol_dba is a small package of rake tasks that scan your application models
@@ -112,28 +105,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/plentz/lol_dba
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib/lol_dba
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A small package of rake tasks to track down missing database indexes and
   generate sql migration scripts
 test_files: