sequel_migration_builder 0.3.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzVhY2M3MmE2YWZmZTk2ZDZhNzhjN2JiOTc0YmQwM2FjOWUwYTRhYg==
+  data.tar.gz: !binary |-
+    ZWRlMDFiMTg1ZWZiNGYyMDQ5YTZkNzVjMWJjZTc5YjVkZWRmZjlkZA==
+SHA512:
+  metadata.gz: !binary |-
+    MjE5OGMyMDA2ZWE5MGZhYmM2MWViNDYwMDVkZjk0YjQ5Nzk5NmYxNDcyZGU5
+    MmM1YTNhNjM1ZmQ4YWUwY2U4NmYzYTg1Y2ZmNmFmNWNlMjlkYTU1YmRkZTA0
+    NTNlNjY5Y2ZkZmQzMWM2YjBhZWQ0ZTk4NGViMTdhMTZlZmFhYWI=
+  data.tar.gz: !binary |-
+    ZTYzMmU1ZGZhMTRiYjY0N2ZhNDU1NTEyNTM3YmQ1MTI2ZjY3NTExYzc3Y2Vh
+    N2Q3MDY3Zjg0YmRkNTY4YWE4NTNjYmZkMTRkMzYzODUxODkxY2VhMTAzMjk2
+    YjcxMGYwYjBjNGE3NjFkMWNiZmM2NGM5ZjQ4Yzc3MzgxOWMyY2Q=

data/Rakefile

@@ -19,32 +19,22 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
   spec.rcov = true
+  spec.rcov_opts = "-x spec/ -x /home"
 end
 
 task :spec => :check_dependencies
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "sequel_migration_builder #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Flog this baby!"
 task :flog do
   sh 'find lib -name "*.rb" | xargs flog'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/sequel/migration_builder.rb

@@ -13,12 +13,16 @@ module Sequel
 
     # Creates a migration builder for the given database.
     #
-    def initialize(db)
+    def initialize(db, options={})
       @db = db
       @db_tables = Schema::DbSchemaParser.for_db(db).parse_db_schema
       @db_table_names = @db.tables
       @indent = 0
       @result = []
+      @separate_alter_table_statements = !!options[:separate_alter_table_statements]
+      # Columns are only added and dropped, never altered. This helps
+      # us support Redshift.
+      @immutable_columns = !!options[:immutable_columns]
     end
 
     # Generates a string of ruby code to define a sequel
@@ -74,10 +78,19 @@ module Sequel
       each_table(current_table_names, tables) do |table_name, table, last_table|
         hsh = table.dup
         hsh[:columns] = hsh[:columns].map {|c| Schema::DbColumn.build_from_hash(c) }
-        operations = Schema::AlterTableOperations.build(@db_tables[table_name], hsh)
+        operations = Schema::AlterTableOperations.
+          build(@db_tables[table_name], hsh, :immutable_columns => @immutable_columns)
         unless operations.empty?
-          alter_table_statement table_name, operations
-          add_blank_line unless last_table
+          all_operations = if @separate_alter_table_statements
+                             operations.map {|o| [o] }
+                           else
+                             [operations]
+                           end
+
+          all_operations.each_with_index do |o, i|
+            alter_table_statement table_name, o
+            add_blank_line unless last_table && i + 1 == all_operations.size
+          end
         end
       end
     end

data/lib/sequel/schema/alter_table_operations.rb

@@ -1,11 +1,15 @@
 module Sequel
   module Schema
     class AlterTableOperations
+      def initialize(options={})
+        @immutable_columns = options[:immutable_columns]
+      end
+
       # Returns an array of operations to change the current database
       # table to be like the defined table.
       #
-      def self.build(db_table, new_table)
-        new.build(db_table, new_table)
+      def self.build(db_table, new_table, options={})
+        new(options).build(db_table, new_table)
       end
 
       def build(db_table, new_table)
@@ -46,10 +50,16 @@ module Sequel
         result = []
         
         diffs = db_column.diff(new_column)
-        result << :change_type_statement    if [:elements, :column_type, :size, :unsigned].any? {|sym| diffs.include?(sym) }
-        # only need to explicitly set the default if we're not changing the column type.
-        result << :change_default_statement if diffs.include?(:default) && result.empty?
-        result << :change_null_statement    if diffs.include?(:null)
+
+        if @immutable_columns && !diffs.empty?
+          result << :drop_statement
+          result << :add_statement
+        else
+          result << :change_type_statement    if [:elements, :column_type, :size, :unsigned].any? {|sym| diffs.include?(sym) }
+          # only need to explicitly set the default if we're not changing the column type.
+          result << :change_default_statement if diffs.include?(:default) && result.empty?
+          result << :change_null_statement    if diffs.include?(:null)
+        end
         
         result.map {|statement| new_column.__send__(statement) }
       end

data/lib/sequel/schema/db_column.rb

@@ -24,7 +24,7 @@ module Sequel
       # can be strings or symbols.
       #
       def self.build_from_hash(attrs={})
-        self.new *members.map {|key| attrs[key] || attrs[key.to_sym] }
+        self.new *members.map {|key| attrs[key.to_s] || attrs[key.to_sym] }
       end
 
       def initialize(*args)

data/sequel_migration_builder.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: sequel_migration_builder 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{sequel_migration_builder}
-  s.version = "0.3.2"
+  s.name = "sequel_migration_builder"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Roland Swingler}]
-  s.date = %q{2012-05-11}
-  s.description = %q{Build Sequel Migrations based on the differences between two schemas}
-  s.email = %q{roland.swingler@gmail.com}
+  s.require_paths = ["lib"]
+  s.authors = ["Roland Swingler"]
+  s.date = "2014-09-01"
+  s.description = "Build Sequel Migrations based on the differences between two schemas"
+  s.email = "roland.swingler@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -37,13 +39,12 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/knaveofdiamonds/sequel_migration_builder}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Build Sequel Migrations based on the differences between two schemas}
+  s.homepage = "http://github.com/knaveofdiamonds/sequel_migration_builder"
+  s.rubygems_version = "2.2.1"
+  s.summary = "Build Sequel Migrations based on the differences between two schemas"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, [">= 3.20.0"])

data/spec/db_column_spec.rb

@@ -114,8 +114,8 @@ describe Sequel::Schema::DbColumn do
   
   it "should be buildable from a Hash" do
     Sequel::Schema::DbColumn.build_from_hash(:name => "foo", 
-                                       :column_type => "integer").column_type.should == "integer"
+                                             :column_type => "integer").column_type.should == "integer"
     Sequel::Schema::DbColumn.build_from_hash('name' => "foo", 
-                                       'column_type' => "integer").name.should == "foo"
+                                             'column_type' => "integer").name.should == "foo"
   end
 end

data/spec/db_schema_parser_spec.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + "/spec_helper"
 
 describe "Sequel::Schema::DbSchemaParser.for_db" do
   it "should return a DbSchemaParser" do
-    Sequel::Schema::DbSchemaParser.for_db(stub(:database)).should \
+    Sequel::Schema::DbSchemaParser.for_db(double(:database)).should \
       be_kind_of(Sequel::Schema::DbSchemaParser)
   end
 end
 
 describe "A hash in the array returned by Sequel::Schema::DbSchemaParser#parse_table_schema" do
   before :each do
-    @parser = Sequel::Schema::DbSchemaParser.for_db(stub(:database))
+    @parser = Sequel::Schema::DbSchemaParser.for_db(double(:database))
     @schema = [[:example_column, 
                 { :type => :integer, 
                   :default => "1", 
@@ -116,7 +116,7 @@ end
 
 describe "Sequel::Schema::DbSchemaParser#parse_db_schema" do
   it "should extract a list of table definitions from a database" do
-    mock_db = mock(:db)
+    mock_db = double(:db)
     mock_db.should_receive(:tables).at_least(:once).and_return([:table1])
     mock_db.should_receive(:schema).with(:table1).and_return([])
     mock_db.should_receive(:indexes).with(:table1, :partial => true)
@@ -130,7 +130,7 @@ end
 
 describe "Parsing a text column" do
   it "should not raise an error because it does not have a size" do
-    parser = Sequel::Schema::DbSchemaParser.for_db(stub(:database))
+    parser = Sequel::Schema::DbSchemaParser.for_db(double(:database))
     schema = [[:example_column, 
                { :type => :string, 
                  :default => nil, 
@@ -145,7 +145,7 @@ end
 
 describe "Parsing an enum column" do
   it "should not raise an error when enum values contains brackets" do
-    parser = Sequel::Schema::DbSchemaParser.for_db(stub(:database))
+    parser = Sequel::Schema::DbSchemaParser.for_db(double(:database))
     schema = [[:example_column, 
                { :type => :enum, 
                  :default => nil, 
@@ -154,11 +154,11 @@ describe "Parsing an enum column" do
                  :db_type => "enum('foo (bar)', 'baz')",
                  :allow_null => true   }]]
 
-    lambda { parser.parse_table_schema(schema) }.should_not raise_error(SyntaxError)
+    lambda { parser.parse_table_schema(schema) }.should_not raise_error
   end
 
   it "should correctly parse elements with escaped '' in them" do
-    parser = Sequel::Schema::DbSchemaParser.for_db(stub(:database))
+    parser = Sequel::Schema::DbSchemaParser.for_db(double(:database))
     schema = [[:example_column, 
                { :type => :enum, 
                  :default => nil, 

data/spec/migration_builder_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/spec_helper"
 describe Sequel::MigrationBuilder do
   
   it "should return nil if the table hash is empty and the database has no tables" do
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     Sequel::MigrationBuilder.new(mock_db).generate_migration({}).should be_nil
   end
@@ -24,7 +24,7 @@ Sequel.migration do
 end
 END
     
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     Sequel::MigrationBuilder.new(mock_db).generate_migration(tables).should == expected
   end
@@ -54,13 +54,13 @@ Sequel.migration do
 end
 END
     
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     Sequel::MigrationBuilder.new(mock_db).generate_migration(tables).should == expected
   end
 
   it "should add the primary key of the table" do
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     table = {
       :primary_key => :foo,
@@ -79,7 +79,7 @@ END
   end
 
   it "should add the non-integer primary key of the table" do
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     table = {
       :primary_key => :foo,
@@ -100,7 +100,7 @@ END
   end
   
   it "should add the table options do the create_table statement" do
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     table = {
       :table_options => {:engine => "myisam"},
@@ -118,7 +118,7 @@ END
   end
 
   it "should add indexes to the create_table statement" do
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([])
     table = {
       :indexes => {:foo_index => {:columns => :foo, :unique => true}},
@@ -143,7 +143,7 @@ END
         { :indexes => {:foo_index => {:columns => :foo, :unique => true}},
           :columns => [{:name => :foo, :column_type => :integer}, {:name => :bar, :column_type => :varchar}]}
       }
-      @mock_db = mock(:database)
+      @mock_db = double(:database)
       @mock_db.should_receive(:tables).at_least(:once).and_return([:example_table])
       @mock_db.should_receive(:indexes).with(:example_table, :partial => true).and_return({})
       @mock_db.should_receive(:schema).with(:example_table).and_return([[:foo, {:type => :integer, :db_type => "smallint(5) unsigned", :allow_null => true, :ruby_default => 10}]])
@@ -164,11 +164,56 @@ END
       Sequel::MigrationBuilder.new(@mock_db).
         generate_migration_body(@tables).join("\n").should == expected.strip
     end
+
+    it "should return separate alter table statements when option is set" do
+      expected = <<-END
+change do
+  alter_table :example_table do
+    set_column_type :foo, :integer, :default => nil
+  end
+
+  alter_table :example_table do
+    set_column_allow_null :foo, false
+  end
+
+  alter_table :example_table do
+    add_column :bar, :varchar, :null => false
+  end
+
+  alter_table :example_table do
+    add_index :foo, :name => :foo_index, :unique => true
+  end
+end
+END
+      Sequel::MigrationBuilder.new(@mock_db, :separate_alter_table_statements => true).
+        generate_migration_body(@tables).join("\n").should == expected.strip
+    end
+
+    it "should drop and add columns instead of changing them if immutable_columns is set" do
+      tables = { :example_table =>
+        { :indexes => nil,
+          :columns => [{:name => :foo, :column_type => :integer}] }
+      }
+
+      expected = <<-END
+change do
+  alter_table :example_table do
+    drop_column :foo
+  end
+
+  alter_table :example_table do
+    add_column :foo, :integer, :null => false
+  end
+end
+END
+      Sequel::MigrationBuilder.new(@mock_db, :separate_alter_table_statements => true, :immutable_columns => true).
+        generate_migration_body(tables).join("\n").should == expected.strip
+    end
   end
 
   it "should drop the table if the table exists in the database but not the table hash" do
     pending # Deal with in a later version.
-    mock_db = mock(:database)
+    mock_db = double(:database)
     mock_db.should_receive(:tables).at_least(:once).and_return([:example_table])
     
     expected = <<-END

data/spec/spec_helper.rb

@@ -3,9 +3,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'sequel'
 require 'sequel/migration_builder'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
-  
+
+RSpec.configure do |config| 
 end

metadata

@@ -1,64 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sequel_migration_builder
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Roland Swingler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 87
-        segments: 
-        - 3
-        - 20
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.20.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.20.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 description: Build Sequel Migrations based on the differences between two schemas
 email: roland.swingler@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - CHANGELOG
 - LICENSE
@@ -80,36 +67,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/knaveofdiamonds/sequel_migration_builder
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Build Sequel Migrations based on the differences between two schemas
 test_files: []
-