Skip to content

Commit 11c270a

Browse files
lk0001wpolicarpo
andauthored
Rails 6.1 support (#853)
* use ActiveRecord::ConnectionAdapters::SchemaCreation for rails 6.1 * use just **args instead of options, **args in SQLServerRealTransaction * only use updated initialize arguments in SQLServerRealTransaction for rails 6.1 * fix for type_cast_calculated_value has already been applied to rails 5.2, so we don't need to it anymore * Remove backward compatible code Co-authored-by: Wanderson Policarpo <wpolicarpo@gmail.com>
1 parent 1f46d2c commit 11c270a

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@ def calculate(operation, column_name)
3131
def build_count_subquery(relation, column_name, distinct)
3232
super(relation.unscope(:order), column_name, distinct)
3333
end
34-
35-
def type_cast_calculated_value(value, type, operation = nil)
36-
case operation
37-
when "count" then value.to_i
38-
when "sum" then type.deserialize(value || 0)
39-
when "average" then value&.respond_to?(:to_d) ? value.to_d : value
40-
else type.deserialize(value)
41-
end
42-
end
4334
end
4435
end
4536
end

lib/active_record/connection_adapters/sqlserver/schema_creation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveRecord
44
module ConnectionAdapters
55
module SQLServer
6-
class SchemaCreation < AbstractAdapter::SchemaCreation
6+
class SchemaCreation < SchemaCreation
77
private
88

99
def visit_TableDefinition(o)

lib/active_record/connection_adapters/sqlserver/transaction.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def current_isolation_level
3131
module SQLServerRealTransaction
3232
attr_reader :starting_isolation_level
3333

34-
def initialize(connection, options, **args)
34+
def initialize(connection, isolation: nil, joinable: true, run_commit_callbacks: false)
3535
@connection = connection
36-
@starting_isolation_level = current_isolation_level if options[:isolation]
36+
@starting_isolation_level = current_isolation_level if isolation
3737
super
3838
end
3939

0 commit comments

Comments
 (0)