migrant 1.3.2 → 1.4.0

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - rbx-18mode
-  - ree

data/README.rdoc

@@ -16,8 +16,8 @@ In your Gemfile:
   gem "migrant"
   
 * Rails: 3.0+ (Sorry folks, no plans for Rails 2 support)
-* Ruby: Tested with 1.8.7 MRI, 1.9.2 MRI, and Rubinius 1.2.1 
-* Adapters: Tested with SQLite3, MySQL, MySQL2, Pg. Should work with any AR adapter in theory.
+* Ruby: 1.9, Rbx, JRuby Supported, 1.8 works but unsupported (See Travis CI)
+* Adapters: Tested with SQLite3, MySQL2, Pg. May work with other ActiveRecord adapters
 
 == Jumping right in
 
@@ -42,7 +42,6 @@ correct database schema for you. Note that you don't need to specify foreign key
 they are automatically inferred from your relations. Here is a further example:
 
   class User < ActiveRecord::Base
-    # Define your associations BEFORE your structure block!
     has_many :businesses
 
     structure do

data/Rakefile

@@ -31,13 +31,3 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "migrant #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/changelog.md

@@ -1,3 +1,23 @@
+### 1.4.0 / 2013-02-03
+
+[full changelog](http://github.com/pascalh1011/migrant/compare/v1.3.2...v1.4.0)
+
+* Features
+  * Changes to the column default are now detected
+  * Change migrations filenames are named using new default values (to avoid conflicts)
+  * Remove official 1.8 support (still works but too much testing overhead for now)
+
+* Bug fixes
+  * Fixed associations failing to be added to the base model when using STI
+  * Fix possible issue with PostgreSQL regenerating migrations if the range primitive is used
+
+### 1.3.2 / 2012-03-08
+
+[full changelog](http://github.com/pascalh1011/migrant/compare/v1.3.1...v1.3.2)
+
+* Bug fixes
+  * [CRITICAL] Specifying a belongs_to association in a model no longer automatically assumes a schema creation
+
 ### 1.3.1 / 2012-02-12
 
 [full changelog](http://github.com/pascalh1011/migrant/compare/v1.3.0...v1.3.1)

data/lib/dsl/data_type.rb

@@ -58,7 +58,9 @@ module DataType
       if current_structure
         # General RDBMS data loss scenarios
         if new_structure[:limit] && current_structure[:limit].to_i != new_structure[:limit].to_i ||
-           new_structure[:type] != current_structure[:type]
+           new_structure[:type] != current_structure[:type] ||
+           new_structure[:default] && new_structure[:default] != current_structure[:default]
+
            column
         else
           nil # No changes

data/lib/dsl/data_types/primitives.rb

@@ -66,7 +66,6 @@ module DataType
   class Range < Base
     def column_defaults
       definition = {:type => :integer}
-      definition[:limit] = @value.max.to_s.length if @value.respond_to?(:max)
       definition
     end
   end

data/lib/migrant/migration_generator.rb

@@ -36,7 +36,7 @@ module Migrant
 
         if model.table_exists?
           # Structure ActiveRecord::Base's column information so we can compare it directly to the schema
-          db_schema = Hash[*model.columns.collect {|c| [c.name.to_sym, Hash[*[:type, :limit].map { |type| [type, c.send(type)] }.flatten]  ] }.flatten]
+          db_schema = Hash[*model.columns.collect {|c| [c.name.to_sym, Hash[*[:type, :limit, :default].map { |type| [type, c.send(type)] }.flatten]  ] }.flatten]
           model.schema.columns.to_a.sort { |a,b| a.to_s <=> b.to_s }.each do |field_name, data_type|
             if data_type.dangerous_migration_from?(db_schema[field_name]) && 
                ask_user("#{model}: '#{field_name}': Converting from ActiveRecord type #{db_schema[field_name][:type]} to #{data_type.column[:type]} could cause data loss. Continue?", %W{Yes No}, true) == "No"
@@ -90,7 +90,7 @@ module Migrant
 
           # Example: changed_table_added_something_and_modified_something
           @activity = 'changed_'+model.table_name+[['added', @columns[:added]], ['modified', @columns[:changed]], ['deleted', destroyed_columns], 
-          ['moved', @columns[:transferred]], ['renamed', @columns[:renamed]], ['indexed', @new_indexes]].reject { |v| v[1].empty? }.collect { |v| "_#{v[0]}_"+v[1].collect(&:first).join('_') }.join('_and')
+          ['moved', @columns[:transferred]], ['renamed', @columns[:renamed]], ['indexed', @new_indexes]].reject { |v| v[1].empty? }.collect { |v| "_#{v[0]}_"+v[1].collect(&:last).join('_') }.join('_and')
           @activity = @activity.split('_')[0..2].join('_')+'_with_multiple_changes' if @activity.length >= 240 # Most filesystems will raise Errno::ENAMETOOLONG otherwise
           
           render('change_migration')
@@ -116,24 +116,30 @@ module Migrant
 
     private
     def add_column(name, options)
-      @columns[:added] << [name, options]
+      @columns[:added] << [name, options, name]
     end
     
     def change_column(name, new_schema, old_schema)
-      @columns[:changed] << [name, new_schema, old_schema]
+      if new_schema[:default] && new_schema[:default].respond_to?(:to_s) && new_schema[:default].to_s.length < 31
+        change_description = "#{name}_defaulted_to_#{new_schema[:default].to_s.underscore}"
+      else
+        change_description = name
+      end
+
+      @columns[:changed] << [name, new_schema, old_schema, change_description]
     end
     
     def delete_column(name, current_structure)
-      @columns[:deleted] << [name, current_structure]
+      @columns[:deleted] << [name, current_structure, name]
     end
     
     def move_column(old_name, new_name, old_schema, new_schema)
       if new_schema == old_schema
-        @columns[:renamed] << [old_name, new_name]
+        @columns[:renamed] << [old_name, new_name, old_name]
         @columns[:added].reject! { |a| a.first == new_name } # Don't add the column too
       else
         @possible_irreversible_migrations = true
-        @columns[:transferred] << [old_name, new_name] # Still need to add the column, just transfer the data afterwards
+        @columns[:transferred] << [old_name, new_name, old_name] # Still need to add the column, just transfer the data afterwards
         delete_column(old_name, old_schema)
       end
     end

data/lib/migrant/schema.rb

@@ -106,6 +106,10 @@ module Migrant
     def requires_migration?
       false # All added to base table
     end
+
+    def add_association(association)
+      parent_schema.add_association(association)
+    end
   end
 
   # Why does this class exist? Excellent question.

data/test/rails_app/app/models/business.rb

@@ -16,7 +16,7 @@ class Business < ActiveRecord::Base
     operating_days   0..6
     date_established :datetime
     next_sale        (Time.now + 10.days)
-    verified         false
+    verified         false, :default => false
     location         :type => :string, :limit => 127
     awards           ["Best business 2007", "Tastiest Chicken 2008"]
     managers         :serialized

data/test/rails_app/app/models/customer.rb

@@ -1,4 +1,6 @@
 class Customer < User
+  belongs_to :category
+
   structure do
     money_spent   "$5.00"
     money_gifted  "NOK 550.00" 

data/test/test_data_schema.rb

@@ -13,7 +13,8 @@ class TestDataSchema < Test::Unit::TestCase
     should "generate a foreign key field for a belongs_to association" do
       assert_schema(Business, :user_id, :type => :integer)
       assert_schema(BusinessCategory, :business_id, :type => :integer)      
-      assert_schema(BusinessCategory, :category_id, :type => :integer)      
+      assert_schema(BusinessCategory, :category_id, :type => :integer)  
+      assert_schema(User, :category_id, :type => :integer) 
     end  
     
     should "generate foreign key fields for a *polymorphic* belongs_to association" do
@@ -31,7 +32,7 @@ class TestDataSchema < Test::Unit::TestCase
     end
 
     should "generate a smallint column when given a small range" do
-      assert_schema(Business, :operating_days, :limit => 1, :type => :integer)
+      assert_schema(Business, :operating_days, :type => :integer)
     end
     
     should "generate a large integer (size 8) for any bignum types" do

data/test/test_migration_generator.rb

@@ -230,6 +230,14 @@ class TestMigrationGenerator < Test::Unit::TestCase
       STDIN._mock_responses('M', 'incompatible_spot', 'N', 'Y')
       run_against_template('added_incompatible_spot_and_deleted_spots')
     end
+
+    should "update a column to include a new default" do
+      Business.structure do
+        verified true, :default => true
+      end
+
+      run_against_template('modified_verified')
+    end
   end
 end
 

data/test/verified_output/migrations/create_businesses.rb

@@ -6,15 +6,15 @@ class CreateBusinesses < ActiveRecord::Migration
       t.integer :owner_id 
       t.string :name 
       t.string :website 
-      t.text :address 
+      t.text :address
       t.string :summary 
       t.text :description 
       t.string :landline 
       t.string :mobile 
-      t.integer :operating_days, :limit=>1 
+      t.integer :operating_days
       t.datetime :date_established 
       t.datetime :next_sale 
-      t.boolean :verified 
+      t.boolean :verified
       t.string :location, :limit=>127 
       t.text :awards 
       t.text :managers 

data/test/verified_output/migrations/create_reviews.rb

@@ -4,7 +4,7 @@ class CreateReviews < ActiveRecord::Migration
       t.integer :business_id
       t.integer :user_id
       t.string :name
-      t.integer :rating, :limit=>1
+      t.integer :rating
       t.text :body
       t.integer :views
     end

data/test/verified_output/migrations/create_users.rb

@@ -3,6 +3,7 @@ class CreateUsers < ActiveRecord::Migration
     create_table :users do |t|
       t.string :name
       t.string :email
+      t.integer :category_id
       t.string :encrypted_password, :limit=>48
       t.string :password_salt, :limit=>42
       t.decimal :money_spent, :precision=>10, :scale=>2

data/test/verified_output/migrations/landline.rb

@@ -4,6 +4,6 @@ class ChangedBusinessesModifiedLandline < ActiveRecord::Migration
   end
   
   def self.down
-    change_column :businesses, :landline, :string, :limit=>255
+    change_column :businesses, :landline, :string, :limit=>255, :default=>nil
   end
 end

data/test/verified_output/migrations/modified_verified.rb

@@ -0,0 +1,9 @@
+class ChangedBusinessesModifiedVerifiedDefaultedToTrue < ActiveRecord::Migration
+  def self.up
+    change_column :businesses, :verified, :boolean, :default=>true
+  end
+  
+  def self.down
+    change_column :businesses, :verified, :boolean, :limit=>nil, :default=>false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: migrant
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-23 00:00:00.000000000Z
+date: 2011-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &2152389600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152389600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152388420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152388420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2152387000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152387000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2152385460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152385460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152384020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152384020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152381760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152381760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2152379720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152379720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152378020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152378020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152376680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2152376680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152375460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152375460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152374300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152374300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2152373160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152373160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152371600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +213,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152371600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easier schema management for Rails that complements your domain model.
 email: 101pascal@gmail.com
 executables: []
@@ -246,6 +311,7 @@ files:
 - test/verified_output/migrations/deleted_spots.rb
 - test/verified_output/migrations/estimated_value_notes.rb
 - test/verified_output/migrations/landline.rb
+- test/verified_output/migrations/modified_verified.rb
 - test/verified_output/migrations/renamed_old_spots.rb
 homepage: http://github.com/pascalh1011/migrant
 licenses: []
@@ -267,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: All the fun of ActiveRecord without writing your migrations, and with a dash