Move all Schema creation into schema.rb for Mysql. Closes #9899 [miko…

…ng, lawrence]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7972 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activerecord/Rakefile

@@ -50,8 +50,6 @@ namespace :mysql do
     %x( mysqladmin  create activerecord_unittest2 )
     %x( mysql -e "grant all on activerecord_unittest.* to rails@localhost" )
     %x( mysql -e "grant all on activerecord_unittest2.* to rails@localhost" )
-    %x( mysql  activerecord_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
-    %x( mysql  activerecord_unittest2 < #{File.join(SCHEMA_PATH, 'mysql2.sql')} )
   end
 
   desc 'Drop the MySQL test databases'

activerecord/test/aaa_create_tables_test.rb

@@ -23,14 +23,22 @@ def test_load_schema
   end
 
   def test_drop_and_create_courses_table
-    recreate Course, '2' unless use_migrations?
+    if Course.connection.supports_migrations?
+      eval(File.read("#{File.dirname(__FILE__)}/fixtures/db_definitions/schema2.rb"))
+    end
+    recreate Course, '2' unless use_migrations_for_courses?
     assert true
   end
 
   private
     def use_migrations?
-      coursesSQL = ActiveRecord::Base.connection.adapter_name.downcase + "2.sql"
-      not File.exists? "#{@base_path}/#{coursesSQL}"
+      unittest_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + ".sql"
+      not File.exists? "#{@base_path}/#{unittest_sql_filename}"
+    end
+
+    def use_migrations_for_courses?
+      unittest2_sql_filename = ActiveRecord::Base.connection.adapter_name.downcase + "2.sql"
+      not File.exists? "#{@base_path}/#{unittest2_sql_filename}"
     end
 
     def recreate(base, suffix = nil)