sequel_migration_builder 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sequel/migration_builder.rb

@@ -101,7 +101,7 @@ module Sequel
     def alter_table_statement(table_name, operations, direction)
       add_line "alter_table #{table_name.inspect} do"
       indent do
-        operations.each {|op| add_line op.__send__(direction) }
+        operations.map {|op| op.__send__(direction) }.compact.each {|op| add_line op }
       end
       add_line "end"
     end

data/lib/sequel/schema/alter_table_operations.rb

@@ -26,18 +26,26 @@ module Sequel
         db_indexes = db_table[:indexes] || {}
         new_indexes = new_table[:indexes] || {}
 
-        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|
+        operations += (db_indexes.keys - new_indexes.keys).map do |index_name|
+          dropped_column = db_indexes[index_name][:columns].size == 1 && dropped_columns.include?(db_indexes[index_name][:columns].first)
+
           DropIndex.new(index_name, 
                         db_indexes[index_name][:columns],
-                        db_indexes[index_name][:unique])
+                        db_indexes[index_name][:unique],
+                        ! dropped_column)
         end
 
         operations += (new_indexes.keys - db_indexes.keys).map do |index_name|
+          if new_indexes[index_name][:columns].kind_of?(Symbol)
+            dropped_column = dropped_columns.include?(new_indexes[index_name][:columns])
+          else
+            dropped_column = new_indexes[index_name][:columns].size == 1 && dropped_columns.include?(new_indexes[index_name][:columns].first)
+          end
+
           AddIndex.new(index_name, 
                        new_indexes[index_name][:columns],
-                       new_indexes[index_name][:unique])
+                       new_indexes[index_name][:unique],
+                       ! dropped_column)
         end
 
         operations
@@ -94,17 +102,21 @@ module Sequel
 
       # Adds an index.
       class AddIndex < Operation
-        def initialize(name, columns, unique)
+        def initialize(name, columns, unique, include_drop_index=true)
           @up   = "add_index #{columns.inspect}, :name => #{name.inspect}"
           @up << ", :unique => true" if unique
-          @down = "drop_index #{columns.inspect}, :name => #{name.inspect}"
+          if include_drop_index
+            @down = "drop_index #{columns.inspect}, :name => #{name.inspect}"
+          end
         end
       end
 
       # Drops an index.
       class DropIndex < Operation
-        def initialize(name, columns, unique)
-          @up = "drop_index #{columns.inspect}, :name => #{name.inspect}"
+        def initialize(name, columns, unique, include_drop_index=true)
+          if include_drop_index
+            @up = "drop_index #{columns.inspect}, :name => #{name.inspect}"
+          end
           @down = "add_index #{columns.inspect}, :name => #{name.inspect}"
           @down << ", :unique => true" if unique
         end

data/sequel_migration_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel_migration_builder}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-13}
   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

@@ -114,15 +114,28 @@ describe "Sequel::Schema::AlterTableOperations.build" do
     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
+  it "should not output a drop index statement in #up 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)
+    ops.last.should be_kind_of(Sequel::Schema::AlterTableOperations::DropIndex)
+    ops.last.up.should be_nil
+    ops.last.down.should == "add_index [:foo], :name => :foo_idx"
+  end
+
+  it "should not output a drop index statement in #down if the index's column is also added" do
+    table_a = {:name => :example_table,
+      :indexes => {},
+      :columns => [build_column(:name => :foo, :column_type => :integer)]}
+    table_b = {:name => :example_table, :indexes => {:foo_idx => {:columns => [:foo]}}, :columns => []}
+    ops = Sequel::Schema::AlterTableOperations.build(table_a,table_b)
+
+    ops.last.should be_kind_of(Sequel::Schema::AlterTableOperations::AddIndex)
+    ops.last.up.should  == "add_index [:foo], :name => :foo_idx"
+    ops.last.down.should be_nil
   end
 end
 

metadata

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