File tree Expand file tree Collapse file tree 3 files changed +26
-7
lines changed
lib/active_record/connection_adapters Expand file tree Collapse file tree 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 55module ActiveRecord
66 module ConnectionAdapters
77 module SQLServerTransaction
8- private
8+ delegate :sqlserver? , to : :connection , prefix : true
99
10- def sqlserver?
11- connection . respond_to? ( :sqlserver? ) && connection . sqlserver?
12- end
10+ private
1311
1412 def current_isolation_level
15- return unless sqlserver ?
13+ return unless connection_sqlserver ?
1614
1715 level = connection . user_options_isolation_level
1816 # When READ_COMMITTED_SNAPSHOT is set to ON,
@@ -50,7 +48,7 @@ def rollback
5048 private
5149
5250 def reset_starting_isolation_level
53- if sqlserver ? && starting_isolation_level
51+ if connection_sqlserver ? && starting_isolation_level
5452 connection . set_transaction_isolation_level ( starting_isolation_level )
5553 end
5654 end
Original file line number Diff line number Diff line change 1212require "active_record/connection_adapters/sqlserver/core_ext/attribute_methods"
1313require "active_record/connection_adapters/sqlserver/core_ext/finder_methods"
1414require "active_record/connection_adapters/sqlserver/core_ext/preloader"
15+ require "active_record/connection_adapters/sqlserver/core_ext/abstract_adapter"
1516require "active_record/connection_adapters/sqlserver/version"
1617require "active_record/connection_adapters/sqlserver/type"
1718require "active_record/connection_adapters/sqlserver/database_limits"
@@ -100,7 +101,7 @@ def initialize(...)
100101 super
101102
102103 @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 ]
104105 @config [ :login_timeout ] = @config [ :login_timeout ] . present? ? @config [ :login_timeout ] . to_i : nil
105106 @config [ :timeout ] = @config [ :timeout ] . present? ? @config [ :timeout ] . to_i / 1000 : nil
106107 @config [ :encoding ] = @config [ :encoding ] . present? ? @config [ :encoding ] : nil
You can’t perform that action at this time.
0 commit comments