Ensure copy table test runs for sqlite and sqlite3. [mislav] Cllosoes #8328

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

2 files changed, 7 insertions, 9 deletions

diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index f68457b7db..7c9e2fcc44 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -30,11 +30,8 @@ task :default => [ :test_mysql, :test_sqlite, :test_sqlite3, :test_postgresql ]
 for adapter in %w( mysql postgresql sqlite sqlite3 firebird sqlserver sqlserver_odbc db2 oracle sybase openbase frontbase )
   Rake::TestTask.new("test_#{adapter}") { |t|
     t.libs << "test" << "test/connections/native_#{adapter}"
-    if adapter =~ /^sqlserver/
-      t.pattern = "test/**/*_test{,_sqlserver}.rb"
-    else
-      t.pattern = "test/**/*_test{,_#{adapter}}.rb"
-    end
+    adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z]+/]
+    t.pattern = "test/**/*_test{,_#{adapter_short}}.rb"
     t.verbose = true
   }
 end
@@ -223,4 +220,4 @@ task :release => [ :package ] do
   rubyforge = RubyForge.new
   rubyforge.login
   rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/copy_table_sqlite.rb b/activerecord/test/copy_table_test_sqlite.rb
index f3f5f1ce46..6da041522f 100644
--- a/activerecord/test/copy_table_sqlite.rb
+++ b/activerecord/test/copy_table_test_sqlite.rb
@@ -26,8 +26,9 @@ class CopyTableTest < Test::Unit::TestCase
   def test_copy_table_renaming_column
     test_copy_table('companies', 'companies2', 
         :rename => {'client_of' => 'fan_of'}) do |from, to, options|
-      assert_equal column_values(from, 'client_of').compact.sort, 
-                   column_values(to, 'fan_of').compact.sort
+      expected = column_values(from, 'client_of')
+      assert expected.any?, 'only nils in resultset; real values are needed'
+      assert_equal expected, column_values(to, 'fan_of')
     end
   end
   
@@ -51,7 +52,7 @@ protected
   end
   
   def column_values(table, column)
-    @connection.select_all("SELECT #{column} FROM #{table}").map {|row| row[column]}
+    @connection.select_all("SELECT #{column} FROM #{table} ORDER BY id").map {|row| row[column]}
   end
 
   def table_indexes_without_name(table)