sequel_migration_builder 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/sequel/schema/alter_table_operations.rb

@@ -17,12 +17,18 @@ module Sequel
         end.flatten
 
         new_column_names = new_table[:columns].map {|c| c.name }
-        operations += (db_columns.keys - new_column_names).map {|name| DropColumn.new(db_columns[name]) }
+        dropped_columns = db_columns.keys - new_column_names
+
+        operations += dropped_columns.map do |name| 
+          DropColumn.new(db_columns[name])
+        end
 
         db_indexes = db_table[:indexes] || {}
         new_indexes = new_table[:indexes] || {}
 
-        operations += (db_indexes.keys - new_indexes.keys).map do |index_name|
+        operations += (db_indexes.keys - new_indexes.keys).reject do |index_name|
+          db_indexes[index_name][:columns].size == 1 && dropped_columns.include?(db_indexes[index_name][:columns].first)
+        end.map do |index_name|
           DropIndex.new(index_name, 
                         db_indexes[index_name][:columns],
                         db_indexes[index_name][:unique])

data/sequel_migration_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_migration_builder}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-08-09}
   s.description = %q{Build Sequel Migrations based on the differences between two schemas}
   s.email = %q{roland.swingler@gmail.com}
   s.extra_rdoc_files = [

data/spec/alter_table_operations_spec.rb

@@ -113,6 +113,17 @@ describe "Sequel::Schema::AlterTableOperations.build" do
     ops.size.should == 1
     ops.first.should be_kind_of(Sequel::Schema::AlterTableOperations::ChangeColumn)
   end
+
+  it "should not output a drop index if the index's column is also removed" do
+    table_a = {:name => :example_table,
+      :indexes => {:foo_idx => {:columns => [:foo]}},
+      :columns => [build_column(:name => :foo, :column_type => :integer)]}
+    table_b = {:name => :example_table, :indexes => {}, :columns => []}
+    ops = Sequel::Schema::AlterTableOperations.build(table_a,table_b)
+
+    ops.size.should == 1
+    ops.first.should be_kind_of(Sequel::Schema::AlterTableOperations::DropColumn)
+  end
 end
 
 describe Sequel::Schema::AlterTableOperations::AddColumn do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Roland Swingler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +01:00
+date: 2010-08-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency