db_leftovers 1.2.0 → 1.3.0

data/README.md

@@ -106,7 +106,7 @@ You can repeat `table` calls for the same table several times if you like. This
 
 Lets you specify one or more tables you'd like db\_leftovers to ignore completely. No objects will be added/removed to these tables. This is useful if you have tables that shouldn't be managed under db\_leftovers.
 
-If you don't call `ignore`, the list of ignored tables defaults to `schema_migrations` and `delayed_jobs`. If you do call `ignore`, you should probably include those in your list. If you do want db\_leftovers to manage those tables, just say `ignore []`.
+If you don't call `ignore`, the list of ignored tables defaults to `schema_migrations` and `delayed_jobs`. If you do call `ignore`, you should probably include those in your list also. If you want db\_leftovers to manage those tables after all, just say `ignore []`.
 
 
 
@@ -194,6 +194,12 @@ Contributing to db\_leftovers
 * 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.
 
+Commands for building/releasing/installing:
+
+* `rake build`
+* `rake install`
+* `rake release`
+
 Copyright
 ---------
 

data/lib/db_leftovers/generic_database_interface.rb

@@ -17,10 +17,12 @@ module DBLeftovers
     def execute_add_index(idx)
       unique = idx.unique? ? 'UNIQUE' : ''
       where = idx.where_clause.present? ? "WHERE #{idx.where_clause}" : ''
+      using = idx.using_clause.present? ? "USING #{idx.using_clause}" : ''
 
       sql = <<-EOQ
         CREATE #{unique} INDEX #{idx.index_name}
         ON #{idx.table_name}
+        #{using}
         (#{idx.column_names.join(', ')})
         #{where}
       EOQ

data/lib/db_leftovers/index.rb

@@ -3,19 +3,21 @@ module DBLeftovers
   # Just a struct to hold all the info for one index:
   class Index
     attr_accessor :table_name, :column_names, :index_name,
-      :where_clause, :unique
+      :where_clause, :using_clause, :unique
 
     def initialize(table_name, column_names, opts={})
       opts = {
         :where => nil,
         :unique => false,
+        :using => nil
       }.merge(opts)
       opts.keys.each do |k|
-        raise "Unknown option: #{k}" unless [:where, :unique, :name].include?(k)
+        raise "Unknown option: #{k}" unless [:where, :unique, :using, :name].include?(k)
       end
       @table_name = table_name.to_s
       @column_names = [column_names].flatten.map{|x| x.to_s}
       @where_clause = opts[:where]
+      @using_clause = opts[:using]
       @unique = !!opts[:unique]
       @index_name = (opts[:name] || choose_name(@table_name, @column_names)).to_s
     end
@@ -29,11 +31,12 @@ module DBLeftovers
       other.column_names == column_names and
       other.index_name == index_name and
       other.where_clause == where_clause and
+      other.using_clause == using_clause and
       other.unique == unique
     end
 
     def to_s
-      "<#{@index_name}: #{@table_name}.[#{column_names.join(",")}] unique=#{@unique}, where=#{@where_clause}>"
+      "<#{@index_name}: #{@table_name}.[#{column_names.join(",")}] unique=#{@unique}, where=#{@where_clause}, using=#{@using_clause}>"
     end
 
     private 

data/lib/db_leftovers/postgres_database_interface.rb

@@ -15,6 +15,7 @@ module DBLeftovers
                   i.relname AS index_name,
                   ix.indisunique AS is_unique,
                   array_to_string(ix.indkey, ',') AS column_numbers,
+                  array_to_string(ix.indclass, ',') AS op_numbers,
                   pg_get_expr(ix.indpred, ix.indrelid) AS where_clause
           FROM    pg_class t,
                   pg_class i,
@@ -33,16 +34,20 @@ module DBLeftovers
                     ix.indexrelid,
                     ix.indrelid,
                     ix.indkey,
+                    ix.indclass,
                     ix.indpred
           ORDER BY t.relname, i.relname
       EOQ
-      @conn.select_rows(sql).each do |indexrelid, indrelid, table_name, index_name, is_unique, column_numbers, where_clause|
+      @conn.select_rows(sql).each do |indexrelid, indrelid, table_name, index_name, is_unique, column_numbers, op_numbers, where_clause|
         where_clause = remove_outer_parens(where_clause) if where_clause
+        index_method = index_method_for_op(op_numbers.split(",").first)
+        index_method = nil if index_method == 'btree'
         ret[index_name] = Index.new(
           table_name,
           column_names_for_index(indrelid, column_numbers.split(",")),
           unique: is_unique == 't',
           where: where_clause,
+          using: index_method,
           name: index_name
         )
       end
@@ -133,6 +138,15 @@ module DBLeftovers
       end
     end
 
+    def index_method_for_op(op_id)
+      @conn.select_value(<<-EOQ)
+          SELECT  am.amname
+          FROM    pg_opclass op, pg_am am
+          WHERE   op.oid = #{op_id}
+          AND     op.opcmethod = am.oid
+      EOQ
+    end
+
     def remove_outer_parens(str)
       str ? str.gsub(/^\((.*)\)$/, '\1') : nil
     end

data/lib/db_leftovers/version.rb

@@ -1,3 +1,3 @@
 module DbLeftovers
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/db_leftovers_spec.rb

@@ -500,4 +500,15 @@ describe DBLeftovers do
     @db.sqls.should have(0).items
   end
 
+  it "should accept `USING` for indexes" do
+    @db.starts_with([], [], [])
+    DBLeftovers::Definition.define :db_interface => @db do
+      index :libraries, :lonlat, using: 'gist'
+    end
+    @db.sqls.should have(1).item
+    @db.should have_seen_sql <<-EOQ
+        CREATE INDEX index_libraries_on_lonlat ON libraries USING gist (lonlat)
+    EOQ
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_leftovers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1094789418074050073
+      hash: 200664402728863992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: