aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-12-26 16:00:40 +0900
committerGitHub <noreply@github.com>2017-12-26 16:00:40 +0900
commit9507b4f02d332cccf76ca803b967dab69ab6bfdd (patch)
treeeac5a7a89279bb9bd888051f91bd37ef33618dc8 /activerecord
parent87d6fb4ece170d58ad8e0a596e9fbc96a868d03b (diff)
downloadrails-9507b4f02d332cccf76ca803b967dab69ab6bfdd.tar.gz
rails-9507b4f02d332cccf76ca803b967dab69ab6bfdd.tar.bz2
rails-9507b4f02d332cccf76ca803b967dab69ab6bfdd.zip
Make `sql_type` of primary key in SQLite to comparable with an integer (#28008)
Originally I tried to add `assert_equal pk.sql_type, ref.sql_type`. But the assert failed even though the same type due to `sql_type` of primary key in SQLite is upper case. Prefer lower case like other types.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb2
-rw-r--r--activerecord/test/cases/base_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index a8c3318905..5a4540f6ad 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -60,7 +60,7 @@ module ActiveRecord
include SQLite3::SchemaStatements
NATIVE_DATABASE_TYPES = {
- primary_key: "INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL",
+ primary_key: "integer PRIMARY KEY AUTOINCREMENT NOT NULL",
string: { name: "varchar" },
text: { name: "text" },
integer: { name: "integer" },
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index b076b452e7..a49990008c 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -104,7 +104,7 @@ class BasicsTest < ActiveRecord::TestCase
pk = Author.columns_hash["id"]
ref = Post.columns_hash["author_id"]
- assert_equal pk.bigint?, ref.bigint?
+ assert_equal pk.sql_type, ref.sql_type
end
def test_many_mutations