Ticket #1604: 1604_postgres_migrations.patch

activerecord/test/migration_mysql.rb

@@ -1 @@
-require 'abstract_unit'
-require 'fixtures/person'
-require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
-require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
-
-class Reminder < ActiveRecord::Base; end
-
-class MigrationTest < Test::Unit::TestCase
-  def setup
-  end
-
-  def teardown
-    ActiveRecord::Base.connection.initialize_schema_information
-    ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
-
-    Reminder.connection.drop_table("reminders") rescue nil
-    Reminder.reset_column_information
-
-    Person.connection.remove_column("people", "last_name") rescue nil
-    Person.reset_column_information
-  end
-
-  def test_add_remove_single_field
-    assert !Person.column_methods_hash.include?(:last_name)
-
-    PeopleHaveLastNames.up
-
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name)
-    
-    PeopleHaveLastNames.down
-
-    Person.reset_column_information
-    assert !Person.column_methods_hash.include?(:last_name)
-  end
-
-  def test_add_table
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-    
-    WeNeedReminders.up
-    
-    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-    assert "hello world", Reminder.find(:first)
-    
-    WeNeedReminders.down
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
-  end
-
-  def test_migrator
-    assert !Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-
-    assert_equal 2, ActiveRecord::Migrator.current_version
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name)
-    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-    assert "hello world", Reminder.find(:first)
-
-
-    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')
-
-    assert_equal 0, ActiveRecord::Migrator.current_version
-    Person.reset_column_information
-    assert !Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
-  end
-
-  def test_migrator_one_up
-    assert !Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
-
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-
-
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
-
-    assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
-    assert "hello world", Reminder.find(:first)
-  end
-  
-  def test_migrator_one_down
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-    
-    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
-
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-  end
-  
-  def test_migrator_one_up_one_down
-    ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 1)
-    ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/', 0)
-
-    assert !Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-  end
-end

activerecord/test/associations_go_eager_test.rb

@@ -11 +11 @@
-
-  def test_loading_with_one_association
-    posts = Post.find(:all, :include => :comments)
-
-
+
+
+
-
-    post = Post.find(:first, :include => :comments, :conditions => "posts.title = 'Welcome to the weblog'")
-    assert_equal 2, post.comments.size

activerecord/test/migration_test.rb

@@ -3 +3 @@
-require File.dirname(__FILE__) + '/fixtures/migrations/1_people_have_last_names'
-require File.dirname(__FILE__) + '/fixtures/migrations/2_we_need_reminders'
-
-
+
-
-
-
-
+
-
-def teardown
-ActiveRecord::Base.connection.initialize_schema_information
-ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+class MigrationTest < Test::Unit::TestCase
+def setup
+end
-
-
-
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
-    
-
+  
-
-
-
-
+  
+  
+  
-
-
-
+  
+  
-    
-
+  
-    
-
-assert "hello world", Reminder.find(:first)
+  
+  assert_equal "hello world", Reminder.find(:first).content
-    
-
-
-
+  
+  
+  
-
-
-
-
+  
+  
+  
-
-
+  
-
-
-
-
-
-assert "hello world", Reminder.find(:first)
+  
+  
+  
+  
+  assert_equal "hello world", Reminder.find(:first).content
-
+      ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
-
-
+
+
+
-
-    Person.reset_column_information
-    assert Person.column_methods_hash.include?(:last_name)
-    assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
-
+      ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/', 2)
-
-
-
-
-
-
+
+
+
-  
-
-
+  
+  
-    
-
+  
-
-
-
-
-
+  
+  
+  
+  
-  
-
-
-
+  
+  
+  
-
-
-
+
+
+
-  end
-
+

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -359 +359 @@
-
-      def initialize_schema_information
-        begin
-(#{native_database_types[:integer][:limit]})
+#{native_database_types[:integer][:limit]}
-          insert "INSERT INTO schema_info (version) VALUES(0)"
-        rescue ActiveRecord::StatementInvalid
-          # Schema has been intialized
@@ -387 +387 @@
-      def remove_column(table_name, column_name)
-        execute "ALTER TABLE #{table_name} DROP #{column_name}"
-      end
+      
+      def supports_migrations?
+        false
+      end      
-
-
-      protected
+              
-        def log(sql, name)
-          begin
-            if block_given?

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -60 +60 @@
-    # * <tt>:encoding</tt> -- An optional client encoding that is using in a SET client_encoding TO <encoding> call on connection.
-    # * <tt>:min_messages</tt> -- An optional client min messages that is using in a SET client_min_messages TO <min_messages> call on connection.
-    class PostgreSQLAdapter < AbstractAdapter
+      
+      def native_database_types
+        {
+          :primary_key => "serial primary key",
+          :string      => { :name => "character varying", :limit => 255 },
+          :text        => { :name => "text" },
+          :integer     => { :name => "integer" },
+          :float       => { :name => "float" },
+          :datetime    => { :name => "timestamp" },
+          :timestamp   => { :name => "timestamp" },
+          :time        => { :name => "timestamp" },
+          :date        => { :name => "date" },
+          :binary      => { :name => "bytea" },
+          :boolean     => { :name => "boolean"}
+        }
+      end
+      
+      def supports_migrations?
+        true
+      end      
+      
-      def select_all(sql, name = nil)
-        select(sql, name)
-      end

activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -63 +63 @@
-        "Lost connection to MySQL server during query",
-        "MySQL server has gone away"
-      ]
+      
+      def supports_migrations?
+        true
+      end
-
-      def native_database_types
-        {
@@ -89 +93 @@
-        'MySQL'
-      end
-
-
-      def select_all(sql, name = nil)
-        select(sql, name)
-      end

activerecord/lib/active_record/migration.rb

@@ -17 +17 @@
-  class Migrator#:nodoc:
-    class << self
-      def up(migrations_path, target_version = nil)
-
+self.
-      end
-      
-      def down(migrations_path, target_version = nil)
-
+self.
-      end
-      
-      def current_version
@@ -30 +30 @@
-    end
-    
-    def initialize(direction, migrations_path, target_version = nil)
+      raise StandardError.new("This database does not yet support migrations") unless Base.connection.supports_migrations?
-      @direction, @migrations_path, @target_version = direction, migrations_path, target_version
-      Base.connection.initialize_schema_information
-    end