Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make to private the visibility of _quote and _type_cast #24368

Merged
merged 1 commit into from
Mar 30, 2016
Merged

Make to private the visibility of _quote and _type_cast #24368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'active_record/connection_adapters/abstract_adapter'
require 'active_record/connection_adapters/mysql/column'
require 'active_record/connection_adapters/mysql/explain_pretty_printer'
require 'active_record/connection_adapters/mysql/quoting'
require 'active_record/connection_adapters/mysql/schema_creation'
require 'active_record/connection_adapters/mysql/schema_definitions'
require 'active_record/connection_adapters/mysql/schema_dumper'
Expand All @@ -11,6 +12,7 @@
module ActiveRecord
module ConnectionAdapters
class AbstractMysqlAdapter < AbstractAdapter
include MySQL::Quoting
include MySQL::ColumnDumper
include Savepoints

Expand Down Expand Up @@ -165,14 +167,6 @@ def error_number(exception) # :nodoc:

# QUOTING ==================================================

def _quote(value) # :nodoc:
if value.is_a?(Type::Binary::Data)
"x'#{value.hex}'"
else
super
end
end

def quote_column_name(name) #:nodoc:
@quoted_column_names[name] ||= "`#{name.to_s.gsub('`', '``')}`"
end
Expand Down
17 changes: 17 additions & 0 deletions activerecord/lib/active_record/connection_adapters/mysql/quoting.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module ActiveRecord
module ConnectionAdapters
module MySQL
module Quoting # :nodoc:
private

def _quote(value)
if value.is_a?(Type::Binary::Data)
"x'#{value.hex}'"
else
super
end
end
end
end
end
end
32 changes: 32 additions & 0 deletions activerecord/lib/active_record/connection_adapters/sqlite3/quoting.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module ActiveRecord
module ConnectionAdapters
module SQLite3
module Quoting # :nodoc:
private

def _quote(value)
if value.is_a?(Type::Binary::Data)
"x'#{value.hex}'"
else
super
end
end

def _type_cast(value)
case value
when BigDecimal
value.to_f
when String
if value.encoding == Encoding::ASCII_8BIT
super(value.encode(Encoding::UTF_8))
else
super
end
else
super
end
end
end
end
end
end
27 changes: 3 additions & 24 deletions activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'active_record/connection_adapters/abstract_adapter'
require 'active_record/connection_adapters/statement_pool'
require 'active_record/connection_adapters/sqlite3/explain_pretty_printer'
require 'active_record/connection_adapters/sqlite3/quoting'
require 'active_record/connection_adapters/sqlite3/schema_creation'

gem 'sqlite3', '~> 1.3.6'
Expand Down Expand Up @@ -49,6 +50,8 @@ module ConnectionAdapters #:nodoc:
# * <tt>:database</tt> - Path to the database file.
class SQLite3Adapter < AbstractAdapter
ADAPTER_NAME = 'SQLite'.freeze

include SQLite3::Quoting
include Savepoints

NATIVE_DATABASE_TYPES = {
Expand Down Expand Up @@ -176,30 +179,6 @@ def supports_explain?

# QUOTING ==================================================

def _quote(value) # :nodoc:
case value
when Type::Binary::Data
"x'#{value.hex}'"
else
super
end
end

def _type_cast(value) # :nodoc:
case value
when BigDecimal
value.to_f
when String
if value.encoding == Encoding::ASCII_8BIT
super(value.encode(Encoding::UTF_8))
else
super
end
else
super
end
end

def quote_string(s) #:nodoc:
@connection.class.quote(s)
end
Expand Down