diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-22 06:25:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 06:25:03 -0400 |
| commit | c1972c264074211fe77cd61cc06bf04ddadf5277 (patch) | |
| tree | c94bcde3acfbfd2d740c19bc95db26773f2c94f8 | |
| parent | af08044d6a6aa87d3b389f63c78564be2f60b1ab (diff) | |
| parent | 03afbc35b6586bd9a3b8b3e9f53d850c9ed49aa7 (diff) | |
| download | rails-c1972c264074211fe77cd61cc06bf04ddadf5277.tar.gz rails-c1972c264074211fe77cd61cc06bf04ddadf5277.tar.bz2 rails-c1972c264074211fe77cd61cc06bf04ddadf5277.zip | |
Merge pull request #29870 from kamipo/use_true_false_literals
Use `TRUE` and `FALSE` boolean literals for MySQL
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 8 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/quoting.rb | 10 |
2 files changed, 4 insertions, 14 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 cbbbf99318..5915f0db2d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -863,8 +863,8 @@ module ActiveRecord class MysqlString < Type::String # :nodoc: def serialize(value) case value - when true then MySQL::Quoting::QUOTED_TRUE - when false then MySQL::Quoting::QUOTED_FALSE + when true then "1" + when false then "0" else super end end @@ -873,8 +873,8 @@ module ActiveRecord def cast_value(value) case value - when true then MySQL::Quoting::QUOTED_TRUE - when false then MySQL::Quoting::QUOTED_FALSE + when true then "1" + when false then "0" else super end end diff --git a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb index 803babf55d..be038403b8 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb @@ -4,8 +4,6 @@ module ActiveRecord module ConnectionAdapters module MySQL module Quoting # :nodoc: - QUOTED_TRUE, QUOTED_FALSE = "1".freeze, "0".freeze - def quote_column_name(name) @quoted_column_names[name] ||= "`#{super.gsub('`', '``')}`".freeze end @@ -14,18 +12,10 @@ module ActiveRecord @quoted_table_names[name] ||= super.gsub(".", "`.`").freeze end - def quoted_true - QUOTED_TRUE - end - def unquoted_true 1 end - def quoted_false - QUOTED_FALSE - end - def unquoted_false 0 end |