db_leftovers 0.9.1 → 0.9.2

data/README.html

@@ -126,13 +126,13 @@ If you want to add support for something else, just send me a pull request!</li>
 <h2>Contributing to db_leftovers</h2>
 
 <ul>
-<li>Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet</li>
-<li>Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it</li>
-<li>Fork the project</li>
-<li>Start a feature/bugfix branch</li>
-<li>Commit and push until you are happy with your contribution</li>
-<li>Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.</li>
-<li>Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.</li>
+<li>Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.</li>
+<li>Check out the issue tracker to make sure someone hasn't already requested and/or contributed it.</li>
+<li>Fork the project.</li>
+<li>Start a feature/bugfix branch.</li>
+<li>Commit and push until you are happy with your contribution.</li>
+<li>Make be sure to add tests for it. This is important so I don't break it in a future version unintentionally.</li>
+<li>Please try not to mess with the Rakefile, version, or history. If you want to have your own version, that is fine, but please isolate that change to its own commit so I can cherry-pick around it.</li>
 </ul>
 
 <h2>Copyright</h2>

data/README.md

@@ -124,13 +124,13 @@ Known Issues
 Contributing to db\_leftovers
 -----------------------------
  
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone hasn't already requested and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make be sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, that is fine, but please isolate that change to its own commit so I can cherry-pick around it.
 
 Copyright
 ---------

data/TODO

@@ -1,19 +1,3 @@
-- Abbreviated notation for conventional foreign keys:
-
-      table :books do
-        foreign_key :authors
-        foreign_key :publishers, :on_delete => :cascade
-
-        # and with a funny FK column but implicit PK of 'id':
-
-        foreign_key :ghost_writer_id, :authors, :on_delete => :cascade
-      end
-
-  In other words, the params are foreign_key(from_table, [from_column], to_table, [to_column], [opts]).
-
-
-- Print the actual WHERE-clause/CHECK expression used by postgres whenever the index/constraint is created (even the first time).
-
 - Refactor DatabaseInterface so all methods are instance methods and Definition/DSL uses an instance, set according to the Rails database adapter and also settable to a test subclass, so we can change the definition from test to test.
 
 - Add optional tests that use a real Postgres/MySQL/SQLite if available.

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/db_leftovers.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "db_leftovers"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul A. Jungwirth"]

data/lib/db_leftovers/dsl.rb

@@ -80,22 +80,10 @@ module DBLeftovers
           when STATUS_CHANGED
             @db.execute_drop_index(idx.table_name, idx.index_name)
             @db.execute_add_index(idx)
-            if idx.where_clause
-              # NB: This is O(n*m) where n is your indexes and m is your indexes with WHERE clauses.
-              #     But it's hard to believe it matters:
-              new_idx = @db.lookup_all_indexes[truncate_index_name(idx.index_name)]
-              puts "Dropped & re-created index: #{idx.index_name} on #{idx.table_name} WHERE #{new_idx.where_clause}"
-            else
-              puts "Dropped & re-created index: #{idx.index_name} on #{idx.table_name}"
-            end
+            log_new_index(idx, true)
           when STATUS_NEW
             @db.execute_add_index(idx)
-            if idx.where_clause
-              new_idx = @db.lookup_all_indexes[truncate_index_name(idx.index_name)]
-              puts "Created index: #{idx.index_name} on #{idx.table_name} WHERE #{new_idx.where_clause}"
-            else
-              puts "Created index: #{idx.index_name} on #{idx.table_name}"
-            end
+            log_new_index(idx, false)
           end
           @new_indexes[truncate_index_name(idx.index_name)] = table_name
         end
@@ -149,14 +137,10 @@ module DBLeftovers
           when STATUS_CHANGED
             @db.execute_drop_constraint(chk.constraint_name, chk.on_table)
             @db.execute_add_constraint(chk)
-            # NB: This is O(n^2) where n is your check constraints.
-            #     But it's hard to believe it matters:
-            new_chk = @db.lookup_all_constraints[chk.constraint_name]
-            puts "Dropped & re-created CHECK constraint: #{chk.constraint_name} on #{chk.on_table} as #{new_chk.check}"
+            log_new_constraint(chk, true)
           when STATUS_NEW
             @db.execute_add_constraint(chk)
-            new_chk = @db.lookup_all_constraints[chk.constraint_name]
-            puts "Created CHECK constraint: #{chk.constraint_name} on #{chk.on_table} as #{new_chk.check}"
+            log_new_constraint(chk, false)
           end
           @new_constraints[chk.constraint_name] = chk
         end
@@ -173,6 +157,25 @@ module DBLeftovers
 
     private
 
+    def log_new_index(idx, altered=false)
+      did_what = altered ? "Dropped & re-created" : "Created"
+      if idx.where_clause
+        # NB: This is O(n*m) where n is your indexes and m is your indexes with WHERE clauses.
+        #     But it's hard to believe it matters:
+        new_idx = @db.lookup_all_indexes[truncate_index_name(idx.index_name)]
+        puts "#{did_what} index: #{idx.index_name} on #{idx.table_name} WHERE #{new_idx.where_clause}"
+      else
+        puts "#{did_what} index: #{idx.index_name} on #{idx.table_name}"
+      end
+    end
+
+    def log_new_constraint(chk, altered=false)
+      # NB: This is O(n^2) where n is your check constraints.
+      #     But it's hard to believe it matters:
+      new_chk = @db.lookup_all_constraints[chk.constraint_name]
+      puts "#{altered ? "Dropped & re-created" : "Created"} CHECK constraint: #{chk.constraint_name} on #{chk.on_table} as #{new_chk.check}"
+    end
+
     def add_index(idx)
       t = (@indexes_by_table[idx.table_name] ||= [])
       t << idx

data/spec/db_leftovers_spec.rb

@@ -16,6 +16,18 @@ class DBLeftovers::DatabaseInterface
     @@sqls << DBLeftovers::DatabaseInterface.normal_whitespace(sql)
   end
 
+  alias :old_execute_add_index :execute_add_index
+  def execute_add_index(idx)
+    old_execute_add_index(idx)
+    @@indexes[idx.index_name] = idx
+  end
+
+  alias :old_execute_add_constraint :execute_add_constraint
+  def execute_add_constraint(chk)
+    old_execute_add_constraint(chk)
+    @@constraints[chk.constraint_name] = chk
+  end
+
   def self.saw_sql(sql)
     # puts sqls.join("\n\n\n")
     # Don't fail if only the whitespace is different:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_leftovers
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 712708189
+      hash: 269207025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: