aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-10 18:01:21 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-10 18:01:21 -0200
commit82e20030d4dc022c3a25ecc82315bda553a8659d (patch)
tree45f7b352c63c59d9e865cc0eb35b89fa3ba0e117 /activerecord/lib
parent7b7eea886a62293d45fa148d776638a1371069a0 (diff)
parent5e4a99821dd9a710fe3ab434881cfdae15bd0838 (diff)
downloadrails-82e20030d4dc022c3a25ecc82315bda553a8659d.tar.gz
rails-82e20030d4dc022c3a25ecc82315bda553a8659d.tar.bz2
rails-82e20030d4dc022c3a25ecc82315bda553a8659d.zip
Merge pull request #17579 from aderyabin/cleanup_sqlite
Tiny improvement in sqlite3 adapter
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 1b5e3bdbac..b18cb353f1 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -179,10 +179,6 @@ module ActiveRecord
true
end
- def supports_add_column?
- true
- end
-
def supports_views?
true
end
@@ -451,12 +447,12 @@ module ActiveRecord
# See: http://www.sqlite.org/lang_altertable.html
# SQLite has an additional restriction on the ALTER TABLE statement
- def valid_alter_table_options( type, options)
+ def valid_alter_table_type?(type)
type.to_sym != :primary_key
end
def add_column(table_name, column_name, type, options = {}) #:nodoc:
- if supports_add_column? && valid_alter_table_options( type, options )
+ if valid_alter_table_type?(type)
super(table_name, column_name, type, options)
else
alter_table(table_name) do |definition|