dm-migrations 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,26 +5,26 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
 gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 group :development do
 
-  gem 'jeweler', '~> 1.5.2'
-  gem 'rake',    '~> 0.8.7'
-  gem 'rspec',   '~> 1.3.1'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rake',    '~> 0.9.2'
+  gem 'rspec',   '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -21,5 +21,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4'
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-migrations.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-migrations}
-  s.version = "1.1.0"
+  s.name = "dm-migrations"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Sadauskas"]
-  s.date = %q{2011-03-16}
-  s.description = %q{DataMapper plugin for writing and speccing migrations}
-  s.email = %q{psadauskas [a] gmail [d] com}
+  s.date = "2011-09-09"
+  s.description = "DataMapper plugin for writing and speccing migrations"
+  s.email = "psadauskas [a] gmail [d] com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "db/migrations/2_add_dob_to_people.rb",
     "db/migrations/config.rb",
     "dm-migrations.gemspec",
+    "examples/Rakefile",
     "examples/sample_migration.rb",
     "examples/sample_migration_spec.rb",
     "lib/dm-migrations.rb",
@@ -73,52 +74,31 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-migrations}
+  s.homepage = "http://github.com/datamapper/dm-migrations"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{DataMapper plugin for writing and speccing migrations}
-  s.test_files = [
-    "examples/sample_migration.rb",
-    "examples/sample_migration_spec.rb",
-    "spec/integration/auto_migration_spec.rb",
-    "spec/integration/auto_upgrade_spec.rb",
-    "spec/integration/migration_runner_spec.rb",
-    "spec/integration/migration_spec.rb",
-    "spec/integration/sql_spec.rb",
-    "spec/isolated/require_after_setup_spec.rb",
-    "spec/isolated/require_before_setup_spec.rb",
-    "spec/isolated/require_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/migration_spec.rb",
-    "spec/unit/sql/column_spec.rb",
-    "spec/unit/sql/postgres_spec.rb",
-    "spec/unit/sql/sqlite_extensions_spec.rb",
-    "spec/unit/sql/table_creator_spec.rb",
-    "spec/unit/sql/table_modifier_spec.rb",
-    "spec/unit/sql/table_spec.rb",
-    "spec/unit/sql_spec.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "DataMapper plugin for writing and speccing migrations"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/examples/Rakefile

@@ -0,0 +1,144 @@
+# Sample tasks using dm-migrations
+# Roughly following Rails conventions, and mostly based on Padrino's dm:* tasks
+#
+# Cf. https://github.com/padrino/padrino-framework/blob/master/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb
+#     https://github.com/datamapper/dm-rails/blob/master/lib/dm-rails/railties/database.rake
+#
+
+require 'rake'
+
+# replace this with however your app configures DataMapper repositor(ies)
+task :environment do
+  require File.expand_path('boot', File.dirname(__FILE__))
+end
+
+namespace :db do
+
+  namespace :auto do
+
+    desc "Perform auto-migration (reset your db data)"
+    task :migrate => :environment do |t, _|
+      puts "=> Auto-migrating"
+      ::DataMapper.auto_migrate!
+      puts "<= #{t.name} done"
+    end
+
+    desc "Perform non destructive auto-migration"
+    task :upgrade => :environment do
+      puts "=> Auto-upgrading"
+      ::DataMapper.auto_upgrade!
+      puts "<= #{t.name} done"
+    end
+
+  end
+
+  desc "Run all pending migrations, or up to specified migration"
+  task :migrate, [:version] => :load_migrations do |t, args|
+    if vers = args[:version] || ENV['VERSION']
+      puts "=> Migrating up to version #{vers}"
+      migrate_up!(vers)
+    else
+      puts "=> Migrating up"
+      migrate_up!
+    end
+    puts "<= #{t.name} done"
+  end
+
+  desc "Rollback down to specified migration, or rollback last STEP=x migrations (default 1)"
+  task :rollback, [:version] => :load_migrations do |t, args|
+    if vers = args[:version] || ENV['VERSION']
+      puts "=> Rolling back down to migration #{vers}"
+      migrate_down!(vers)
+    else
+      step = ENV['STEP'].to_i || 1
+      applied = migrations.delete_if {|m| m.needs_up?}.sort   # note this is N queries as currently implemented
+      target = applied[-1 * step] || applied[0]
+      if target
+        puts "=> Rolling back #{step} step(s)"
+        migrate_down!(target.position - 1)
+      else
+        warn "No migrations to rollback: #{step} step(s)"
+      end
+    end
+    puts "<= #{t.name} done"
+  end
+
+  desc "List migrations descending, showing which have been applied"
+  task :migrations => :load_migrations do
+    puts migrations.sort.reverse.map {|m| "#{m.position}  #{m.name}  #{m.needs_up? ? '' : 'APPLIED'}"}
+  end
+
+  task :load_migrations => :environment do
+    require 'dm-migrations/migration_runner'
+    FileList['db/migrate/*.rb'].each do |migration|
+      load migration
+    end
+  end
+
+
+  desc "Create the database"
+  task :create, [:repository] => :environment do |t, args|
+    repo = args[:repository] || ENV['REPOSITORY'] || :default
+    config = DataMapper.repository(repo).adapter.options.symbolize_keys
+    user, password, host = config[:user], config[:password], config[:host]
+    database       = config[:database]  || config[:path].sub(/\//, "")
+    charset        = config[:charset]   || ENV['CHARSET']   || 'utf8'
+    collation      = config[:collation] || ENV['COLLATION'] || 'utf8_unicode_ci'
+    puts "=> Creating database '#{database}'"
+
+    case config[:adapter]
+    when 'postgres'
+      system("createdb", "-E", charset, "-h", host, "-U", user, database)
+    when 'mysql'
+      query = [
+        "mysql", "--user=#{user}", (password.blank? ? '' : "--password=#{password}"), (%w[127.0.0.1 localhost].include?(host) ? '-e' : "--host=#{host} -e"),
+        "CREATE DATABASE #{database} DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}".inspect
+      ]
+      system(query.compact.join(" "))
+    when 'sqlite3'
+      DataMapper.setup(DataMapper.repository.name, config)
+    else
+      raise "Adapter #{config[:adapter]} not supported for creating databases yet."
+    end
+    puts "<= #{t.name} done"
+  end
+
+  desc "Drop the database"
+  task :drop, [:repository] => :environment do |t, args|
+    repo = args[:repository] || ENV['REPOSITORY'] || :default
+    config = DataMapper.repository(repo).adapter.options.symbolize_keys
+    user, password, host = config[:user], config[:password], config[:host]
+    database       = config[:database] || config[:path].sub(/\//, "")
+    puts "=> Dropping database '#{database}'"
+    case config[:adapter]
+      when 'postgres'
+        system("dropdb", "-h", host, "-U", user, database)
+      when 'mysql'
+        query = [
+          "mysql", "--user=#{user}", (password.blank? ? '' : "--password=#{password}"), (%w[127.0.0.1 localhost].include?(host) ? '-e' : "--host=#{host} -e"),
+          "DROP DATABASE IF EXISTS #{database}".inspect
+        ]
+        system(query.compact.join(" "))
+      when 'sqlite3'
+        File.delete(config[:path]) if File.exist?(config[:path])
+      else
+        raise "Adapter #{config[:adapter]} not supported for dropping databases yet."
+    end
+    puts "<= #{t.name} done"
+  end
+
+  desc 'Load the seed data from db/seeds.rb'
+  task :seed => :environment do |t, _|
+    puts "=> Loading seed data"
+    seed_file = File.expand_path('db/seeds.rb', File.dirname(__FILE__))
+    load(seed_file) if File.exist?(seed_file)
+    puts "<= #{t.name} done"
+  end
+
+  desc "Drop the database, migrate from scratch and initialize with the seed data"
+  task :reset => [:drop, :setup]
+
+  desc "Create the database, migrate and initialize with the seed data"
+  task :setup => [:create, :migrate, :seed]
+
+end

data/examples/sample_migration.rb

@@ -41,7 +41,7 @@ end
 #   property :id, Serial
 #   property :name, String, :size => 50
 #   property :age, Integer
-#   property :dob, DateTime, :default => Time.now
+#   property :dob, DateTime, :default => proc { Time.now }
 #
 # end
 #

data/lib/dm-migrations/adapters/dm-do-adapter.rb

@@ -269,11 +269,11 @@ module DataMapper
         #
         # @api private
         def type_map
-          length    = Property::String::DEFAULT_LENGTH
-          precision = Property::Numeric::DEFAULT_PRECISION
-          scale     = Property::Decimal::DEFAULT_SCALE
+          length    = Property::String.length
+          precision = Property::Numeric.precision
+          scale     = Property::Decimal.scale
 
-          @type_map ||= {
+          {
             Property::Binary => { :primitive => 'BLOB'                                              },
             Object           => { :primitive => 'TEXT'                                              },
             Integer          => { :primitive => 'INTEGER'                                           },

data/lib/dm-migrations/adapters/dm-mysql-adapter.rb

@@ -31,7 +31,14 @@ module DataMapper
       module SQL #:nodoc:
 #        private  ## This cannot be private for current migrations
 
-        VALUE_METHOD = RUBY_PLATFORM[/java/] ? :variable_value : :value
+        # Allows for specification of the default storage engine to use when creating tables via
+        # migrations.  Defaults to DEFAULT_ENGINE.
+        #
+        # adapter = DataMapper.setup(:default, 'mysql://localhost/foo')
+        # adapter.storage_engine = 'MyISAM'
+        #
+        # @api public
+        attr_accessor :storage_engine
 
         # @api private
         def supports_serial?
@@ -51,7 +58,7 @@ module DataMapper
 
         # @api private
         def create_table_statement(connection, model, properties)
-          "#{super} ENGINE = #{DEFAULT_ENGINE} CHARACTER SET #{character_set} COLLATE #{collation}"
+          "#{super} ENGINE = #{storage_engine} CHARACTER SET #{character_set} COLLATE #{collation}"
         end
 
         # @api private
@@ -84,6 +91,13 @@ module DataMapper
           statement
         end
 
+        # @api private
+        def storage_engine
+          # Don't pull the default engine via show_variable for backwards compat where it was hard
+          # coded to InnoDB
+          @storage_engine ||= DEFAULT_ENGINE
+        end
+
         # @api private
         def character_set
           @character_set ||= show_variable('character_set_connection') || DEFAULT_CHARACTER_SET
@@ -97,7 +111,7 @@ module DataMapper
         # @api private
         def show_variable(name)
           result = select('SHOW VARIABLES LIKE ?', name).first
-          result ? result.send(VALUE_METHOD).freeze : nil
+          result ? result.value.freeze : nil
         end
 
         private
@@ -273,7 +287,7 @@ module DataMapper
         #
         # @api private
         def type_map
-          @type_map ||= super.merge(
+          super.merge(
             DateTime => { :primitive => 'DATETIME' },
             Time     => { :primitive => 'DATETIME' }
           ).freeze

data/lib/dm-migrations/adapters/dm-oracle-adapter.rb

@@ -278,11 +278,11 @@ module DataMapper
         #
         # @api private
         def type_map
-          length    = Property::String::DEFAULT_LENGTH
-          precision = Property::Numeric::DEFAULT_PRECISION
-          scale     = Property::Decimal::DEFAULT_SCALE
+          length    = Property::String.length
+          precision = Property::Numeric.precision
+          scale     = Property::Decimal.scale
 
-          @type_map ||= {
+          {
             Integer        => { :primitive => 'NUMBER',   :precision => precision, :scale => 0   },
             String         => { :primitive => 'VARCHAR2', :length => length                      },
             Class          => { :primitive => 'VARCHAR2', :length => length                      },

data/lib/dm-migrations/adapters/dm-postgres-adapter.rb

@@ -143,10 +143,10 @@ module DataMapper
         #
         # @api private
         def type_map
-          precision = Property::Numeric::DEFAULT_PRECISION
-          scale     = Property::Decimal::DEFAULT_SCALE
+          precision = Property::Numeric.precision
+          scale     = Property::Decimal.scale
 
-          @type_map ||= super.merge(
+          super.merge(
             Property::Binary => { :primitive => 'BYTEA'                                                      },
             BigDecimal       => { :primitive => 'NUMERIC',          :precision => precision, :scale => scale },
             Float            => { :primitive => 'DOUBLE PRECISION'                                           }

data/lib/dm-migrations/adapters/dm-sqlite-adapter.rb

@@ -87,7 +87,7 @@ module DataMapper
         #
         # @api private
         def type_map
-          @type_map ||= super.merge(Class => { :primitive => 'VARCHAR' }).freeze
+          super.merge(Class => { :primitive => 'VARCHAR' }).freeze
         end
       end
 

data/lib/dm-migrations/adapters/dm-sqlserver-adapter.rb

@@ -158,16 +158,16 @@ module DataMapper
         #
         # @api private
         def type_map
-          length    = Property::String::DEFAULT_LENGTH
-          precision = Property::Numeric::DEFAULT_PRECISION
-          scale     = Property::Decimal::DEFAULT_SCALE
-
-          @type_map ||= super.merge(
-            DateTime       => { :primitive => 'DATETIME'                                         },
-            Date           => { :primitive => 'SMALLDATETIME'                                    },
-            Time           => { :primitive => 'SMALLDATETIME'                                    },
-            TrueClass      => { :primitive => 'BIT',                                             },
-            Property::Text => { :primitive => 'NVARCHAR', :length => 'max'                       }
+          length    = Property::String.length
+          precision = Property::Numeric.precision
+          scale     = Property::Decimal.scale
+
+          super.merge(
+            DateTime       => { :primitive => 'DATETIME'                   },
+            Date           => { :primitive => 'SMALLDATETIME'              },
+            Time           => { :primitive => 'SMALLDATETIME'              },
+            TrueClass      => { :primitive => 'BIT',                       },
+            Property::Text => { :primitive => 'NVARCHAR', :length => 'max' }
           ).freeze
         end
       end

data/lib/dm-migrations/auto_migration.rb

@@ -41,8 +41,10 @@ module DataMapper
 
       # @api private
       def repository_execute(method, repository_name)
-        DataMapper::Model.descendants.each do |model|
-          model.send(method, repository_name || model.default_repository_name)
+        models = DataMapper::Model.descendants
+        models = models.select { |m| m.default_repository_name == repository_name } if repository_name
+        models.each do |model|
+          model.send(method, model.default_repository_name)
         end
       end
     end

data/lib/dm-migrations/sql/mysql.rb

@@ -21,8 +21,12 @@ module SQL
       true
     end
 
-    def table_options
-      " ENGINE = InnoDB CHARACTER SET #{character_set} COLLATE #{collation}"
+    def table_options(opts)
+      opt_engine    = opts[:storage_engine] || storage_engine
+      opt_char_set  = opts[:character_set] || character_set
+      opt_collation = opts[:collation] || collation
+
+      " ENGINE = #{opt_engine} CHARACTER SET #{opt_char_set} COLLATE #{opt_collation}"
     end
 
     def property_schema_statement(connection, schema)

data/lib/dm-migrations/sql/postgres.rb

@@ -32,12 +32,12 @@ module SQL
       statement
     end
 
-    def table_options
+    def table_options(opts)
       ''
     end
 
     def change_column_type_statement(name, column)
-      "ALTER TABLE #{quote_name(name)} ALTER COLUMN #{quote_name(name)} TYPE #{column.to_sql}"
+      "ALTER TABLE #{quote_name(name)} ALTER COLUMN #{column.to_sql}"
     end
 
     class Table < SQL::Table

data/lib/dm-migrations/sql/sqlite.rb

@@ -19,7 +19,7 @@ module SQL
       # do nothing, sqlite will automatically create the database file
     end
 
-    def table_options
+    def table_options(opts)
       ''
     end
 

data/lib/dm-migrations/sql/table_creator.rb

@@ -26,7 +26,7 @@ module SQL
     end
 
     def to_sql
-      "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})#{@adapter.table_options}"
+      "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})#{@adapter.table_options(@opts)}"
     end
 
     # A helper for using the native NOW() SQL function in a default

data/lib/dm-migrations/sql/table_modifier.rb

@@ -49,5 +49,9 @@ module SQL
     def quoted_table_name
       @adapter.send(:quote_name, table_name)
     end
+
+    def to_sql
+      @statements.join(';')
+    end
   end
 end

data/spec/integration/auto_migration_spec.rb

@@ -368,7 +368,7 @@ describe DataMapper::Migrations do
             [ :min, :max ].each do |key|
               next unless value = options[key]
               it "should allow the #{key} value #{value} to be stored" do
-                pending_if "#{value} causes problem with JRuby 1.5.2 parser", RUBY_PLATFORM =~ /java/ && value == -9223372036854775808 do
+                pending_if "#{value} causes problem with the JRuby < 1.6 parser", RUBY_PLATFORM =~ /java/ && JRUBY_VERSION < '1.6' && value == -9223372036854775808 do
                   lambda {
                     resource = @model.create(@property => value)
                     @model.first(@property => value).should eql(resource)

data/spec/integration/migration_spec.rb

@@ -14,6 +14,14 @@ describe "A Migration" do
         @migration = DataMapper::Migration.new(1, :create_people_table, :verbose => false) { }
       end
 
+      before do
+        $stderr, @original = StringIO.new, $stderr
+      end
+
+      after do
+        $stderr = @original
+      end
+
       it "should have a postition attribute" do
         @migration.should respond_to(:position)
 
@@ -42,6 +50,11 @@ describe "A Migration" do
         m.instance_variable_get(:@repository).should == :legacy
       end
 
+      it "warns when :database is used" do
+        m = DataMapper::Migration.new(2, :create_legacy_table, :database => :legacy) {}
+        $stderr.string.chomp.should == 'Using the :database option with migrations is deprecated, use :repository instead'
+      end
+
       it "should have a verbose option" do
         m = DataMapper::Migration.new(2, :create_dogs_table, :verbose => false) {}
         m.instance_variable_get(:@verbose).should == false

data/spec/integration/sql_spec.rb

@@ -70,6 +70,34 @@ describe "SQL generation" do
           #can't get an exact == comparison here because character set and collation may differ per connection
           @creator.to_sql.should match(/^CREATE TABLE `people` \(`id` SERIAL PRIMARY KEY, `name` VARCHAR\(50\) NOT NULL, `long_string` VARCHAR\(200\)\) ENGINE = InnoDB CHARACTER SET \w+ COLLATE \w+\z/)
         end
+
+        it "should allow for custom table creation options for MySQL" do
+          opts = {
+            :storage_engine => 'MyISAM',
+            :character_set  => 'big5',
+            :collation      => 'big5_chinese_ci',
+          }
+
+          creator = DataMapper::Migration::TableCreator.new(@adapter, :people, opts) do
+            column :id, DataMapper::Property::Serial
+          end
+
+          creator.to_sql.should match(/^CREATE TABLE `people` \(`id` SERIAL PRIMARY KEY\) ENGINE = MyISAM CHARACTER SET big5 COLLATE big5_chinese_ci\z/)
+        end
+
+        it "should respect default storage engine types specified by the MySQL adapter" do
+          adapter = DataMapper::Spec.adapter
+          adapter.extend(SQL::Mysql)
+
+          adapter.storage_engine = 'MyISAM'
+
+          creator = DataMapper::Migration::TableCreator.new(adapter, :people) do
+            column :id, DataMapper::Property::Serial
+          end
+
+          creator.to_sql.should match(/^CREATE TABLE `people` \(`id` SERIAL PRIMARY KEY\) ENGINE = MyISAM CHARACTER SET \w+ COLLATE \w+\z/)
+        end
+
       when :postgres
         it "should output a CREATE TABLE statement when sent #to_sql" do
           @creator.to_sql.should == %q{CREATE TABLE "people" ("id" SERIAL PRIMARY KEY, "name" VARCHAR(50) NOT NULL, "long_string" VARCHAR(200))}
@@ -79,17 +107,49 @@ describe "SQL generation" do
           @creator.to_sql.should == %q{CREATE TABLE "people" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "name" VARCHAR(50) NOT NULL, "long_string" VARCHAR(200))}
         end
       end
+
+      context 'when the default string length is modified' do
+        before do
+          @original = DataMapper::Property::String.length
+          DataMapper::Property::String.length(255)
+
+          @creator = DataMapper::Migration::TableCreator.new(@adapter, :people) do
+            column :string, String
+          end
+        end
+
+        after do
+          DataMapper::Property::String.length(@original)
+        end
+
+        it 'uses the new length for the character column' do
+          @creator.to_sql.should match(/CHAR\(255\)/)
+        end
+      end
     end
 
     describe DataMapper::Migration, "#modify_table helper" do
       before do
         @migration = DataMapper::Migration.new(1, :create_people_table, :verbose => false) { }
+
       end
 
       it "should have a #modify_table helper" do
         @migration.should respond_to(:modify_table)
       end
 
+      case DataMapper::Spec.adapter_name.to_sym
+      when :postgres
+        before do
+          @modifier = DataMapper::Migration::TableModifier.new(@adapter, :people) do
+            change_column :name, 'VARCHAR(200)'
+          end
+        end
+
+        it "should alter the column" do
+          @modifier.to_sql.should == %q{ALTER TABLE "people" ALTER COLUMN "name" VARCHAR(200)}
+        end
+      end
     end
 
     describe DataMapper::Migration, "other helpers" do

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -10,53 +17,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: rspec
 description: DataMapper plugin for writing and speccing migrations
 email: psadauskas [a] gmail [d] com
 executables: []
@@ -76,6 +104,7 @@ files:
 - db/migrations/2_add_dob_to_people.rb
 - db/migrations/config.rb
 - dm-migrations.gemspec
+- examples/Rakefile
 - examples/sample_migration.rb
 - examples/sample_migration_spec.rb
 - lib/dm-migrations.rb
@@ -122,7 +151,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-migrations
 licenses: []
 
@@ -136,37 +164,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for writing and speccing migrations
-test_files: 
-- examples/sample_migration.rb
-- examples/sample_migration_spec.rb
-- spec/integration/auto_migration_spec.rb
-- spec/integration/auto_upgrade_spec.rb
-- spec/integration/migration_runner_spec.rb
-- spec/integration/migration_spec.rb
-- spec/integration/sql_spec.rb
-- spec/isolated/require_after_setup_spec.rb
-- spec/isolated/require_before_setup_spec.rb
-- spec/isolated/require_spec.rb
-- spec/spec_helper.rb
-- spec/unit/migration_spec.rb
-- spec/unit/sql/column_spec.rb
-- spec/unit/sql/postgres_spec.rb
-- spec/unit/sql/sqlite_extensions_spec.rb
-- spec/unit/sql/table_creator_spec.rb
-- spec/unit/sql/table_modifier_spec.rb
-- spec/unit/sql/table_spec.rb
-- spec/unit/sql_spec.rb
+test_files: []
+