dm-migrations 0.9.11 → 0.10.0

data/{History.txt → History.rdoc}

@@ -1,12 +1,10 @@
-=== 0.9.11 / 2009-03-29
-
-* 1 minor enhancement:
+=== 0.10.0 / 2009-10-15
 
-  * Updated default MySQL engine to InnoDB
+* Updated to work with dm-core 0.10.0
 
-* 1 bug fix:
+=== 0.9.11 / 2009-03-29
 
-  * Fix :nullable for columns
+* No changes this version
 
 === 0.9.10 / 2009-01-19
 

data/Manifest.txt

@@ -1,7 +1,7 @@
-History.txt
+History.rdoc
 LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 db/migrations/1_create_people_table.rb
@@ -10,19 +10,19 @@ db/migrations/config.rb
 examples/sample_migration.rb
 examples/sample_migration_spec.rb
 lib/dm-migrations.rb
+lib/dm-migrations/migration.rb
+lib/dm-migrations/migration_runner.rb
+lib/dm-migrations/sql.rb
+lib/dm-migrations/sql/column.rb
+lib/dm-migrations/sql/mysql.rb
+lib/dm-migrations/sql/postgresql.rb
+lib/dm-migrations/sql/sqlite3.rb
+lib/dm-migrations/sql/table.rb
+lib/dm-migrations/sql/table_creator.rb
+lib/dm-migrations/sql/table_modifier.rb
 lib/dm-migrations/version.rb
-lib/migration.rb
-lib/migration_runner.rb
 lib/spec/example/migration_example_group.rb
 lib/spec/matchers/migration_matchers.rb
-lib/sql.rb
-lib/sql/column.rb
-lib/sql/mysql.rb
-lib/sql/postgresql.rb
-lib/sql/sqlite3.rb
-lib/sql/table.rb
-lib/sql/table_creator.rb
-lib/sql/table_modifier.rb
 spec/integration/migration_runner_spec.rb
 spec/integration/migration_spec.rb
 spec/integration/sql_spec.rb

data/Rakefile

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'rubygems'
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
@@ -14,10 +13,10 @@ GEM_NAME = 'dm-migrations'
 GEM_VERSION = DataMapper::Migration::VERSION
 GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
 
 PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
 PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for writing and speccing migrations'
 
 [ ROOT, ROOT.parent ].each do |dir|

data/db/migrations/1_create_people_table.rb

@@ -1,9 +1,9 @@
 migration 1, :create_people_table do
   up do
     create_table :people do
-      column :id,     Integer, :serial => true
-      column :name,   String, :size => 50
-      column :age,    Integer
+      column :id,   Integer, :serial => true
+      column :name, String, :size => 50
+      column :age,  Integer
     end
   end
   down do

data/examples/sample_migration.rb

@@ -1,9 +1,6 @@
-require File.dirname(__FILE__) + '/../lib/migration_runner'
-require 'fileutils'
-FileUtils.touch(File.join(Dir.pwd, "migration_test.db"))
-# DataMapper.setup(:default, "sqlite3://#{Dir.pwd}/migration_test.db")
-DataMapper.setup(:default, "postgres://localhost/migration_test")
-# DataMapper.setup(:default, "mysql://localhost/migration_test")
+require 'dm-migrations/migration_runner'
+
+DataMapper.setup(:default, "sqlite3::memory")
 
 DataMapper::Logger.new(STDOUT, :debug)
 DataMapper.logger.debug( "Starting Migration" )
@@ -11,9 +8,9 @@ DataMapper.logger.debug( "Starting Migration" )
 migration 1, :create_people_table do
   up do
     create_table :people do
-      column :id,     Integer, :serial => true
-      column :name,   String, :size => 50
-      column :age,    Integer
+      column :id,   Integer, :serial => true
+      column :name, String, :size => 50
+      column :age,  Integer
     end
   end
   down do
@@ -41,7 +38,7 @@ end
 # class Person
 #   include DataMapper::Resource
 #
-#   property :id, Integer, :serial => true
+#   property :id, Serial
 #   property :name, String, :size => 50
 #   property :age, Integer
 #   property :dob, DateTime, :default => Time.now

data/examples/sample_migration_spec.rb

@@ -1,5 +1,9 @@
-require File.dirname(__FILE__) + '/sample_migration'
-require File.dirname(__FILE__) + '/../lib/spec/example/migration_example_group'
+require 'pathname'
+
+dir = Pathname(__FILE__).dirname.expand_path
+
+require dir + 'sample_migration'
+require dir + '../lib/spec/example/migration_example_group'
 
 describe :create_people_table, :type => :migration do
 

data/lib/dm-migrations.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/migration'
+require 'dm-migrations/migration'

data/lib/{migration.rb → dm-migrations/migration.rb}

@@ -1,8 +1,6 @@
-require 'rubygems'
-gem 'dm-core', '0.9.11'
-require 'dm-core'
 require 'benchmark'
-require File.dirname(__FILE__) + '/sql'
+
+require 'dm-migrations/sql'
 
 module DataMapper
   class DuplicateMigrationNameError < StandardError
@@ -91,7 +89,7 @@ module DataMapper
     end
 
     def drop_table(table_name, opts = {})
-      execute "DROP TABLE #{@adapter.send(:quote_table_name, table_name.to_s)}"
+      execute "DROP TABLE #{@adapter.send(:quote_name, table_name.to_s)}"
     end
 
     def modify_table(table_name, opts = {}, &block)
@@ -206,12 +204,12 @@ module DataMapper
 
     def quote_table_name(table_name)
       # TODO: Fix this for 1.9 - can't use this hack to access a private method
-      @adapter.send(:quote_table_name, table_name.to_s)
+      @adapter.send(:quote_name, table_name.to_s)
     end
 
     def quote_column_name(column_name)
       # TODO: Fix this for 1.9 - can't use this hack to access a private method
-      @adapter.send(:quote_column_name, column_name.to_s)
+      @adapter.send(:quote_name, column_name.to_s)
     end
   end
 end

data/lib/{migration_runner.rb → dm-migrations/migration_runner.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/migration'
+require 'dm-migrations/migration'
 
 module DataMapper
   module MigrationRunner
@@ -26,9 +26,9 @@ module DataMapper
     #   migration( 1, :create_people_table ) do
     #     up do
     #       create_table :people do
-    #         column :id,     Integer, :serial => true
-    #         column :name,   String, :size => 50
-    #         column :age,    Integer
+    #         column :id,   Integer, :serial => true
+    #         column :name, String, :size => 50
+    #         column :age,  Integer
     #       end
     #     end
     #     down do

data/lib/dm-migrations/sql.rb

@@ -0,0 +1,5 @@
+require 'dm-migrations/sql/table_creator'
+require 'dm-migrations/sql/table_modifier'
+require 'dm-migrations/sql/sqlite3'
+require 'dm-migrations/sql/mysql'
+require 'dm-migrations/sql/postgresql'

data/lib/{sql → dm-migrations/sql}/column.rb

@@ -1,9 +1,5 @@
 module SQL
-
   class Column
-
     attr_accessor :name, :type, :not_null, :default_value, :primary_key, :unique
-
   end
-
 end

data/lib/{sql → dm-migrations/sql}/mysql.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/table'
+require 'dm-migrations/sql/table'
 
 module SQL
   module Mysql
@@ -21,14 +21,13 @@ module SQL
       true
     end
 
-    def create_table_statement(quoted_table_name)
-      "CREATE TABLE #{quoted_table_name} ENGINE = InnoDB CHARACTER SET #{character_set} COLLATE #{collation}"
+    def table_options
+      " ENGINE = InnoDB CHARACTER SET #{character_set} COLLATE #{collation}"
     end
 
-    # TODO: move to dm-more/dm-migrations
-    def property_schema_statement(schema)
+    def property_schema_statement(connection, schema)
       if supports_serial? && schema[:serial]
-        statement = "#{schema[:quote_column_name]} serial PRIMARY KEY"
+        statement = "#{schema[:quote_column_name]} SERIAL PRIMARY KEY"
       else
         super
       end
@@ -50,7 +49,5 @@ module SQL
         @not_null = col_struct.notnull == 0
       end
     end
-
-
   end
 end

data/lib/{sql → dm-migrations/sql}/postgresql.rb

@@ -10,18 +10,18 @@ module SQL
     end
 
     def recreate_database
-      execute "DROP SCHEMA IF EXISTS test CASCADE"
-      execute "CREATE SCHEMA test"
-      execute "SET search_path TO test"
+      execute 'DROP SCHEMA IF EXISTS test CASCADE'
+      execute 'CREATE SCHEMA test'
+      execute 'SET search_path TO test'
     end
 
     def supports_serial?
       true
     end
 
-    def property_schema_statement(schema)
+    def property_schema_statement(connection, schema)
       if supports_serial? && schema[:serial]
-        statement = "#{schema[:quote_column_name]} serial PRIMARY KEY"
+        statement = "#{schema[:quote_column_name]} SERIAL PRIMARY KEY"
       else
         statement = super
         if schema.has_key?(:sequence_name)
@@ -32,8 +32,8 @@ module SQL
       statement
     end
 
-    def create_table_statement(quoted_table_name)
-      "CREATE TABLE #{quoted_table_name}"
+    def table_options
+      ''
     end
 
     class Table < SQL::Table
@@ -64,9 +64,7 @@ module SQL
             end
           end
         end
-
       end
-
     end
 
     class Column < SQL::Column
@@ -75,8 +73,6 @@ module SQL
 
         @not_null = col_struct.is_nullable != "YES"
       end
-
     end
-
   end
 end

data/lib/{sql → dm-migrations/sql}/sqlite3.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/table'
+require 'dm-migrations/sql/table'
 
 module SQL
   module Sqlite3
@@ -17,8 +17,8 @@ module SQL
       # do nothing, sqlite will automatically create the database file
     end
 
-    def create_table_statement(quoted_table_name)
-      "CREATE TABLE #{quoted_table_name}"
+    def table_options
+      ''
     end
 
     def supports_serial?
@@ -41,7 +41,5 @@ module SQL
         @not_null = col_struct.notnull == 0
       end
     end
-
-
   end
 end

data/lib/{sql → dm-migrations/sql}/table.rb

@@ -1,9 +1,7 @@
-require File.dirname(__FILE__) + '/column'
+require 'dm-migrations/sql/column'
 
 module SQL
-
   class Table
-
     attr_accessor :name, :columns
 
     def to_s
@@ -13,7 +11,5 @@ module SQL
     def column(column_name)
       @columns.select { |c| c.name == column_name.to_s }.first
     end
-
   end
-
 end

data/lib/{sql → dm-migrations/sql}/table_creator.rb

@@ -13,7 +13,7 @@ module SQL
     end
 
     def quoted_table_name
-      @adapter.send(:quote_table_name, table_name)
+      @adapter.send(:quote_name, table_name)
     end
 
     def column(name, type, opts = {})
@@ -21,7 +21,7 @@ module SQL
     end
 
     def to_sql
-      "#{@adapter.create_table_statement(quoted_table_name)} (#{@columns.map{ |c| c.to_sql }.join(', ')})"
+      "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})#{@adapter.table_options}"
     end
 
     # A helper for using the native NOW() SQL function in a default
@@ -55,29 +55,42 @@ module SQL
         @type = build_type(type)
       end
 
+      def to_sql
+        type
+      end
+
+      private
+
       def build_type(type_class)
-        schema = {:name => @name, :quote_column_name => quoted_name}.merge(@opts)
-        schema[:serial?] ||= schema[:serial]
-        unless schema.has_key?(:nullable?)
-          schema[:nullable?] = schema.has_key?(:nullable) ? schema[:nullable] : !schema[:not_null]
+        schema = { :name => @name, :quote_column_name => quoted_name }.merge(@opts)
+
+        unless schema.key?(:nullable)
+          schema[:nullable] = !schema[:not_null]
         end
-        if type_class.is_a?(String)
+
+        schema[:length] ||= schema.delete(:size) if schema.key?(:size)
+
+        if type_class.kind_of?(String)
           schema[:primitive] = type_class
         else
-          schema = @adapter.class.type_map[type_class].merge(schema)
+          primitive = type_class.respond_to?(:primitive) ? type_class.primitive : type_class
+          options   = @adapter.class.type_map[primitive].dup
+
+          if type_class.respond_to?(:options)
+            options.update(type_class.options)
+          end
+
+          schema = options.update(schema)
         end
-        @adapter.property_schema_statement(schema)
-      end
 
-      def to_sql
-        type
+        @adapter.send(:with_connection) do |connection|
+          @adapter.property_schema_statement(connection, schema)
+        end
       end
 
       def quoted_name
-        @adapter.send(:quote_column_name, name)
+        @adapter.send(:quote_name, name)
       end
     end
-
   end
-
 end

data/lib/{sql → dm-migrations/sql}/table_modifier.rb

@@ -41,13 +41,11 @@ module SQL
     end
 
     def quote_column_name(name)
-      @adapter.send(:quote_column_name, name.to_s)
+      @adapter.send(:quote_name, name.to_s)
     end
 
     def quoted_table_name
-      @adapter.send(:quote_table_name, table_name)
+      @adapter.send(:quote_name, table_name)
     end
-
   end
-
 end

data/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Migration
-    VERSION = '0.9.11'
+    VERSION = '0.10.0'.freeze
   end
 end

data/lib/spec/example/migration_example_group.rb

@@ -1,6 +1,6 @@
-require 'spec'
+require 'spec/matchers/migration_matchers'
 
-require File.dirname(__FILE__) + '/../matchers/migration_matchers'
+require 'spec'
 
 module Spec
   module Example

data/lib/spec/matchers/migration_matchers.rb

@@ -1,4 +1,3 @@
-
 module Spec
   module Matchers
     module Migration

data/spec/integration/migration_runner_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}, " do

data/spec/integration/migration_spec.rb

@@ -1,5 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}, " do

data/spec/integration/sql_spec.rb

@@ -1,8 +1,12 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'spec_helper'
 
 ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}," do
+
+    def repository(*args)
+      DataMapper.repository(*args)
+    end
+
     describe DataMapper::Migration, "#create_table helper" do
       before :all do
         case adapter
@@ -14,8 +18,8 @@ ADAPTERS.each do |adapter|
 
       before do
         @creator = DataMapper::Migration::TableCreator.new(repository(adapter).adapter, :people) do
-          column :id, Integer, :serial => true
-          column :name, 'varchar(50)', :nullable => false
+          column :id,          DataMapper::Types::Serial
+          column :name,        'VARCHAR(50)', :nullable => false
           column :long_string, String, :size => 200
         end
       end
@@ -62,15 +66,15 @@ ADAPTERS.each do |adapter|
       when :mysql
         it "should create an InnoDB database for MySQL" 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` ENGINE = InnoDB CHARACTER SET \w+ COLLATE \w+ \(`id` serial PRIMARY KEY, `name` varchar\(50\) NOT NULL, `long_string` VARCHAR\(200\)\)$/)
+          @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
       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))}
+          @creator.to_sql.should == %q{CREATE TABLE "people" ("id" SERIAL PRIMARY KEY, "name" VARCHAR(50) NOT NULL, "long_string" VARCHAR(200))}
         end
       when :sqlite3
         it "should output a CREATE TABLE statement when sent #to_sql" do
-          @creator.to_sql.should == %q{CREATE TABLE "people" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "name" varchar(50) NOT NULL, "long_string" VARCHAR(200))}
+          @creator.to_sql.should == %q{CREATE TABLE "people" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "name" VARCHAR(50) NOT NULL, "long_string" VARCHAR(200))}
         end
       end
     end

data/spec/spec.opts

@@ -1 +1,2 @@
 --colour
+--loadby random

data/spec/spec_helper.rb

@@ -1,11 +1,15 @@
-require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2'
-require 'spec'
+# use local dm-core if running from a typical dev checkout.
+lib = File.join('..', '..', 'dm-core', 'lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'dm-core'
 
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-migrations'
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/migration_runner'
+# Support running specs with 'rake spec' and 'spec'
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+
+require 'dm-migrations'
+require 'dm-migrations/migration_runner'
 
 ADAPTERS = []
 def load_driver(name, default_uri)
@@ -20,7 +24,7 @@ def load_driver(name, default_uri)
   end
 end
 
-#ENV['ADAPTER'] ||= 'sqlite3'
+ENV['ADAPTER'] ||= 'sqlite3'
 
 load_driver(:sqlite3,  'sqlite3::memory:')
 load_driver(:mysql,    'mysql://localhost/dm_core_test')

data/spec/unit/migration_spec.rb

@@ -1,7 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../lib/migration'
+require 'spec_helper'
 
 describe 'Migration' do
 
@@ -214,12 +211,12 @@ describe 'Migration' do
 
       describe '#drop_table' do
         it 'should quote the table name' do
-          @adapter.should_receive(:quote_table_name).with('users')
+          @adapter.should_receive(:quote_name).with('users')
           @m.drop_table :users
         end
 
         it 'should execute the DROP TABLE sql for the table' do
-          @adapter.stub!(:quote_table_name).and_return("'users'")
+          @adapter.stub!(:quote_name).and_return("'users'")
           @m.should_receive(:execute).with(%{DROP TABLE 'users'})
           @m.drop_table :users
         end
@@ -326,21 +323,21 @@ describe 'Migration' do
       describe 'working with the migration_info table' do
         before do
           @adapter.stub!(:storage_exists?).and_return(true)
-          @adapter.stub!(:quote_table_name).and_return(%{'users'})
-          @adapter.stub!(:quote_column_name).and_return(%{'migration_name'})
+          # --- Please remove stubs ---
+          @adapter.stub!(:quote_name).and_return { |name| "'#{name}'" }
         end
 
         describe '#update_migration_info' do
           it 'should add a record of the migration' do
             @m.should_receive(:execute).with(
-              %Q{INSERT INTO 'users' ('migration_name') VALUES ('do_nothing')}
+              %Q{INSERT INTO 'migration_info' ('migration_name') VALUES ('do_nothing')}
             )
             @m.update_migration_info(:up)
           end
 
           it 'should remove the record of the migration' do
             @m.should_receive(:execute).with(
-              %Q{DELETE FROM 'users' WHERE 'migration_name' = 'do_nothing'}
+              %Q{DELETE FROM 'migration_info' WHERE 'migration_name' = 'do_nothing'}
             )
             @m.update_migration_info(:down)
           end
@@ -355,7 +352,7 @@ describe 'Migration' do
           it 'should create the migration info table' do
             @m.should_receive(:migration_info_table_exists?).and_return(false)
             @m.should_receive(:execute).with(
-              %Q{CREATE TABLE 'users' ('migration_name' VARCHAR(255) UNIQUE)}
+              %Q{CREATE TABLE 'migration_info' ('migration_name' VARCHAR(255) UNIQUE)}
             )
             @m.create_migration_info_table_if_needed
           end
@@ -379,7 +376,7 @@ describe 'Migration' do
         describe '#migration_record' do
           it 'should query for the migration' do
             @adapter.should_receive(:query).with(
-              %Q{SELECT 'migration_name' FROM 'users' WHERE 'migration_name' = 'do_nothing'}
+              %Q{SELECT 'migration_name' FROM 'migration_info' WHERE 'migration_name' = 'do_nothing'}
             )
             @m.migration_record
           end
@@ -429,12 +426,12 @@ describe 'Migration' do
         end
 
         it 'should have the adapter quote the migration_info table' do
-          @adapter.should_receive(:quote_table_name).with('migration_info').and_return("'migration_info'")
+          @adapter.should_receive(:quote_name).with('migration_info').and_return("'migration_info'")
           @m.migration_info_table.should == "'migration_info'"
         end
 
         it 'should have a quoted migration_name_column' do
-          @adapter.should_receive(:quote_column_name).with('migration_name').and_return("'migration_name'")
+          @adapter.should_receive(:quote_name).with('migration_name').and_return("'migration_name'")
           @m.migration_name_column.should == "'migration_name'"
         end
 

data/spec/unit/sql/column_spec.rb

@@ -1,7 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../../lib/sql/column'
+require 'spec_helper'
 
 describe SQL::Column do
   before do

data/spec/unit/sql/postgresql_spec.rb

@@ -1,7 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../../lib/sql/sqlite3'
+require 'spec_helper'
 
 # a dummy class to include the module into
 class PostgresqlExtension

data/spec/unit/sql/sqlite3_extensions_spec.rb

@@ -1,7 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../../lib/sql/sqlite3'
+require 'spec_helper'
 
 # a dummy class to include the module into
 class Sqlite3Extension

data/spec/unit/sql/table_creator_spec.rb

@@ -1,13 +1,10 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../../lib/sql/table_creator'
+require 'spec_helper'
 
 describe 'SQL module' do
   describe 'TableCreator' do
     before do
       @adapter = mock('adapter')
-      @adapter.stub!(:quote_table_name).and_return(%{'users'})
+      @adapter.stub!(:quote_name).and_return(%{'users'})
       @tc = SQL::TableCreator.new(@adapter, 'users') { }
     end
 
@@ -43,7 +40,7 @@ describe 'SQL module' do
     end
 
     it 'should use the adapter to quote the table name' do
-      @adapter.should_receive(:quote_table_name).with('users').and_return(%{'users'})
+      @adapter.should_receive(:quote_name).with('users').and_return(%{'users'})
       @tc.quoted_table_name.should == %{'users'}
     end
 
@@ -55,16 +52,19 @@ describe 'SQL module' do
     end
 
     it 'should output an SQL CREATE statement to build itself' do
-      @adapter.should_receive(:create_table_statement).with("'users'").and_return(%{CREATE TABLE 'users'})
+      @adapter.stub!(:table_options).and_return("")
       @tc.to_sql.should ==
         %{CREATE TABLE 'users' ()}
     end
 
     describe 'Column' do
       before do
+        connection = mock('Connection')
+
         @adapter.stub!(:quote_column_name).and_return(%{'id'})
         @adapter.class.stub!(:type_map).and_return(Integer => {:type => 'int'})
         @adapter.stub!(:property_schema_statement).and_return("SOME SQL")
+        @adapter.stub!(:with_connection).and_yield(connection)
         @c = SQL::TableCreator::Column.new(@adapter, 'id', Integer, :serial => true)
       end
 

data/spec/unit/sql/table_modifier_spec.rb

@@ -1,13 +1,10 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../../lib/sql/table_modifier'
+require 'spec_helper'
 
 describe 'SQL module' do
   describe 'TableModifier' do
     before do
       @adapter = mock('adapter')
-      @adapter.stub!(:quote_table_name).and_return(%{'users'})
+      @adapter.stub!(:quote_name).and_return(%{'users'})
       @tc = SQL::TableModifier.new(@adapter, :users) { }
     end
 
@@ -43,7 +40,7 @@ describe 'SQL module' do
     end
 
     it 'should use the adapter to quote the table name' do
-      @adapter.should_receive(:quote_table_name).with('users').and_return(%{'users'})
+      @adapter.should_receive(:quote_name).with('users').and_return(%{'users'})
       @tc.quoted_table_name.should == %{'users'}
     end
 

data/spec/unit/sql/table_spec.rb

@@ -1,7 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../../lib/sql/table'
+require 'spec_helper'
 
 describe SQL::Table do
   before do

data/spec/unit/sql_spec.rb

@@ -1,7 +1,4 @@
-require 'pathname'
-require Pathname(__FILE__).dirname + '../spec_helper'
-
-require Pathname(__FILE__).dirname + '../../lib/sql'
+require 'spec_helper'
 
 describe 'SQL module' do
 

data/tasks/db.rb

@@ -12,7 +12,7 @@ namespace :db do
   # set DIRECTION to migrate down
   desc "Run your system's migrations"
   task :migrate => [:setup_migration_dir] do
-    require File.expand_path(File.join(File.dirname(__FILE__), "lib", "migration_runner.rb"))
+    require 'dm-migrations/migration_runner.rb'
     require File.expand_path(File.join(MIGRATION_DIR, "config.rb"))
 
     Dir[File.join(MIGRATION_DIR, "*.rb")].each { |file| require file }

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
+dependencies: []
+
 description: DataMapper plugin for writing and speccing migrations
 email: 
 - psadauskas [a] gmail [d] com
@@ -30,15 +21,15 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - db/migrations/1_create_people_table.rb
@@ -47,19 +38,19 @@ files:
 - examples/sample_migration.rb
 - examples/sample_migration_spec.rb
 - lib/dm-migrations.rb
+- lib/dm-migrations/migration.rb
+- lib/dm-migrations/migration_runner.rb
+- lib/dm-migrations/sql.rb
+- lib/dm-migrations/sql/column.rb
+- lib/dm-migrations/sql/mysql.rb
+- lib/dm-migrations/sql/postgresql.rb
+- lib/dm-migrations/sql/sqlite3.rb
+- lib/dm-migrations/sql/table.rb
+- lib/dm-migrations/sql/table_creator.rb
+- lib/dm-migrations/sql/table_modifier.rb
 - lib/dm-migrations/version.rb
-- lib/migration.rb
-- lib/migration_runner.rb
 - lib/spec/example/migration_example_group.rb
 - lib/spec/matchers/migration_matchers.rb
-- lib/sql.rb
-- lib/sql/column.rb
-- lib/sql/mysql.rb
-- lib/sql/postgresql.rb
-- lib/sql/sqlite3.rb
-- lib/sql/table.rb
-- lib/sql/table_creator.rb
-- lib/sql/table_modifier.rb
 - spec/integration/migration_runner_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/sql_spec.rb
@@ -77,11 +68,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-migrations
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-migrations
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -99,9 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin for writing and speccing migrations
 test_files: []
 

data/lib/sql.rb

@@ -1,10 +0,0 @@
-require File.dirname(__FILE__) + '/sql/table_creator'
-require File.dirname(__FILE__) + '/sql/table_modifier'
-
-require File.dirname(__FILE__) + '/sql/sqlite3'
-require File.dirname(__FILE__) + '/sql/mysql'
-require File.dirname(__FILE__) + '/sql/postgresql'
-
-module SQL
-
-end