diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-05-03 12:58:58 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-05-03 12:58:58 +0200 |
commit | 347052a50e54f88d973a7acbd3607ec2cacee921 (patch) | |
tree | 2c8e9589d19b8c4a9800caa65350283d6fa7fd16 /activerecord/lib/active_record | |
parent | 4606eccf41014e85dfcec46186630368c43a83b0 (diff) | |
parent | cc756ea7925c92aa393a63f05073a67cf5955c28 (diff) | |
download | rails-347052a50e54f88d973a7acbd3607ec2cacee921.tar.gz rails-347052a50e54f88d973a7acbd3607ec2cacee921.tar.bz2 rails-347052a50e54f88d973a7acbd3607ec2cacee921.zip |
Merge pull request #19984 from mcfiredrill/nodoc-change-column-null
:nodoc: change_column_null in the implmenting adapters
Diffstat (limited to 'activerecord/lib/active_record')
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 76aee452ca..f4f52e85e3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -634,7 +634,7 @@ module ActiveRecord change_column table_name, column_name, column.sql_type, :default => default end - def change_column_null(table_name, column_name, null, default = nil) + def change_column_null(table_name, column_name, null, default = nil) #:nodoc: column = column_for(table_name, column_name) unless null || default.nil? diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index 70fc1a6bd8..2a229ebf42 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -438,7 +438,7 @@ module ActiveRecord end end - def change_column_null(table_name, column_name, null, default = nil) + def change_column_null(table_name, column_name, null, default = nil) #:nodoc: clear_cache! unless null || default.nil? column = column_for(table_name, column_name) diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 7e184dd510..3186769510 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -450,7 +450,7 @@ module ActiveRecord end end - def change_column_null(table_name, column_name, null, default = nil) + def change_column_null(table_name, column_name, null, default = nil) #:nodoc: unless null || default.nil? exec_query("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL") end |