db_leftovers 1.4.0 → 1.4.1

data/Changelog

@@ -1,3 +1,9 @@
+1.4.1
+-----
+
+- Improved feedback so we print the expression on functional indexes
+
+
 1.4.0
 -----
 

data/README.md

@@ -138,7 +138,7 @@ The second time you run db\_leftovers, it will read the expression from Postgres
 and so it will drop and re-create the constraint.
 It will drop and re-create it every time you run the rake task.
 To get around this, make sure your config file uses the same expression as printed by db\_leftovers in the rake output.
-This can also happen for index WHERE clauses, fixable by a similar workaround.
+This can also happen for index WHERE clauses and functional indexes, fixable by a similar workaround.
 MySQL doesn't have this problem because it doesn't support CHECK constraints or index WHERE clauses.
 
 To print messages even about indexes/foreign keys/constraints that haven't changed, you can say:

data/lib/db_leftovers/dsl.rb

@@ -173,14 +173,21 @@ module DBLeftovers
 
     def log_new_index(idx, altered=false)
       did_what = altered ? "Dropped & re-created" : "Created"
-      if idx.where_clause
+
+      msg = "#{did_what} index: #{idx.index_name} on #{idx.table_name}"
+      if idx.index_function 
         # 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[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}"
+        msg = "#{msg}: #{new_idx.index_function}"
       end
+
+      if idx.where_clause
+        new_idx ||= @db.lookup_all_indexes[idx.index_name]
+        msg = "#{msg} WHERE #{new_idx.where_clause}"
+      end
+
+      puts msg
     end
 
     def log_new_constraint(chk, altered=false)

data/lib/db_leftovers/index.rb

@@ -15,8 +15,8 @@ module DBLeftovers
       opts.keys.each do |k|
         raise "Unknown option: #{k}" unless [:where, :function, :unique, :using, :name].include?(k)
       end
-      if column_names.is_a?(String) and opts[:function].nil?
-        opts[:function] = column_names
+      if column_names.is_a?(Array) and column_names[0].is_a?(String) and opts[:function].nil?
+        opts[:function] = column_names[0]
         column_names = []
       end
       @table_name = table_name.to_s
@@ -25,7 +25,7 @@ module DBLeftovers
       @index_function = opts[:function]
       @using_clause = opts[:using]
       @unique = !!opts[:unique]
-      @index_name = (opts[:name] || choose_name(@table_name, @column_names)).to_s
+      @index_name = (opts[:name] || choose_name(@table_name, @column_names, @index_function)).to_s
 
       raise "Indexes need a table!" unless @table_name
       raise "Indexes need at least column or an expression!" unless (@column_names.any? or @index_function)
@@ -52,7 +52,7 @@ module DBLeftovers
 
     private 
 
-    def choose_name(table_name, column_names)
+    def choose_name(table_name, column_names, index_function)
       topic = if column_names.any?
                 column_names.join("_and_")
               else

data/lib/db_leftovers/version.rb

@@ -1,3 +1,3 @@
 module DbLeftovers
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/spec/postgres_spec.rb

@@ -102,7 +102,7 @@ describe DBLeftovers::PostgresDatabaseInterface do
       @db.lookup_all_constraints['books_have_positive_pages'].check.should == 'pages_count > 12'
     end
 
-    it "should allow functional indexes, specified as a string" do
+    it "should allow functional indexes specified as a string" do
       DBLeftovers::Definition.define :db_interface => @db do
         index :authors, 'lower(name)'
       end
@@ -110,7 +110,7 @@ describe DBLeftovers::PostgresDatabaseInterface do
       @db.lookup_all_indexes.keys.sort.should == ['index_authors_on_lower_name']
     end
 
-    it "should allow functional indexes, specified with an option" do
+    it "should allow functional indexes specified with an option" do
       DBLeftovers::Definition.define :db_interface => @db do
         index :authors, [], function: 'lower(name)'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_leftovers
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1649859164079023412
+      hash: -1384874147210537505
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: