aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite3
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-01-22 09:54:14 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-02-04 20:28:14 +0900
commit605837a61933fc1e94097eea30e659bb9ef516eb (patch)
treef722b4a3b8b8852f70fe782b27b173cb9dde74b1 /activerecord/lib/active_record/connection_adapters/sqlite3
parentd13bc5df902a2c82c3096b627830be97acbedf50 (diff)
downloadrails-605837a61933fc1e94097eea30e659bb9ef516eb.tar.gz
rails-605837a61933fc1e94097eea30e659bb9ef516eb.tar.bz2
rails-605837a61933fc1e94097eea30e659bb9ef516eb.zip
Correctly dump integer-like primary key with default nil
The PR #27384 changed integer-like primary key to be autoincrement unless an explicit default. This means that integer-like primary key is restored as autoincrement unless dumping the default nil explicitly. We should dump integer-like primary key with default nil correctly.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite3')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb
index c027fef83c..eec018eda3 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3/schema_dumper.rb
@@ -1,12 +1,16 @@
module ActiveRecord
module ConnectionAdapters
module SQLite3
- module ColumnDumper
+ module ColumnDumper # :nodoc:
private
def default_primary_key?(column)
schema_type(column) == :integer
end
+
+ def explicit_primary_key_default?(column)
+ column.bigint?
+ end
end
end
end