Skip to content

Commit 46cbca5

Browse files
alex-kulakovalex-kulakov
committed
Rename connection handlers -> connection accessors
1 parent 11bf7b1 commit 46cbca5

File tree

23 files changed

+312
-310
lines changed

23 files changed

+312
-310
lines changed

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/DriverFactory.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class DriverFactory : SqlDriverFactory
3434
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
3535
{
3636
using (var connection = new FbConnection(connectionString)) {
37-
if (configuration.ConnectionHandlers.Count > 0)
37+
if (configuration.DbConnectionAccessors.Count > 0)
3838
OpenConnectionWithNotification(connection, configuration);
3939
else
4040
OpenConnectionFast(connection, configuration);
@@ -114,17 +114,17 @@ private void OpenConnectionFast(FbConnection connection, SqlDriverConfiguration
114114

115115
private void OpenConnectionWithNotification(FbConnection connection, SqlDriverConfiguration configuration)
116116
{
117-
var handlers = configuration.ConnectionHandlers;
118-
SqlHelper.NotifyConnectionOpening(handlers, connection);
117+
var accessors = configuration.DbConnectionAccessors;
118+
SqlHelper.NotifyConnectionOpening(accessors, connection);
119119
try {
120120
connection.Open();
121121
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
122-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
122+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
123123
SqlHelper.ExecuteInitializationSql(connection, configuration);
124-
SqlHelper.NotifyConnectionOpened(handlers, connection);
124+
SqlHelper.NotifyConnectionOpened(accessors, connection);
125125
}
126126
catch (Exception ex) {
127-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
127+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
128128
throw;
129129
}
130130
}

‎Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/DriverFactory.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static Version ParseVersion(string version)
6666
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
6767
{
6868
using (var connection = new MySqlConnection(connectionString)) {
69-
if (configuration.ConnectionHandlers.Count > 0)
69+
if (configuration.DbConnectionAccessors.Count > 0)
7070
OpenConnectionWithNotification(connection, configuration);
7171
else
7272
OpenConnectionFast(connection, configuration);
@@ -119,17 +119,17 @@ private void OpenConnectionFast(MySqlConnection connection, SqlDriverConfigurati
119119

120120
private void OpenConnectionWithNotification(MySqlConnection connection, SqlDriverConfiguration configuration)
121121
{
122-
var handlers = configuration.ConnectionHandlers;
123-
SqlHelper.NotifyConnectionOpening(handlers, connection);
122+
var accessors = configuration.DbConnectionAccessors;
123+
SqlHelper.NotifyConnectionOpening(accessors, connection);
124124
try {
125125
connection.Open();
126126
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
127-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
127+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
128128
SqlHelper.ExecuteInitializationSql(connection, configuration);
129-
SqlHelper.NotifyConnectionOpened(handlers, connection);
129+
SqlHelper.NotifyConnectionOpened(accessors, connection);
130130
}
131131
catch (Exception ex) {
132-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
132+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
133133
throw;
134134
}
135135
}

‎Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/DriverFactory.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected override string BuildConnectionString(UrlInfo url)
6666
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
6767
{
6868
using (var connection = new OracleConnection(connectionString)) {
69-
if (configuration.ConnectionHandlers.Count > 0)
69+
if (configuration.DbConnectionAccessors.Count > 0)
7070
OpenConnectionWithNotification(connection, configuration);
7171
else
7272
OpenConnectionFast(connection, configuration);
@@ -113,17 +113,17 @@ private void OpenConnectionFast(OracleConnection connection, SqlDriverConfigurat
113113

114114
private void OpenConnectionWithNotification(OracleConnection connection, SqlDriverConfiguration configuration)
115115
{
116-
var handlers = configuration.ConnectionHandlers;
117-
SqlHelper.NotifyConnectionOpening(handlers, connection);
116+
var accessors = configuration.DbConnectionAccessors;
117+
SqlHelper.NotifyConnectionOpening(accessors, connection);
118118
try {
119119
connection.Open();
120120
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
121-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
121+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
122122
SqlHelper.ExecuteInitializationSql(connection, configuration);
123-
SqlHelper.NotifyConnectionOpened(handlers, connection);
123+
SqlHelper.NotifyConnectionOpened(accessors, connection);
124124
}
125125
catch (Exception ex) {
126-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
126+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
127127
throw;
128128
}
129129
}

‎Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected override string BuildConnectionString(UrlInfo url)
6060
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
6161
{
6262
using (var connection = new NpgsqlConnection(connectionString)) {
63-
if (configuration.ConnectionHandlers.Count > 0)
63+
if (configuration.DbConnectionAccessors.Count > 0)
6464
OpenConnectionWithNotification(connection, configuration);
6565
else
6666
OpenConnectionFast(connection, configuration);
@@ -117,17 +117,17 @@ private void OpenConnectionFast(NpgsqlConnection connection, SqlDriverConfigurat
117117

118118
private void OpenConnectionWithNotification(NpgsqlConnection connection, SqlDriverConfiguration configuration)
119119
{
120-
var handlers = configuration.ConnectionHandlers;
121-
SqlHelper.NotifyConnectionOpening(handlers, connection);
120+
var accessors = configuration.DbConnectionAccessors;
121+
SqlHelper.NotifyConnectionOpening(accessors, connection);
122122
try {
123123
connection.Open();
124124
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
125-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
125+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
126126
SqlHelper.ExecuteInitializationSql(connection, configuration);
127-
SqlHelper.NotifyConnectionOpened(handlers, connection);
127+
SqlHelper.NotifyConnectionOpened(accessors, connection);
128128
}
129129
catch (Exception ex) {
130-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
130+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
131131
throw;
132132
}
133133
}

‎Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public override void Open()
4242
base.Open();
4343
}
4444
else {
45-
var connectionHandlers = Extensions.Get<ConnectionHandlersExtension>();
46-
if (connectionHandlers == null) {
45+
var connectionAccessorEx = Extensions.Get<DbConnectionAccessorExtension>();
46+
if (connectionAccessorEx == null) {
4747
OpenWithCheckFast(DefaultCheckConnectionQuery);
4848
}
4949
else {
50-
OpenWithCheckAndNotification(DefaultCheckConnectionQuery, connectionHandlers);
50+
OpenWithCheckAndNotification(DefaultCheckConnectionQuery, connectionAccessorEx);
5151
}
5252
}
5353
}
@@ -60,12 +60,12 @@ public override Task OpenAsync(CancellationToken cancellationToken)
6060
return base.OpenAsync(cancellationToken);
6161
}
6262

63-
var connectionHandlers = Extensions.Get<ConnectionHandlersExtension>();
64-
if (connectionHandlers == null) {
63+
var connectionAccessorEx = Extensions.Get<DbConnectionAccessorExtension>();
64+
if (connectionAccessorEx == null) {
6565
return OpenWithCheckFastAsync(DefaultCheckConnectionQuery, cancellationToken);
6666
}
6767
else {
68-
return OpenWithCheckAndNotificationAsync(DefaultCheckConnectionQuery, connectionHandlers, cancellationToken);
68+
return OpenWithCheckAndNotificationAsync(DefaultCheckConnectionQuery, connectionAccessorEx, cancellationToken);
6969
}
7070
}
7171

@@ -80,12 +80,12 @@ public override void OpenAndInitialize(string initializationScript)
8080
var script = string.IsNullOrEmpty(initializationScript.Trim())
8181
? DefaultCheckConnectionQuery
8282
: initializationScript;
83-
var connectionHandlers = Extensions.Get<ConnectionHandlersExtension>();
84-
if (connectionHandlers == null) {
83+
var connectionAccessorEx = Extensions.Get<DbConnectionAccessorExtension>();
84+
if (connectionAccessorEx == null) {
8585
OpenWithCheckFast(script);
8686
}
8787
else {
88-
OpenWithCheckAndNotification(script, connectionHandlers);
88+
OpenWithCheckAndNotification(script, connectionAccessorEx);
8989
}
9090
}
9191

@@ -98,10 +98,10 @@ public override Task OpenAndInitializeAsync(string initializationScript, Cancell
9898
var script = string.IsNullOrEmpty(initializationScript.Trim())
9999
? DefaultCheckConnectionQuery
100100
: initializationScript;
101-
var connectionHandlers = Extensions.Get<ConnectionHandlersExtension>();
102-
return connectionHandlers == null
101+
var connectionAccessorEx = Extensions.Get<DbConnectionAccessorExtension>();
102+
return connectionAccessorEx == null
103103
? OpenWithCheckFastAsync(script, cancellationToken)
104-
: OpenWithCheckAndNotificationAsync(script, connectionHandlers, cancellationToken);
104+
: OpenWithCheckAndNotificationAsync(script, connectionAccessorEx, cancellationToken);
105105
}
106106

107107
/// <inheritdoc/>
@@ -190,25 +190,25 @@ private void OpenWithCheckFast(string checkQueryString)
190190
}
191191
}
192192

193-
private void OpenWithCheckAndNotification(string checkQueryString, ConnectionHandlersExtension connectionHandlers)
193+
private void OpenWithCheckAndNotification(string checkQueryString, DbConnectionAccessorExtension connectionAccessorEx)
194194
{
195195
var connectionChecked = false;
196196
var restoreTriggered = false;
197-
var handlers = connectionHandlers.Handlers;
197+
var accessors = connectionAccessorEx.Accessors;
198198
while (!connectionChecked) {
199-
SqlHelper.NotifyConnectionOpening(handlers, UnderlyingConnection, (!connectionChecked && !restoreTriggered));
199+
SqlHelper.NotifyConnectionOpening(accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered));
200200
underlyingConnection.Open();
201201
try {
202-
SqlHelper.NotifyConnectionInitializing(handlers, UnderlyingConnection, checkQueryString, (!connectionChecked && !restoreTriggered));
202+
SqlHelper.NotifyConnectionInitializing(accessors, UnderlyingConnection, checkQueryString, (!connectionChecked && !restoreTriggered));
203203
using (var command = underlyingConnection.CreateCommand()) {
204204
command.CommandText = checkQueryString;
205205
_ = command.ExecuteNonQuery();
206206
}
207207
connectionChecked = true;
208-
SqlHelper.NotifyConnectionOpened(handlers, UnderlyingConnection, (!connectionChecked && !restoreTriggered));
208+
SqlHelper.NotifyConnectionOpened(accessors, UnderlyingConnection, (!connectionChecked && !restoreTriggered));
209209
}
210210
catch (Exception exception) {
211-
SqlHelper.NotifyConnectionOpeningFailed(handlers, UnderlyingConnection, exception, (!connectionChecked && !restoreTriggered));
211+
SqlHelper.NotifyConnectionOpeningFailed(accessors, UnderlyingConnection, exception, (!connectionChecked && !restoreTriggered));
212212
if (InternalHelpers.ShouldRetryOn(exception)) {
213213
if (restoreTriggered) {
214214
throw;
@@ -269,31 +269,31 @@ private async Task OpenWithCheckFastAsync(string checkQueryString, CancellationT
269269
}
270270

271271
private async Task OpenWithCheckAndNotificationAsync(string checkQueryString,
272-
ConnectionHandlersExtension connectionHandlers, CancellationToken cancellationToken)
272+
DbConnectionAccessorExtension connectionAccessorEx, CancellationToken cancellationToken)
273273
{
274274
var connectionChecked = false;
275275
var restoreTriggered = false;
276-
var handlers = connectionHandlers.Handlers;
276+
var accessors = connectionAccessorEx.Accessors;
277277

278278
while (!connectionChecked) {
279279
cancellationToken.ThrowIfCancellationRequested();
280280

281-
SqlHelper.NotifyConnectionOpening(handlers, UnderlyingConnection, !connectionChecked && !restoreTriggered);
281+
SqlHelper.NotifyConnectionOpening(accessors, UnderlyingConnection, !connectionChecked && !restoreTriggered);
282282

283283
await underlyingConnection.OpenAsync(cancellationToken).ConfigureAwait(false);
284284
try {
285-
SqlHelper.NotifyConnectionInitializing(handlers,
285+
SqlHelper.NotifyConnectionInitializing(accessors,
286286
UnderlyingConnection, checkQueryString, !connectionChecked && !restoreTriggered);
287287

288288
using (var command = underlyingConnection.CreateCommand()) {
289289
command.CommandText = checkQueryString;
290290
_ = await command.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
291291
}
292292
connectionChecked = true;
293-
SqlHelper.NotifyConnectionOpened(handlers, UnderlyingConnection, !connectionChecked && !restoreTriggered);
293+
SqlHelper.NotifyConnectionOpened(accessors, UnderlyingConnection, !connectionChecked && !restoreTriggered);
294294
}
295295
catch (Exception exception) {
296-
SqlHelper.NotifyConnectionOpeningFailed(handlers,
296+
SqlHelper.NotifyConnectionOpeningFailed(accessors,
297297
UnderlyingConnection, exception, (!connectionChecked && !restoreTriggered));
298298

299299
if (InternalHelpers.ShouldRetryOn(exception)) {

‎Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private SqlServerConnection CreateAndOpenConnection(string connectionString, Sql
156156
var initScript = configuration.ConnectionInitializationSql;
157157

158158
if (!configuration.EnsureConnectionIsAlive) {
159-
if (configuration.ConnectionHandlers.Count == 0)
159+
if (configuration.DbConnectionAccessors.Count == 0)
160160
OpenConnectionFast(connection, initScript);
161161
else
162162
OpenConnectionWithNotification(connection, configuration);
@@ -166,10 +166,10 @@ private SqlServerConnection CreateAndOpenConnection(string connectionString, Sql
166166
var testQuery = string.IsNullOrEmpty(initScript)
167167
? CheckConnectionQuery
168168
: initScript;
169-
if (configuration.ConnectionHandlers.Count == 0)
169+
if (configuration.DbConnectionAccessors.Count == 0)
170170
return EnsureConnectionIsAliveFast(connection, testQuery);
171171
else
172-
return EnsureConnectionIsAliveWithNotification(connection, testQuery, configuration.ConnectionHandlers);
172+
return EnsureConnectionIsAliveWithNotification(connection, testQuery, configuration.DbConnectionAccessors);
173173
}
174174

175175
private static void OpenConnectionFast(SqlServerConnection connection, string sqlScript)
@@ -181,20 +181,20 @@ private static void OpenConnectionFast(SqlServerConnection connection, string sq
181181
private static void OpenConnectionWithNotification(SqlServerConnection connection,
182182
SqlDriverConfiguration configuration)
183183
{
184-
var handlers = configuration.ConnectionHandlers;
184+
var accessors = configuration.DbConnectionAccessors;
185185
var initSql = configuration.ConnectionInitializationSql;
186186

187-
SqlHelper.NotifyConnectionOpening(handlers, connection);
187+
SqlHelper.NotifyConnectionOpening(accessors, connection);
188188
try {
189189
connection.Open();
190190
if (!string.IsNullOrEmpty(initSql)) {
191-
SqlHelper.NotifyConnectionInitializing(handlers, connection, initSql);
191+
SqlHelper.NotifyConnectionInitializing(accessors, connection, initSql);
192192
SqlHelper.ExecuteInitializationSql(connection, initSql);
193193
}
194-
SqlHelper.NotifyConnectionOpened(handlers, connection);
194+
SqlHelper.NotifyConnectionOpened(accessors, connection);
195195
}
196196
catch (Exception ex) {
197-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
197+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
198198
throw;
199199
}
200200
}
@@ -231,26 +231,26 @@ private static SqlServerConnection EnsureConnectionIsAliveFast(SqlServerConnecti
231231
}
232232

233233
private static SqlServerConnection EnsureConnectionIsAliveWithNotification(SqlServerConnection connection,
234-
string query, IReadOnlyCollection<IConnectionHandler> handlers)
234+
string query, IReadOnlyCollection<IDbConnectionAccessor> connectionAccessors)
235235
{
236-
SqlHelper.NotifyConnectionOpening(handlers, connection);
236+
SqlHelper.NotifyConnectionOpening(connectionAccessors, connection);
237237
try {
238238
connection.Open();
239239

240-
SqlHelper.NotifyConnectionInitializing(handlers, connection, query);
240+
SqlHelper.NotifyConnectionInitializing(connectionAccessors, connection, query);
241241

242242
using (var command = connection.CreateCommand()) {
243243
command.CommandText = query;
244244
_ = command.ExecuteNonQuery();
245245
}
246246

247-
SqlHelper.NotifyConnectionOpened(handlers, connection);
247+
SqlHelper.NotifyConnectionOpened(connectionAccessors, connection);
248248
return connection;
249249
}
250250
catch (Exception exception) {
251251
var retryToConnect = InternalHelpers.ShouldRetryOn(exception);
252252
if (!retryToConnect)
253-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, exception);
253+
SqlHelper.NotifyConnectionOpeningFailed(connectionAccessors, connection, exception);
254254
try {
255255
connection.Close();
256256
connection.Dispose();
@@ -260,7 +260,7 @@ private static SqlServerConnection EnsureConnectionIsAliveWithNotification(SqlSe
260260
}
261261

262262
if (retryToConnect) {
263-
var (isReconnected, newConnection) = TryReconnectWithNotification(connection.ConnectionString, query, handlers);
263+
var (isReconnected, newConnection) = TryReconnectWithNotification(connection.ConnectionString, query, connectionAccessors);
264264
if (isReconnected) {
265265
return newConnection;
266266
}
@@ -291,25 +291,25 @@ private static (bool isReconnected, SqlServerConnection connection) TryReconnect
291291
}
292292

293293
private static (bool isReconnected, SqlServerConnection connection) TryReconnectWithNotification(
294-
string connectionString, string query, IReadOnlyCollection<IConnectionHandler> handlers)
294+
string connectionString, string query, IReadOnlyCollection<IDbConnectionAccessor> connectionAccessors)
295295
{
296296
var connection = new SqlServerConnection(connectionString);
297297

298-
SqlHelper.NotifyConnectionOpening(handlers, connection, true);
298+
SqlHelper.NotifyConnectionOpening(connectionAccessors, connection, true);
299299
try {
300300
connection.Open();
301-
SqlHelper.NotifyConnectionInitializing(handlers, connection, query, true);
301+
SqlHelper.NotifyConnectionInitializing(connectionAccessors, connection, query, true);
302302

303303
using (var command = connection.CreateCommand()) {
304304
command.CommandText = query;
305305
_ = command.ExecuteNonQuery();
306306
}
307307

308-
SqlHelper.NotifyConnectionOpened(handlers, connection, true);
308+
SqlHelper.NotifyConnectionOpened(connectionAccessors, connection, true);
309309
return (true, connection);
310310
}
311311
catch (Exception exception) {
312-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, exception, true);
312+
SqlHelper.NotifyConnectionOpeningFailed(connectionAccessors, connection, exception, true);
313313
connection.Dispose();
314314
return (false, null);
315315
}

0 commit comments

Comments
 (0)