dm-migrations 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,38 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+db/migrations/1_create_people_table.rb
+db/migrations/2_add_dob_to_people.rb
+db/migrations/config.rb
+examples/sample_migration.rb
+examples/sample_migration_spec.rb
+lib/dm-migrations.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
+spec/spec.opts
+spec/spec_helper.rb
+spec/unit/migration_spec.rb
+spec/unit/sql/column_spec.rb
+spec/unit/sql/postgresql_spec.rb
+spec/unit/sql/sqlite3_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

data/{README → README.txt}

@@ -1,4 +1,3 @@
-dm-migrations
-=============
+= dm-migrations
 
 DataMapper plugin for writing and specing migrations.

data/Rakefile

@@ -1,51 +1,44 @@
 require 'rubygems'
 require 'spec'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 require 'pathname'
 
-CLEAN.include '{log,pkg}/'
-
-spec = Gem::Specification.new do |s|
-  s.name             = 'dm-migrations'
-  s.version          = '0.9.2'
-  s.platform         = Gem::Platform::RUBY
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w[ README LICENSE TODO ]
-  s.summary          = 'DataMapper plugin for writing and specing migrations'
-  s.description      = s.summary
-  s.author           = 'Paul Sadauskas'
-  s.email            = 'psadauskas@gmail.com'
-  s.homepage         = 'http://github.com/sam/dm-more/tree/master/dm-migrations'
-  s.require_path     = 'lib'
-  s.files            = FileList[ '{lib,spec}/**/*.rb', 'spec/spec.opts', 'Rakefile', *s.extra_rdoc_files ]
-  s.add_dependency('dm-core', "=#{s.version}")
-end
+ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/dm-migrations/version'
+
+AUTHOR = "Paul Sadauskas"
+EMAIL  = "psadauskas@gmail.com"
+GEM_NAME = "dm-migrations"
+GEM_VERSION = DataMapper::Migration::VERSION
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_CLEAN = ["log", "pkg"]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+
+PROJECT_NAME = "datamapper"
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-migrations"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for writing and speccing migrations"
+
+require ROOT.parent + 'tasks/hoe'
 
 task :default => [ :spec ]
 
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
 SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install #{spec.name} #{spec.version} (default ruby)"
+desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources", :verbose => false
+  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
 end
 
-desc "Uninstall #{spec.name} #{spec.version} (default ruby)"
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{spec.name} -v#{spec.version} -I -x", :verbose => false
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
 namespace :jruby do
-  desc "Install #{spec.name} #{spec.version} with JRuby"
+  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
   task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources}, :verbose => false
+    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
   end
 end
 

data/db/migrations/1_create_people_table.rb

@@ -0,0 +1,12 @@
+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
+    end
+  end
+  down do
+    drop_table :people
+  end
+end

data/db/migrations/2_add_dob_to_people.rb

@@ -0,0 +1,13 @@
+migration 2, :add_dob_to_people do
+  up do
+    modify_table :people do
+      add_column :dob, DateTime, :nullable? => true
+    end
+  end
+
+  down do
+    modify_table :people do
+      drop_column :dob
+    end
+  end
+end

data/db/migrations/config.rb

@@ -0,0 +1,4 @@
+DataMapper::Logger.new(STDOUT, :debug)
+DataMapper.logger.debug( "Starting Migration" )
+
+DataMapper.setup(:default, 'postgres://postgres@localhost/dm_core_test')

data/examples/sample_migration.rb

@@ -0,0 +1,61 @@
+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")
+
+DataMapper::Logger.new(STDOUT, :debug)
+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
+    end
+  end
+  down do
+    drop_table :people
+  end
+end
+
+migration 2, :add_dob_to_people do
+  up do
+    modify_table :people do
+      add_column :dob, DateTime, :nullable? => true
+    end
+  end
+
+  down do
+    modify_table :people do
+      drop_column :dob
+    end
+  end
+end
+
+# migrate_down!
+# migrate_up!
+#
+# class Person
+#   include DataMapper::Resource
+#
+#   property :id, Integer, :serial => true
+#   property :name, String, :size => 50
+#   property :age, Integer
+#   property :dob, DateTime, :default => Time.now
+#
+# end
+#
+# Person.create(:name => "Mark Bates", :age => 31)
+# puts Person.first.inspect
+# puts Person.all.inspect
+
+if $0 == __FILE__
+  if $*.first == "down"
+    migrate_down!
+  else
+    migrate_up!
+  end
+end

data/examples/sample_migration_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/sample_migration'
+require File.dirname(__FILE__) + '/../lib/spec/example/migration_example_group'
+
+describe :create_people_table, :type => :migration do
+
+  before do
+    run_migration
+  end
+
+  it 'should create a people table' do
+    repository(:default).should have_table(:people)
+  end
+
+  it 'should have an id column as the primary key' do
+    table(:people).should have_column(:id)
+    table(:people).column(:id).type.should == 'integer'
+    #table(:people).column(:id).should be_primary_key
+  end
+
+  it 'should have a name column as a string' do
+    table(:people).should have_column(:name)
+    table(:people).column(:name).type.should == 'character varying'
+    table(:people).column(:name).should permit_null
+  end
+
+  it 'should have a nullable age column as a int' do
+    table(:people).should have_column(:age)
+    table(:people).column(:age).type.should == 'integer'
+    table(:people).column(:age).should permit_null
+  end
+
+end
+
+describe :add_dob_to_people, :type => :migration do
+
+  before do
+    run_migration
+  end
+
+  it 'should add a dob column as a timestamp' do
+    table(:people).should have_column(:dob)
+    table(:people).column(:dob).type.should == 'timestamp without time zone'
+    table(:people).column(:dob).should permit_null
+  end
+
+end

data/lib/dm-migrations/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  class Migration
+    VERSION = "0.9.3"
+  end
+end

data/lib/migration.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'dm-core', '=0.9.2'
+gem 'dm-core', '=0.9.3'
 require 'dm-core'
 require 'benchmark'
 require File.dirname(__FILE__) + '/sql'
@@ -51,30 +51,30 @@ module DataMapper
 
     # perform the migration by running the code in the #up block
     def perform_up
-      res = nil
+      result = nil
       if needs_up?
         # DataMapper.database.adapter.transaction do
         say_with_time "== Performing Up Migration ##{position}: #{name}", 0 do
-          res = @up_action.call
+          result = @up_action.call
         end
         update_migration_info(:up)
         # end
       end
-      res
+      result
     end
 
     # un-do the migration by running the code in the #down block
     def perform_down
-      res = nil
+      result = nil
       if needs_down?
         # DataMapper.database.adapter.transaction do
         say_with_time "== Performing Down Migration ##{position}: #{name}", 0 do
-          res = @down_action.call
+          result = @down_action.call
         end
         update_migration_info(:down)
         # end
       end
-      res
+      result
     end
 
     # execute raw SQL
@@ -127,8 +127,6 @@ module DataMapper
       puts text if @verbose
     end
 
-    protected
-
     # Inserts or removes a row into the `migration_info` table, so we can mark this migration as run, or un-done
     def update_migration_info(direction)
       save, @verbose = @verbose, false
@@ -144,7 +142,7 @@ module DataMapper
     end
 
     def create_migration_info_table_if_needed
-      save, @verbose = @verbose, true # false
+      save, @verbose = @verbose, false
       unless migration_info_table_exists?
         execute("CREATE TABLE #{migration_info_table} (#{migration_name_column} VARCHAR(255) UNIQUE)")
       end
@@ -168,13 +166,13 @@ module DataMapper
 
     # True if the migration needs to be run
     def needs_up?
-      create_migration_info_table_if_needed
+      return true unless migration_info_table_exists?
       migration_record.empty?
     end
 
     # True if the migration has already been run
     def needs_down?
-      create_migration_info_table_if_needed
+      return false unless migration_info_table_exists?
       ! migration_record.empty?
     end
 

data/lib/sql.rb

@@ -1,110 +1,10 @@
+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
 
-  class TableCreator
-    attr_accessor :table_name, :opts
-
-    def initialize(adapter, table_name, opts = {}, &block)
-      @adapter = adapter
-      @table_name = table_name.to_s
-      @opts = opts
-
-      @columns = []
-
-      self.instance_eval &block
-    end
-
-    def quoted_table_name
-      @adapter.send(:quote_table_name, table_name)
-    end
-
-    def column(name, type, opts = {})
-      @columns << Column.new(@adapter, name, type, opts)
-    end
-
-    def to_sql
-        "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})"
-    end
-
-    class Column
-      attr_accessor :name, :type
-
-      def initialize(adapter, name, type, opts = {})
-        @adapter = adapter
-        @name = name.to_s
-        @opts = (opts ||= {})
-        @type = build_type(type)
-      end
-
-      def build_type(type_class)
-        schema = {:name => @name, :quote_column_name => quoted_name}.merge(@opts)
-        schema.merge!(@adapter.class.type_map[type_class])
-        @adapter.property_schema_statement(schema)
-      end
-
-      def to_sql
-          type
-      end
-
-      def quoted_name
-        @adapter.send(:quote_column_name, name)
-      end
-    end
-
-  end
-
-  class TableModifier
-    attr_accessor :table_name, :opts, :statements, :adapter
-
-    def initialize(adapter, table_name, opts = {}, &block)
-      @adapter = adapter
-      @table_name = table_name.to_s
-      @opts = (opts ||= {})
-
-      @statements = []
-
-      self.instance_eval &block
-    end
-
-    def add_column(name, type, opts = {})
-      column = SQL::TableCreator::Column.new(@adapter, name, type, opts)
-      @statements << "ALTER TABLE #{quoted_table_name} ADD COLUMN #{column.to_sql}"
-    end
-
-    def drop_column(name)
-      # raise NotImplemented for SQLite3. Can't ALTER TABLE, need to copy table.
-      # We'd have to inspect it, and we can't, since we aren't executing any queries yet.
-      # Just write the sql yourself.
-      if name.is_a?(Array)
-        name.each{ |n| drop_column(n) }
-      else
-        @statements << "ALTER TABLE #{quoted_table_name} DROP COLUMN #{quote_column_name(name)}"
-      end
-    end
-    alias drop_columns drop_column
-
-    def rename_column(name, new_name, opts = {})
-      # raise NotImplemented for SQLite3
-      @statements << "ALTER TABLE #{quoted_table_name} RENAME COLUMN #{quote_column_name(name)} TO #{quote_column_name(new_name)}"
-    end
-
-    def change_column(name, type, opts = {})
-      # raise NotImplemented for SQLite3
-      @statements << "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(name)} TYPE #{type}"
-    end
-
-    def quote_column_name(name)
-      @adapter.send(:quote_column_name, name.to_s)
-    end
-
-    def quoted_table_name
-      @adapter.send(:quote_table_name, table_name)
-    end
-
-  end
-
-
 end