ardm-migrations 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34885d81397d6d6c250c93a2a7c7fc3d2476bdb2
-  data.tar.gz: a4331b8c984cac8a7cca893bd7c8152f52b47cb6
+  metadata.gz: 97d660536f5688e8e542243fff240640fc79e7da
+  data.tar.gz: 97555cdcf0f6bbd6c47564d89f3dc38ab033ac83
 SHA512:
-  metadata.gz: dcc5f0fad6fcd309dfbf4784b9a234b314fe7cea46ebb3d68dedd1dc1eaeecaf7abaa5b99bde7cd51d14e9d64a027c15d5f60b0657e9958c3417497214a00ec0
-  data.tar.gz: 3c06cbde474c3e5a445f04174f6fa10cc465e9c8635879f491e53ddf88ab9e61292013a0bb286b6d377c49a72b12bc98b85f0aad4a3caa770b495fe2211f6772
+  metadata.gz: f234a045be1464d4c866687526dcf1cf92d543d6e4eda98d45d4819699325c36a76d7eda56e1d250f9afc98c4baff267db186edd6c7f04a9ff32159e232aac7b
+  data.tar.gz: eda55ad74db16e83868f0305fe4651db9ca70db62fc45c731c624ac5da3c51943e9957b7ce395362c92055f17bb6de53aa8d83662872ed62261398fe29b8b2c4

data/README.md

@@ -1,3 +1,11 @@
+[![Gem Version](https://badge.fury.io/rb/ardm-migrations.png)][gem]
+[![Build Status](https://travis-ci.org/ar-dm/ardm-migrations.png?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/ar-dm/ardm-migrations.png?travis)][gemnasium]
+
+[gem]: https://rubygems.org/gems/ardm-migrations
+[travis]: https://travis-ci.org/ar-dm/ardm-migrations
+[gemnasium]: https://gemnasium.com/ar-dm/ardm-migrations
+
 # ardm-migrations
 
 A fork of [`dm-migrations`](https://github.com/datamapper/dm-migrations).

data/examples/Rakefile

@@ -24,7 +24,7 @@ namespace :db do
     end
 
     desc "Perform non destructive auto-migration"
-    task :upgrade => :environment do
+    task :upgrade => :environment do |t, _|
       puts "=> Auto-upgrading"
       ::DataMapper.auto_upgrade!
       puts "<= #{t.name} done"

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

@@ -202,7 +202,7 @@ module DataMapper
 
           schema_primitive = schema[:primitive]
 
-          if primitive == String && schema_primitive != 'TEXT' && schema_primitive != 'CLOB' && schema_primitive != 'NVARCHAR'
+          if primitive == String && schema_primitive != 'TEXT' && schema_primitive != 'CLOB' && schema_primitive != 'NVARCHAR' && schema_primitive != 'BYTEA'
             schema[:length] = property.length
           elsif primitive == BigDecimal || primitive == Float
             schema[:precision] = property.precision
@@ -238,8 +238,13 @@ module DataMapper
             statement << "(#{connection.quote_value(length)})"
           end
 
-          statement << " DEFAULT #{connection.quote_value(schema[:default])}" if schema.key?(:default)
+          default = schema[:default]
+          if default
+            statement << " DEFAULT #{connection.quote_value(default)}"
+          end
+
           statement << ' NOT NULL' unless schema[:allow_nil]
+
           statement
         end
 

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

@@ -22,8 +22,8 @@ module DataMapper
 
       # @api semipublic
       def field_exists?(storage_name, field_name)
-        result = select("SELECT c.name FROM sysobjects as o JOIN syscolumns AS c ON o.id = c.id WHERE o.name = #{quote_name(storage_name)} AND c.name LIKE ?", field_name).first
-        result ? result.field == field_name : false
+        result = select("SELECT c.name FROM sysobjects as o JOIN syscolumns AS c ON o.id = c.id WHERE o.name = ? AND c.name LIKE ?", storage_name, field_name).first
+        result ? result.to_s == field_name.to_s : false
       end
 
       module SQL #:nodoc:

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

@@ -7,9 +7,8 @@ module DataMapper
 
       def self.included(base)
         DataMapper.extend(Migrations::SingletonMethods)
-        [ :Repository, :Model ].each do |name|
-          DataMapper.const_get(name).send(:include, Migrations.const_get(name))
-        end
+        DataMapper::Repository.send(:include, Migrations::Repository)
+        DataMapper::Model.send(:include, Migrations::Model)
       end
 
       # @api semipublic

data/lib/dm-migrations/auto_migration.rb

@@ -184,9 +184,8 @@ module DataMapper
 
     def self.include_migration_api
       DataMapper.extend(SingletonMethods)
-      [ :Repository, :Model ].each do |name|
-        DataMapper.const_get(name).send(:include, const_get(name))
-      end
+      DataMapper::Repository.send(:include, Repository)
+      DataMapper::Model.send(:include, Model)
       DataMapper::Model.append_extensions(Model)
       Adapters::AbstractAdapter.descendants.each do |adapter_class|
         Adapters.include_migration_api(DataMapper::Inflector.demodulize(adapter_class.name))

data/lib/dm-migrations/migration.rb

@@ -138,6 +138,26 @@ module DataMapper
       end
     end
 
+    #
+    # Execute raw SQL and return a result set.
+    #
+    # @param [String] sql
+    #   The raw SQL statement.
+    #
+    # @param [Array] bind_values
+    #   Additional values to bind to the statement.
+    #
+    # @return [Array<Struct>]
+    #   The result set.
+    #
+    # @since 1.3.0
+    #
+    def select(sql, *bind_values)
+      say_with_time(sql) do
+        adapter.select(sql, *bind_values)
+      end
+    end
+
     def create_table(table_name, opts = {}, &block)
       execute TableCreator.new(adapter, table_name, opts, &block).to_sql
     end

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

@@ -41,6 +41,27 @@ module SQL
       "ALTER TABLE #{quote_name(name)} MODIFY COLUMN #{column.to_sql}"
     end
 
+    def rename_column_type_statement(table_name, old_col, new_col)
+      table       = quote_name(table_name)
+      column_info = select("SHOW COLUMNS FROM #{table} LIKE ?", old_col).first
+
+      column_options = {
+        :name      => column_info.field,
+        :primitive => column_info.type,
+        :serial    => column_info.extra == 'auto_increment',
+        :allow_nil => column_info.null == 'YES',
+        :default   => column_info.default,
+      }
+
+      column = with_connection do |connection|
+        property_schema_statement(connection, column_options)
+      end
+
+      column_definition = column.split(' ', 2).last
+
+      "ALTER TABLE #{table} CHANGE #{quote_name(old_col)} #{quote_name(new_col)} #{column_definition}"
+    end
+
     class Table
       def initialize(adapter, table_name)
         @columns = []

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

@@ -40,6 +40,10 @@ module SQL
       "ALTER TABLE #{quote_name(name)} ALTER COLUMN #{column.to_sql}"
     end
 
+    def rename_column_type_statement(table_name, old_col, new_col)
+      "ALTER TABLE #{quote_name(table_name)} RENAME COLUMN #{quote_name(old_col)} TO #{quote_name(new_col)}"
+    end
+
     class Table < SQL::Table
       def initialize(adapter, table_name)
         @adapter, @name = adapter, table_name

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

@@ -27,7 +27,11 @@ module SQL
       true
     end
 
-    def change_column_type_statement(*args)
+    def change_column_type_statement(*)
+      raise NotImplementedError
+    end
+
+    def rename_column_type_statement(*)
       raise NotImplementedError
     end
 

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

@@ -34,7 +34,7 @@ module SQL
 
     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)}"
+      @statements << @adapter.rename_column_type_statement(table_name, name, new_name)
     end
 
     def change_column(name, type, opts = {})

data/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Migrations
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/spec/integration/migration_spec.rb

@@ -123,6 +123,10 @@ describe "A Migration" do
         @migration.should respond_to(:execute)
       end
 
+      it "should make available an #select method" do
+        @migration.should respond_to(:select)
+      end
+
       it "should run the sql passed into the #execute method"
       # TODO: Find out how to stub the DataMapper::database.execute method
     end

data/spec/integration/sql_spec.rb

@@ -131,23 +131,60 @@ describe "SQL generation" do
     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
+      describe '#change_column' do
         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)}
+        case DataMapper::Spec.adapter_name.to_sym
+        when :mysql
+          it 'alters the column' do
+            @modifier.to_sql.should == %q{ALTER TABLE `people` MODIFY COLUMN `name` VARCHAR(200)}
+          end
+        when :postgres
+          it 'alters the column' do
+            @modifier.to_sql.should == %q{ALTER TABLE "people" ALTER COLUMN "name" VARCHAR(200)}
+          end
+        end
+      end
+
+      describe "#rename_column" do
+        case DataMapper::Spec.adapter_name.to_sym
+        when :postgres
+          before do
+            @modifier = DataMapper::Migration::TableModifier.new(@adapter, :people) do
+              rename_column :name, :first_name
+            end
+          end
+
+          it "should rename the column" do
+            @modifier.to_sql.should == %q{ALTER TABLE "people" RENAME COLUMN "name" TO "first_name"}
+          end
+        when :mysql
+          before do
+            # create the table so the existing column schema can be instrospected
+            @adapter.execute("CREATE TABLE `people` (name VARCHAR(50) DEFAULT 'John' NOT NULL)")
+
+            @modifier = DataMapper::Migration::TableModifier.new(@adapter, :people) do
+              rename_column :name, :first_name
+            end
+          end
+
+          after do
+            @adapter.execute('DROP TABLE `people`')
+          end
+
+          it "should change the column" do
+            @modifier.to_sql.should == %q{ALTER TABLE `people` CHANGE `name` `first_name` varchar(50) DEFAULT 'John' NOT NULL}
+          end
         end
       end
     end

data/spec/unit/migration_spec.rb

@@ -190,6 +190,22 @@ describe 'Migration' do
         end
       end
 
+      describe '#execute' do
+        before do
+          @adapter.stub!(:select)
+        end
+
+        it 'should send the SQL it its executing to the adapter execute method' do
+          @adapter.should_receive(:select).with('SELECT SOME SQL')
+          @m.select('SELECT SOME SQL')
+        end
+
+        it 'should output the SQL it is executing' do
+          @m.should_receive(:write).with(/SELECT SOME SQL/)
+          @m.select('SELECT SOME SQL')
+        end
+      end
+
       describe 'helpers' do
         before do
           @m.stub!(:execute) # don't actually run anything

data/tasks/db.rake

@@ -0,0 +1,11 @@
+namespace :db do
+  task :create do
+    sh 'mysql -uroot -e "CREATE DATABASE IF NOT EXISTS datamapper_default_tests;"'
+    sh 'mysql -uroot -e "CREATE DATABASE IF NOT EXISTS datamapper_alternate_tests;"'
+  end
+
+  task :drop do
+    sh 'mysql -uroot -e "DROP DATABASE IF EXISTS datamapper_default_tests;"'
+    sh 'mysql -uroot -e "DROP DATABASE IF EXISTS datamapper_alternate_tests;"'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm-migrations
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Martin Emde
@@ -119,6 +119,7 @@ files:
 - spec/unit/sql/table_modifier_spec.rb
 - spec/unit/sql/table_spec.rb
 - spec/unit/sql_spec.rb
+- tasks/db.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake