Skip to content

Commit 690bbce

Browse files
committed
Use adapter_name instead of is_a? to detect SQLServer
1 parent 3e9a38c commit 690bbce

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module AttributeMethods
1010
private
1111

1212
def attributes_for_update(attribute_names)
13-
return super unless self.class.connection.is_a?(SQLServerAdapter)
13+
return super unless self.class.connection.adapter_name == "SQLServer"
1414

1515
super.reject do |name|
1616
column = self.class.columns_hash[name]

lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module CoreExt
1010
module Calculations
1111
# Same as original except we don't perform PostgreSQL hack that removes ordering.
1212
def calculate(operation, column_name)
13-
return super unless klass.connection.is_a?(SQLServerAdapter)
13+
return super unless klass.connection.adapter_name == "SQLServer"
1414

1515
if has_include?(column_name)
1616
relation = apply_join_dependency
@@ -31,7 +31,7 @@ def calculate(operation, column_name)
3131
private
3232

3333
def build_count_subquery(relation, column_name, distinct)
34-
return super unless klass.connection.is_a?(SQLServerAdapter)
34+
return super unless klass.connection.adapter_name == "SQLServer"
3535

3636
super(relation.unscope(:order), column_name, distinct)
3737
end

lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Explain
99
SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
1010

1111
def exec_explain(queries)
12-
return super unless connection.is_a?(SQLServerAdapter)
12+
return super unless connection.adapter_name == "SQLServer"
1313

1414
unprepared_queries = queries.map do |(sql, binds)|
1515
[unprepare_sqlserver_statement(sql, binds), binds]

lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module FinderMethods
1212

1313
# Same as original except we order by values in distinct select if present.
1414
def construct_relation_for_exists(conditions)
15-
return super unless klass.connection.is_a?(SQLServerAdapter)
15+
return super unless klass.connection.adapter_name == "SQLServer"
1616

1717
conditions = sanitize_forbidden_attributes(conditions)
1818

lib/active_record/connection_adapters/sqlserver/core_ext/preloader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Preloader
1010
private
1111

1212
def records_for(ids)
13-
return super unless klass.connection.is_a?(SQLServerAdapter)
13+
return super unless klass.connection.adapter_name == "SQLServer"
1414

1515
ids.each_slice(in_clause_length).flat_map do |slice|
1616
scope.where(association_key_name => slice).load do |record|

0 commit comments

Comments
 (0)