File tree 3 files changed +26
-7
lines changed
lib/active_record/connection_adapters
3 files changed +26
-7
lines changed Original file line number Diff line number Diff line change
1
+ # frozen_string_literal: true
2
+
3
+ module ActiveRecord
4
+ module ConnectionAdapters
5
+ module SQLServer
6
+ module CoreExt
7
+ module AbstractAdapter
8
+ def sqlserver?
9
+ false
10
+ end
11
+ end
12
+ end
13
+ end
14
+ end
15
+ end
16
+
17
+ ActiveSupport . on_load ( :active_record ) do
18
+ mod = ActiveRecord ::ConnectionAdapters ::SQLServer ::CoreExt ::AbstractAdapter
19
+ ActiveRecord ::ConnectionAdapters ::AbstractAdapter . prepend ( mod )
20
+ end
Original file line number Diff line number Diff line change 5
5
module ActiveRecord
6
6
module ConnectionAdapters
7
7
module SQLServerTransaction
8
- private
8
+ delegate :sqlserver? , to : :connection , prefix : true
9
9
10
- def sqlserver?
11
- connection . respond_to? ( :sqlserver? ) && connection . sqlserver?
12
- end
10
+ private
13
11
14
12
def current_isolation_level
15
- return unless sqlserver ?
13
+ return unless connection_sqlserver ?
16
14
17
15
level = connection . user_options_isolation_level
18
16
# When READ_COMMITTED_SNAPSHOT is set to ON,
@@ -50,7 +48,7 @@ def rollback
50
48
private
51
49
52
50
def reset_starting_isolation_level
53
- if sqlserver ? && starting_isolation_level
51
+ if connection_sqlserver ? && starting_isolation_level
54
52
connection . set_transaction_isolation_level ( starting_isolation_level )
55
53
end
56
54
end
Original file line number Diff line number Diff line change 12
12
require "active_record/connection_adapters/sqlserver/core_ext/attribute_methods"
13
13
require "active_record/connection_adapters/sqlserver/core_ext/finder_methods"
14
14
require "active_record/connection_adapters/sqlserver/core_ext/preloader"
15
+ require "active_record/connection_adapters/sqlserver/core_ext/abstract_adapter"
15
16
require "active_record/connection_adapters/sqlserver/version"
16
17
require "active_record/connection_adapters/sqlserver/type"
17
18
require "active_record/connection_adapters/sqlserver/database_limits"
@@ -100,7 +101,7 @@ def initialize(...)
100
101
super
101
102
102
103
@config [ :tds_version ] = "7.3" unless @config [ :tds_version ]
103
- @config [ :appname ] = rails_application_name unless @config [ :appname ]
104
+ @config [ :appname ] = self . class . rails_application_name unless @config [ :appname ]
104
105
@config [ :login_timeout ] = @config [ :login_timeout ] . present? ? @config [ :login_timeout ] . to_i : nil
105
106
@config [ :timeout ] = @config [ :timeout ] . present? ? @config [ :timeout ] . to_i / 1000 : nil
106
107
@config [ :encoding ] = @config [ :encoding ] . present? ? @config [ :encoding ] : nil
You can’t perform that action at this time.
0 commit comments