aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-11-26 10:41:16 +0900
committerGitHub <noreply@github.com>2018-11-26 10:41:16 +0900
commitbbe1a9bcbacbdaf1beeb8983b7bf6fd38c4515a7 (patch)
tree7c2c94e17b44e173d756078e8fdb5341058b23dd
parent738d52d1c369e72dcf001a79ada6e5ae0bc9318f (diff)
parentd56a6e19c471662d9a32c6b866b10d23ec7bb05a (diff)
downloadrails-bbe1a9bcbacbdaf1beeb8983b7bf6fd38c4515a7.tar.gz
rails-bbe1a9bcbacbdaf1beeb8983b7bf6fd38c4515a7.tar.bz2
rails-bbe1a9bcbacbdaf1beeb8983b7bf6fd38c4515a7.zip
Merge pull request #34522 from yahonda/sqlite3_returns_primary_key_in_expected_order
SQLite 3.7.16+ returns the order of the primary key columns
-rw-r--r--activerecord/test/cases/primary_keys_test.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 4ed7469039..4759d3b6b2 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -354,7 +354,6 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
end
def test_composite_primary_key_out_of_order
- skip if current_adapter?(:SQLite3Adapter)
assert_equal ["code", "region"], @connection.primary_keys("barcodes_reverse")
end
@@ -376,7 +375,6 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
end
def test_dumping_composite_primary_key_out_of_order
- skip if current_adapter?(:SQLite3Adapter)
schema = dump_table_schema "barcodes_reverse"
assert_match %r{create_table "barcodes_reverse", primary_key: \["code", "region"\]}, schema
end