From e9a8c387885bc88d53221bb7fd25198b11926ec0 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Thu, 31 Mar 2016 05:35:29 +0900
Subject: Make to private `QUOTED_TRUE` and `QUOTED_FALSE` constants

---
 .../connection_adapters/abstract_mysql_adapter.rb      | 18 ------------------
 .../active_record/connection_adapters/mysql/quoting.rb | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters')

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}'"
-- 
cgit v1.2.3


From 83c337a4ab675a137397f83b74e6e0132c358164 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Thu, 31 Mar 2016 05:41:37 +0900
Subject: Move `quoted_date`, `quote_string` and
 `quote_table_name_for_assignment` methods to `Quoting` module

---
 .../connection_adapters/abstract_mysql_adapter.rb            | 12 ------------
 .../lib/active_record/connection_adapters/mysql/quoting.rb   |  8 ++++++++
 .../lib/active_record/connection_adapters/sqlite3/quoting.rb |  8 ++++++++
 .../lib/active_record/connection_adapters/sqlite3_adapter.rb | 10 ----------
 4 files changed, 16 insertions(+), 22 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters')

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 57d2477eac..1a24b64984 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -162,18 +162,6 @@ module ActiveRecord
         raise NotImplementedError
       end
 
-      #--
-      # QUOTING ==================================================
-      #++
-
-      def quoted_date(value)
-        if supports_datetime_with_precision?
-          super
-        else
-          super.sub(/\.\d{6}\z/, '')
-        end
-      end
-
       # REFERENTIAL INTEGRITY ====================================
 
       def disable_referential_integrity #:nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
index c19889dcd0..bc0608d16e 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
@@ -26,6 +26,14 @@ module ActiveRecord
           0
         end
 
+        def quoted_date(value)
+          if supports_datetime_with_precision?
+            super
+          else
+            super.sub(/\.\d{6}\z/, '')
+          end
+        end
+
         private
 
         QUOTED_TRUE, QUOTED_FALSE = '1', '0'
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
index faf2f375dc..d3a91f73c8 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
@@ -2,6 +2,14 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLite3
       module Quoting # :nodoc:
+        def quote_string(s)
+          @connection.class.quote(s)
+        end
+
+        def quote_table_name_for_assignment(table, attr)
+          quote_column_name(attr)
+        end
+
         def quote_column_name(name)
           @quoted_column_names[name] ||= %Q("#{super.gsub('"', '""')}")
         end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 5c8e428bef..786b0ab2ed 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -176,16 +176,6 @@ module ActiveRecord
         true
       end
 
-      # QUOTING ==================================================
-
-      def quote_string(s) #:nodoc:
-        @connection.class.quote(s)
-      end
-
-      def quote_table_name_for_assignment(table, attr)
-        quote_column_name(attr)
-      end
-
       #--
       # DATABASE STATEMENTS ======================================
       #++
-- 
cgit v1.2.3


From cc7f39aa63d63928df33b77add34d9f1acb782f1 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Wed, 6 Apr 2016 13:22:52 +0900
Subject: Make `QUOTED_TRUE` and `QUOTED_FALSE` to public because these are
 used in `MysqlString`

---
 .../active_record/connection_adapters/abstract_mysql_adapter.rb   | 8 ++++----
 .../lib/active_record/connection_adapters/mysql/quoting.rb        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters')

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 1a24b64984..e9ce1ba71f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -909,8 +909,8 @@ module ActiveRecord
       class MysqlString < Type::String # :nodoc:
         def serialize(value)
           case value
-          when true then QUOTED_TRUE
-          when false then QUOTED_FALSE
+          when true then MySQL::Quoting::QUOTED_TRUE
+          when false then MySQL::Quoting::QUOTED_FALSE
           else super
           end
         end
@@ -919,8 +919,8 @@ module ActiveRecord
 
         def cast_value(value)
           case value
-          when true then QUOTED_TRUE
-          when false then QUOTED_FALSE
+          when true then MySQL::Quoting::QUOTED_TRUE
+          when false then MySQL::Quoting::QUOTED_FALSE
           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 bc0608d16e..fbab654112 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
@@ -2,6 +2,8 @@ module ActiveRecord
   module ConnectionAdapters
     module MySQL
       module Quoting # :nodoc:
+        QUOTED_TRUE, QUOTED_FALSE = '1', '0'
+
         def quote_column_name(name)
           @quoted_column_names[name] ||= "`#{super.gsub('`', '``')}`"
         end
@@ -36,8 +38,6 @@ module ActiveRecord
 
         private
 
-        QUOTED_TRUE, QUOTED_FALSE = '1', '0'
-
         def _quote(value)
           if value.is_a?(Type::Binary::Data)
             "x'#{value.hex}'"
-- 
cgit v1.2.3