Skip to content

Commit 03fdc5a

Browse files
alex-kulakovalex-kulakov
committed
Rename connection handlers -> connection accessors
1 parent 85abac9 commit 03fdc5a

File tree

23 files changed

+487
-491
lines changed

23 files changed

+487
-491
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class DriverFactory : SqlDriverFactory
3333
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
3434
{
3535
using var connection = new FbConnection(connectionString);
36-
if (configuration.ConnectionHandlers.Count > 0)
36+
if (configuration.DbConnectionAccessors.Count > 0)
3737
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
3838
else
3939
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
@@ -47,7 +47,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
4747
{
4848
var connection = new FbConnection(connectionString);
4949
await using (connection.ConfigureAwait(false)) {
50-
if (configuration.ConnectionHandlers.Count > 0)
50+
if (configuration.DbConnectionAccessors.Count > 0)
5151
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
5252
else
5353
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
@@ -138,37 +138,37 @@ private static async ValueTask OpenConnectionFast(FbConnection connection,
138138
private static async ValueTask OpenConnectionWithNotification(FbConnection connection,
139139
SqlDriverConfiguration configuration, bool isAsync, CancellationToken cancellationToken = default)
140140
{
141-
var handlers = configuration.ConnectionHandlers;
141+
var accessors = configuration.DbConnectionAccessors;
142142
if (!isAsync) {
143-
SqlHelper.NotifyConnectionOpening(handlers, connection);
143+
SqlHelper.NotifyConnectionOpening(accessors, connection);
144144
try {
145145
connection.Open();
146146
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
147-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
147+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
148148
SqlHelper.ExecuteInitializationSql(connection, configuration);
149-
SqlHelper.NotifyConnectionOpened(handlers, connection);
149+
SqlHelper.NotifyConnectionOpened(accessors, connection);
150150
}
151151
catch(Exception ex) {
152-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
152+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
153153
throw;
154154
}
155155
}
156156
else {
157-
await SqlHelper.NotifyConnectionOpeningAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
157+
await SqlHelper.NotifyConnectionOpeningAsync(accessors, connection, false, cancellationToken).ConfigureAwait(false);
158158
try {
159159
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
160160

161161
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql)) {
162-
await SqlHelper.NotifyConnectionInitializingAsync(handlers,
162+
await SqlHelper.NotifyConnectionInitializingAsync(accessors,
163163
connection, configuration.ConnectionInitializationSql, false, cancellationToken)
164164
.ConfigureAwait(false);
165165
}
166166

167167
await SqlHelper.ExecuteInitializationSqlAsync(connection, configuration, cancellationToken).ConfigureAwait(false);
168-
await SqlHelper.NotifyConnectionOpenedAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
168+
await SqlHelper.NotifyConnectionOpenedAsync(accessors, connection, false, cancellationToken).ConfigureAwait(false);
169169
}
170170
catch (Exception ex) {
171-
await SqlHelper.NotifyConnectionOpeningFailedAsync(handlers, connection, ex, false, cancellationToken).ConfigureAwait(false);
171+
await SqlHelper.NotifyConnectionOpeningFailedAsync(accessors, connection, ex, false, cancellationToken).ConfigureAwait(false);
172172
throw;
173173
}
174174
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private static Version ParseVersion(string version)
7070
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
7171
{
7272
using (var connection = new MySqlConnection(connectionString)) {
73-
if (configuration.ConnectionHandlers.Count > 0)
73+
if (configuration.DbConnectionAccessors.Count > 0)
7474
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
7575
else
7676
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
@@ -90,7 +90,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
9090
{
9191
var connection = new MySqlConnection(connectionString);
9292
await using (connection.ConfigureAwait(false)) {
93-
if (configuration.ConnectionHandlers.Count > 0)
93+
if (configuration.DbConnectionAccessors.Count > 0)
9494
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
9595
else
9696
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
@@ -156,37 +156,37 @@ private async ValueTask OpenConnectionWithNotification(MySqlConnection connectio
156156
bool isAsync,
157157
CancellationToken cancellationToken = default)
158158
{
159-
var handlers = configuration.ConnectionHandlers;
159+
var acessors = configuration.DbConnectionAccessors;
160160
if (!isAsync) {
161-
SqlHelper.NotifyConnectionOpening(handlers, connection);
161+
SqlHelper.NotifyConnectionOpening(acessors, connection);
162162
try {
163163
connection.Open();
164164
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
165-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
165+
SqlHelper.NotifyConnectionInitializing(acessors, connection, configuration.ConnectionInitializationSql);
166166
SqlHelper.ExecuteInitializationSql(connection, configuration);
167-
SqlHelper.NotifyConnectionOpened(handlers, connection);
167+
SqlHelper.NotifyConnectionOpened(acessors, connection);
168168
}
169169
catch (Exception ex) {
170-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
170+
SqlHelper.NotifyConnectionOpeningFailed(acessors, connection, ex);
171171
throw;
172172
}
173173
}
174174
else {
175-
await SqlHelper.NotifyConnectionOpeningAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
175+
await SqlHelper.NotifyConnectionOpeningAsync(acessors, connection, false, cancellationToken).ConfigureAwait(false);
176176
try {
177177
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
178178

179179
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql)) {
180-
await SqlHelper.NotifyConnectionInitializingAsync(handlers,
180+
await SqlHelper.NotifyConnectionInitializingAsync(acessors,
181181
connection, configuration.ConnectionInitializationSql, false, cancellationToken)
182182
.ConfigureAwait(false);
183183
}
184184

185185
await SqlHelper.ExecuteInitializationSqlAsync(connection, configuration, cancellationToken).ConfigureAwait(false);
186-
await SqlHelper.NotifyConnectionOpenedAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
186+
await SqlHelper.NotifyConnectionOpenedAsync(acessors, connection, false, cancellationToken).ConfigureAwait(false);
187187
}
188188
catch (Exception ex) {
189-
await SqlHelper.NotifyConnectionOpeningFailedAsync(handlers, connection, ex, false, cancellationToken).ConfigureAwait(false);
189+
await SqlHelper.NotifyConnectionOpeningFailedAsync(acessors, connection, ex, false, cancellationToken).ConfigureAwait(false);
190190
throw;
191191
}
192192
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected override string BuildConnectionString(UrlInfo url)
7171
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
7272
{
7373
using var connection = new OracleConnection(connectionString);
74-
if (configuration.ConnectionHandlers.Count > 0)
74+
if (configuration.DbConnectionAccessors.Count > 0)
7575
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
7676
else
7777
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
@@ -88,7 +88,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
8888
{
8989
var connection = new OracleConnection(connectionString);
9090
await using (connection.ConfigureAwait(false)) {
91-
if (configuration.ConnectionHandlers.Count > 0)
91+
if (configuration.DbConnectionAccessors.Count > 0)
9292
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
9393
else
9494
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
@@ -149,37 +149,37 @@ private async ValueTask OpenConnectionWithNotification(OracleConnection connecti
149149
bool isAsync,
150150
CancellationToken cancellationToken = default)
151151
{
152-
var handlers = configuration.ConnectionHandlers;
152+
var accessors = configuration.DbConnectionAccessors;
153153
if (!isAsync) {
154-
SqlHelper.NotifyConnectionOpening(handlers, connection);
154+
SqlHelper.NotifyConnectionOpening(accessors, connection);
155155
try {
156156
connection.Open();
157157
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql))
158-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
158+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
159159
SqlHelper.ExecuteInitializationSql(connection, configuration);
160-
SqlHelper.NotifyConnectionOpened(handlers, connection);
160+
SqlHelper.NotifyConnectionOpened(accessors, connection);
161161
}
162162
catch (Exception ex) {
163-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
163+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
164164
throw;
165165
}
166166
}
167167
else {
168-
await SqlHelper.NotifyConnectionOpeningAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
168+
await SqlHelper.NotifyConnectionOpeningAsync(accessors, connection, false, cancellationToken).ConfigureAwait(false);
169169
try {
170170
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
171171

172172
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql)) {
173-
await SqlHelper.NotifyConnectionInitializingAsync(handlers,
173+
await SqlHelper.NotifyConnectionInitializingAsync(accessors,
174174
connection, configuration.ConnectionInitializationSql, false, cancellationToken)
175175
.ConfigureAwait(false);
176176
}
177177

178178
await SqlHelper.ExecuteInitializationSqlAsync(connection, configuration, cancellationToken).ConfigureAwait(false);
179-
await SqlHelper.NotifyConnectionOpenedAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
179+
await SqlHelper.NotifyConnectionOpenedAsync(accessors, connection, false, cancellationToken).ConfigureAwait(false);
180180
}
181181
catch (Exception ex) {
182-
await SqlHelper.NotifyConnectionOpeningFailedAsync(handlers, connection, ex, false, cancellationToken).ConfigureAwait(false);
182+
await SqlHelper.NotifyConnectionOpeningFailedAsync(accessors, connection, ex, false, cancellationToken).ConfigureAwait(false);
183183
throw;
184184
}
185185
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected override string BuildConnectionString(UrlInfo url)
6161
protected override SqlDriver CreateDriver(string connectionString, SqlDriverConfiguration configuration)
6262
{
6363
using var connection = new NpgsqlConnection(connectionString);
64-
if (configuration.ConnectionHandlers.Count > 0)
64+
if (configuration.DbConnectionAccessors.Count > 0)
6565
OpenConnectionWithNotification(connection, configuration, false).GetAwaiter().GetResult();
6666
else
6767
OpenConnectionFast(connection, configuration, false).GetAwaiter().GetResult();
@@ -76,7 +76,7 @@ protected override async Task<SqlDriver> CreateDriverAsync(
7676
{
7777
var connection = new NpgsqlConnection(connectionString);
7878
await using (connection.ConfigureAwait(false)) {
79-
if (configuration.ConnectionHandlers.Count > 0)
79+
if (configuration.DbConnectionAccessors.Count > 0)
8080
await OpenConnectionWithNotification(connection, configuration, true, token).ConfigureAwait(false);
8181
else
8282
await OpenConnectionFast(connection, configuration, true, token).ConfigureAwait(false);
@@ -155,39 +155,39 @@ private async ValueTask OpenConnectionWithNotification(NpgsqlConnection connecti
155155
bool isAsync,
156156
CancellationToken cancellationToken = default)
157157
{
158-
var handlers = configuration.ConnectionHandlers;
158+
var accessors = configuration.DbConnectionAccessors;
159159
if (!isAsync) {
160-
SqlHelper.NotifyConnectionOpening(handlers, connection);
160+
SqlHelper.NotifyConnectionOpening(accessors, connection);
161161
try {
162162
connection.Open();
163163
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql)) {
164-
SqlHelper.NotifyConnectionInitializing(handlers, connection, configuration.ConnectionInitializationSql);
164+
SqlHelper.NotifyConnectionInitializing(accessors, connection, configuration.ConnectionInitializationSql);
165165
}
166166

167167
SqlHelper.ExecuteInitializationSql(connection, configuration);
168-
SqlHelper.NotifyConnectionOpened(handlers, connection);
168+
SqlHelper.NotifyConnectionOpened(accessors, connection);
169169
}
170170
catch (Exception ex) {
171-
SqlHelper.NotifyConnectionOpeningFailed(handlers, connection, ex);
171+
SqlHelper.NotifyConnectionOpeningFailed(accessors, connection, ex);
172172
throw;
173173
}
174174
}
175175
else {
176-
await SqlHelper.NotifyConnectionOpeningAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
176+
await SqlHelper.NotifyConnectionOpeningAsync(accessors, connection, false, cancellationToken).ConfigureAwait(false);
177177
try {
178178
await connection.OpenAsync(cancellationToken).ConfigureAwait(false);
179179

180180
if (!string.IsNullOrEmpty(configuration.ConnectionInitializationSql)) {
181-
await SqlHelper.NotifyConnectionInitializingAsync(handlers,
181+
await SqlHelper.NotifyConnectionInitializingAsync(accessors,
182182
connection, configuration.ConnectionInitializationSql, false, cancellationToken)
183183
.ConfigureAwait(false);
184184
}
185185

186186
await SqlHelper.ExecuteInitializationSqlAsync(connection, configuration, cancellationToken).ConfigureAwait(false);
187-
await SqlHelper.NotifyConnectionOpenedAsync(handlers, connection, false, cancellationToken).ConfigureAwait(false);
187+
await SqlHelper.NotifyConnectionOpenedAsync(accessors, connection, false, cancellationToken).ConfigureAwait(false);
188188
}
189189
catch (Exception ex) {
190-
await SqlHelper.NotifyConnectionOpeningFailedAsync(handlers, connection, ex, false, cancellationToken).ConfigureAwait(false);
190+
await SqlHelper.NotifyConnectionOpeningFailedAsync(accessors, connection, ex, false, cancellationToken).ConfigureAwait(false);
191191
throw;
192192
}
193193
}

0 commit comments

Comments
 (0)