dm-migrations 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ 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.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-migrations}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   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-01}
+  s.date = %q{2011-03-10}
   s.description = %q{DataMapper plugin for writing and speccing migrations}
   s.email = %q{psadauskas [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-migrations}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{DataMapper plugin for writing and speccing migrations}
   s.test_files = [
     "examples/sample_migration.rb",
@@ -104,18 +104,18 @@ Gem::Specification.new do |s|
     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.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       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"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

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

@@ -15,7 +15,7 @@ module DataMapper
       #
       # @api semipublic
       def storage_exists?(storage_name)
-        statement = <<-SQL.compress_lines
+        statement = DataMapper::Ext::String.compress_lines(<<-SQL)
           SELECT COUNT(*)
           FROM "information_schema"."tables"
           WHERE "table_type" = 'BASE TABLE'
@@ -38,7 +38,7 @@ module DataMapper
       #
       # @api semipublic
       def field_exists?(storage_name, column_name)
-        statement = <<-SQL.compress_lines
+        statement = DataMapper::Ext::String.compress_lines(<<-SQL)
           SELECT COUNT(*)
           FROM "information_schema"."columns"
           WHERE "table_schema" = ?
@@ -139,7 +139,7 @@ module DataMapper
 
         # @api private
         def create_table_statement(connection, model, properties)
-          statement = <<-SQL.compress_lines
+          statement = DataMapper::Ext::String.compress_lines(<<-SQL)
             CREATE TABLE #{quote_name(model.storage_name(name))}
             (#{properties.map { |property| property_schema_statement(connection, property_schema_hash(property)) }.join(', ')},
             PRIMARY KEY(#{ properties.key.map { |property| quote_name(property.field) }.join(', ')}))
@@ -172,7 +172,7 @@ module DataMapper
         def create_index_statement(model, index_name, fields)
           table_name = model.storage_name(name)
 
-          <<-SQL.compress_lines
+          DataMapper::Ext::String.compress_lines(<<-SQL)
             CREATE INDEX #{quote_name("index_#{table_name}_#{index_name}")} ON
             #{quote_name(table_name)} (#{fields.map { |field| quote_name(field) }.join(', ')})
           SQL
@@ -186,7 +186,7 @@ module DataMapper
           unique_indexes = unique_indexes(model).reject { |index_name, fields| fields == key }
 
           unique_indexes.map do |index_name, fields|
-            <<-SQL.compress_lines
+            DataMapper::Ext::String.compress_lines(<<-SQL)
               CREATE UNIQUE INDEX #{quote_name("unique_#{table_name}_#{index_name}")} ON
               #{quote_name(table_name)} (#{fields.map { |field| quote_name(field) }.join(', ')})
             SQL

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

@@ -15,7 +15,7 @@ module DataMapper
 
       # @api semipublic
       def storage_exists?(storage_name)
-        statement = <<-SQL.compress_lines
+        statement = DataMapper::Ext::String.compress_lines(<<-SQL)
           SELECT COUNT(*)
           FROM all_tables
           WHERE owner = ?
@@ -28,7 +28,7 @@ module DataMapper
       # @api semipublic
       def sequence_exists?(sequence_name)
         return false unless sequence_name
-        statement = <<-SQL.compress_lines
+        statement = DataMapper::Ext::String.compress_lines(<<-SQL)
           SELECT COUNT(*)
           FROM all_sequences
           WHERE sequence_owner = ?
@@ -40,7 +40,7 @@ module DataMapper
 
       # @api semipublic
       def field_exists?(storage_name, field_name)
-        statement = <<-SQL.compress_lines
+        statement = DataMapper::Ext::String.compress_lines(<<-SQL)
           SELECT COUNT(*)
           FROM all_tab_columns
           WHERE owner = ?
@@ -53,7 +53,7 @@ module DataMapper
 
       # @api semipublic
       def storage_fields(storage_name)
-        statement = <<-SQL.compress_lines
+        statement = DataMapper::Ext::String.compress_lines(<<-SQL)
           SELECT column_name
           FROM all_tab_columns
           WHERE owner = ?
@@ -176,13 +176,13 @@ module DataMapper
             sequence_name = quote_name(sequence_name)
             column_name   = quote_name(serial.field)
 
-            statements << <<-SQL.compress_lines
+            statements << DataMapper::Ext::String.compress_lines(<<-SQL)
               CREATE SEQUENCE #{sequence_name} NOCACHE
             SQL
 
             # create trigger only if custom sequence name was not specified
             unless serial.options[:sequence]
-              statements << <<-SQL.compress_lines
+              statements << DataMapper::Ext::String.compress_lines(<<-SQL)
                 CREATE OR REPLACE TRIGGER #{quote_name(default_trigger_name(table_name))}
                 BEFORE INSERT ON #{quote_name(table_name)} FOR EACH ROW
                 BEGIN
@@ -212,7 +212,7 @@ module DataMapper
         def reset_sequence_statement(model)
           if sequence_name = model_sequence_name(model)
             sequence_name = quote_name(sequence_name)
-            <<-SQL.compress_lines
+            DataMapper::Ext::String.compress_lines(<<-SQL)
             DECLARE
               cval   INTEGER;
             BEGIN

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

@@ -45,7 +45,7 @@ module DataMapper
 
         # @api private
         def create_table_statement(connection, model, properties)
-          statement = <<-SQL.compress_lines
+          statement = DataMapper::Ext::String.compress_lines(<<-SQL)
             CREATE TABLE #{quote_name(model.storage_name(name))}
             (#{properties.map { |property| property_schema_statement(connection, property_schema_hash(property)) }.join(', ')}
           SQL

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

@@ -51,7 +51,7 @@ module DataMapper
 
         # @api private
         def create_table_statement(connection, model, properties)
-          statement = <<-SQL.compress_lines
+          statement = DataMapper::Ext::String.compress_lines(<<-SQL)
             CREATE TABLE #{quote_name(model.storage_name(name))}
             (#{properties.map { |property| property_schema_statement(connection, property_schema_hash(property)) }.join(', ')}
           SQL

data/lib/dm-migrations/migration.rb

@@ -162,7 +162,7 @@ module DataMapper
 
       opts[:name] ||= "#{opts[:unique] ? 'unique_' : ''}index_#{table_name}_#{columns.join('_')}"
 
-      execute <<-SQL.compress_lines
+      execute DataMapper::Ext::String.compress_lines(<<-SQL)
         CREATE #{opts[:unique] ? 'UNIQUE ' : '' }INDEX #{quote_column_name(opts[:name])} ON
         #{quote_table_name(table_name)} (#{columns.map { |c| quote_column_name(c) }.join(', ') })
       SQL

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

@@ -33,6 +33,10 @@ module SQL
       end
     end
 
+    def change_column_type_statement(name, column)
+      "ALTER TABLE #{quote_name(name)} MODIFY COLUMN #{column.to_sql}"
+    end
+
     class Table
       def initialize(adapter, table_name)
         @columns = []

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

@@ -36,6 +36,10 @@ module SQL
       ''
     end
 
+    def change_column_type_statement(name, column)
+      "ALTER TABLE #{quote_name(name)} ALTER COLUMN #{quote_name(name)} TYPE #{column.to_sql}"
+    end
+
     class Table < SQL::Table
       def initialize(adapter, table_name)
         @adapter, @name = adapter, table_name

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

@@ -27,6 +27,10 @@ module SQL
       true
     end
 
+    def change_column_type_statement(*args)
+      raise NotImplementedError
+    end
+
     class Table < SQL::Table
       def initialize(adapter, table_name)
         @columns = []

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

@@ -67,7 +67,7 @@ module SQL
       private
 
       def build_type(type_class)
-        schema = { :name => @name, :quote_column_name => quoted_name }.merge(@opts)
+        schema = { :name => @name, :quote_column_name => quoted_name }
 
         [ :nullable, :nullable? ].each do |option|
           next if (value = schema.delete(option)).nil?
@@ -79,21 +79,23 @@ module SQL
           schema[:allow_nil] = !schema[:not_null]
         end
 
-        schema[:length] ||= schema.delete(:size) if schema.key?(:size)
-
         if type_class.kind_of?(String)
           schema[:primitive] = type_class
         else
+          type_map  = @adapter.class.type_map
           primitive = type_class.respond_to?(:primitive) ? type_class.primitive : type_class
-          options   = @adapter.class.type_map[primitive].dup
+          options   = (type_map[type_class] || type_map[primitive])
 
-          if type_class.respond_to?(:options) && type_class.options.kind_of?(options.class)
-            options.update(type_class.options)
-          end
+          schema.update(type_class.options) if type_class.respond_to?(:options)
+          schema.update(options)
 
-          schema = options.update(schema)
+          schema.delete(:length) if type_class == DataMapper::Property::Text
         end
 
+        schema.update(@opts)
+
+        schema[:length] = schema.delete(:size) if schema.key?(:size)
+
         @adapter.send(:with_connection) do |connection|
           @adapter.property_schema_statement(connection, schema)
         end

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

@@ -1,5 +1,7 @@
 module SQL
   class TableModifier
+    extend DataMapper::Property::Lookup
+
     attr_accessor :table_name, :opts, :statements, :adapter
 
     def initialize(adapter, table_name, opts = {}, &block)
@@ -36,8 +38,8 @@ module SQL
     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}"
+      column = SQL::TableCreator::Column.new(@adapter, name, type, opts)
+      @statements << @adapter.change_column_type_statement(table_name, column)
     end
 
     def quote_column_name(name)

data/spec/integration/auto_migration_spec.rb

@@ -206,7 +206,8 @@ describe DataMapper::Migrations do
               @output.last.should =~ %r{\ACREATE TABLE `blog_articles` \(`id` #{Regexp.escape(statement)} NOT NULL, PRIMARY KEY\(`id`\)\) ENGINE = InnoDB CHARACTER SET [a-z\d]+ COLLATE (?:[a-z\d](?:_?[a-z\d]+)*)\z}
             end
 
-            options.only(:min, :max).each do |key, value|
+            [ :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/] && JRUBY_VERSION < '1.5.6' && value == -9223372036854775808 do
                   lambda {
@@ -364,7 +365,8 @@ describe DataMapper::Migrations do
               @output[-2].should == "CREATE TABLE \"blog_articles\" (\"id\" #{statement} NOT NULL, PRIMARY KEY(\"id\"))"
             end
 
-            options.only(:min, :max).each do |key, value|
+            [ :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
                   lambda {
@@ -405,7 +407,8 @@ describe DataMapper::Migrations do
               @output[-2].should == "CREATE TABLE \"blog_articles\" (\"id\" #{statement} NOT NULL, PRIMARY KEY(\"id\"))"
             end
 
-            options.only(:min, :max).each do |key, value|
+            [ :min, :max ].each do |key|
+              next unless value = options[key]
               it "should allow the #{key} value #{value} to be stored" do
                 lambda {
                   resource = @model.create(@property => value)
@@ -526,7 +529,8 @@ describe DataMapper::Migrations do
               @output.last.should == "CREATE TABLE \"blog_articles\" (\"id\" #{statement} NOT NULL, PRIMARY KEY(\"id\"))"
             end
 
-            options.only(:min, :max).each do |key, value|
+            [ :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
                   lambda {

metadata

@@ -2,7 +2,7 @@
 name: dm-migrations
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin for writing and speccing migrations