aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-03-31 05:35:29 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-04-05 22:50:01 +0900
commite9a8c387885bc88d53221bb7fd25198b11926ec0 (patch)
tree4a139f4986af3c9e0baa1c929c4b4a03b54d35b4
parent106851c445c8a0b9358bfa4312f3459b870e775b (diff)
downloadrails-e9a8c387885bc88d53221bb7fd25198b11926ec0.tar.gz
rails-e9a8c387885bc88d53221bb7fd25198b11926ec0.tar.bz2
rails-e9a8c387885bc88d53221bb7fd25198b11926ec0.zip
Make to private `QUOTED_TRUE` and `QUOTED_FALSE` constants
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb18
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/quoting.rb18
2 files changed, 18 insertions, 18 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 f6766b996f..57d2477eac 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -34,8 +34,6 @@ module ActiveRecord
class_attribute :emulate_booleans
self.emulate_booleans = true
- QUOTED_TRUE, QUOTED_FALSE = '1', '0'
-
NATIVE_DATABASE_TYPES = {
primary_key: "int auto_increment PRIMARY KEY",
string: { name: "varchar", limit: 255 },
@@ -168,22 +166,6 @@ module ActiveRecord
# QUOTING ==================================================
#++
- def quoted_true
- QUOTED_TRUE
- end
-
- def unquoted_true
- 1
- end
-
- def quoted_false
- QUOTED_FALSE
- end
-
- def unquoted_false
- 0
- end
-
def quoted_date(value)
if supports_datetime_with_precision?
super
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
index 7c5980da2a..c19889dcd0 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
@@ -10,8 +10,26 @@ module ActiveRecord
@quoted_table_names[name] ||= super.gsub('.', '`.`')
end
+ def quoted_true
+ QUOTED_TRUE
+ end
+
+ def unquoted_true
+ 1
+ end
+
+ def quoted_false
+ QUOTED_FALSE
+ end
+
+ def unquoted_false
+ 0
+ end
+
private
+ QUOTED_TRUE, QUOTED_FALSE = '1', '0'
+
def _quote(value)
if value.is_a?(Type::Binary::Data)
"x'#{value.hex}'"