diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-12-26 10:43:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-26 10:43:19 +0900 |
| commit | 87d6fb4ece170d58ad8e0a596e9fbc96a868d03b (patch) | |
| tree | 59b6a193a592f230e2ab270365e7e7ff9e3d9824 /activerecord/lib | |
| parent | 4943c7ed11ecb9c0ae2df369faecadead08f886b (diff) | |
| parent | 55eea4e42d557037600c71556700bb82fcebcb0a (diff) | |
| download | rails-87d6fb4ece170d58ad8e0a596e9fbc96a868d03b.tar.gz rails-87d6fb4ece170d58ad8e0a596e9fbc96a868d03b.tar.bz2 rails-87d6fb4ece170d58ad8e0a596e9fbc96a868d03b.zip | |
Merge pull request #31562 from fatkodima/sqlite_migration_compatibility
Fix `add_column` with :primary_key type compatibility for SQLite
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index c72db15ce3..a8c3318905 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -297,7 +297,7 @@ module ActiveRecord end def add_column(table_name, column_name, type, options = {}) #:nodoc: - if valid_alter_table_type?(type) + if valid_alter_table_type?(type) && !options[:primary_key] super(table_name, column_name, type, options) else alter_table(table_name) do |definition| |