Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG

1 files changed, 44 insertions, 4 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 964e2d4eb8..c3af1f0177 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -82,32 +82,72 @@ end
 rm_f "#{root_dir}/activerecord/debug.log"
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with MySQL"
+  puts "[CruiseControl] Building Active Record with MySQL IM enabled"
   puts
+  ENV['IM'] = 'true'
   build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
   build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with MySQL2"
+  puts "[CruiseControl] Building Active Record with MySQL IM disabled"
   puts
+  ENV['IM'] = 'false'
+  build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
+  build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with MySQL2 IM enabled"
+  puts
+  ENV['IM'] = 'true'
+  build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
+  build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with MySQL2 IM disabled"
+  puts
+  ENV['IM'] = 'false'
   build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
   build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with PostgreSQL"
+  puts "[CruiseControl] Building Active Record with PostgreSQL IM enabled"
   puts
+  ENV['IM'] = 'true'
   build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
   build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with SQLite 3"
+  puts "[CruiseControl] Building Active Record with PostgreSQL IM disabled"
+  puts
+  ENV['IM'] = 'false'
+  build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
+  build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with SQLite 3 IM enabled"
+  puts
+  ENV['IM'] = 'true'
+  build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
+  build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with SQLite 3 IM disabled"
   puts
+  ENV['IM'] = 'false'
   build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
   build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end