Change pre-open to opening

UCan927 · Jun 23, 2022 · afe343c · afe343c
1 parent f74cffb
commit afe343c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/PetaPoco.Tests.Unit/DatabaseConfigurationTests.cs b/PetaPoco.Tests.Unit/DatabaseConfigurationTests.cs
@@ -277,14 +277,14 @@ public void UsingConnectionClosing_AfterCreate_InstanceShouldHaveDelegate()
         }
 
         [Fact]
-        public void UsingConnectionPreOpened_AfterCreate_InstanceShouldHaveDelegate()
+        public void UsingConnectionOpening_AfterCreate_InstanceShouldHaveDelegate()
         {
             bool eventFired = false;
             EventHandler<DbConnectionEventArgs> handler = (sender, args) => eventFired = true;
 
             var db = config.UsingConnectionString("cs").UsingProvider<SqlServerDatabaseProvider>().UsingConnectionOpened(handler).Create();
 
-            (db as Database).OnConnectionPreOpened(null);
+            (db as Database).OnConnectionOpening(null);
             eventFired.ShouldBeTrue();
         }
 
@@ -294,7 +294,7 @@ public void UsingConnectionOpened_AfterCreate_InstanceShouldHaveDelegate()
             bool eventFired = false;
             EventHandler<DbConnectionEventArgs> handler = (sender, args) => eventFired = true;
 
-            var db = config.UsingConnectionString("cs").UsingProvider<SqlServerDatabaseProvider>().UsingConnectionPreOpened(handler).Create();
+            var db = config.UsingConnectionString("cs").UsingProvider<SqlServerDatabaseProvider>().UsingConnectionOpening(handler).Create();
 
             (db as Database).OnConnectionOpened(null);
             eventFired.ShouldBeTrue();

diff --git a/PetaPoco/Database.cs b/PetaPoco/Database.cs
@@ -279,7 +279,7 @@ public Database(IDatabaseBuildConfiguration configuration)
             settings.TryGetSetting<int>(DatabaseConfigurationExtensions.CommandTimeout, v => CommandTimeout = v);
             settings.TryGetSetting<IsolationLevel>(DatabaseConfigurationExtensions.IsolationLevel, v => IsolationLevel = v);
 
-            settings.TryGetSetting<EventHandler<DbConnectionEventArgs>>(DatabaseConfigurationExtensions.ConnectionPreOpened, v => ConnectionPreOpened += v);
+            settings.TryGetSetting<EventHandler<DbConnectionEventArgs>>(DatabaseConfigurationExtensions.ConnectionOpening, v => ConnectionOpening += v);
             settings.TryGetSetting<EventHandler<DbConnectionEventArgs>>(DatabaseConfigurationExtensions.ConnectionOpened, v => ConnectionOpened += v);
             settings.TryGetSetting<EventHandler<DbConnectionEventArgs>>(DatabaseConfigurationExtensions.ConnectionClosing, v => ConnectionClosing += v);
             settings.TryGetSetting<EventHandler<DbTransactionEventArgs>>(DatabaseConfigurationExtensions.TransactionStarted, v => TransactionStarted += v);
@@ -346,7 +346,7 @@ public void OpenSharedConnection()
                 _sharedConnection = _factory.CreateConnection();
                 _sharedConnection.ConnectionString = _connectionString;
 
-                _sharedConnection = OnConnectionPreOpened(_sharedConnection);
+                _sharedConnection = OnConnectionOpening(_sharedConnection);
 
                 if (_sharedConnection.State == ConnectionState.Broken)
                     _sharedConnection.Close();
@@ -801,10 +801,10 @@ public virtual IDbConnection OnConnectionOpened(IDbConnection conn)
         ///     Override this method to provide custom logging of opening connection, or
         ///     to provide a proxy IDbConnection.
         /// </remarks>
-        public virtual IDbConnection OnConnectionPreOpened(IDbConnection conn)
+        public virtual IDbConnection OnConnectionOpening(IDbConnection conn)
         {
             var args = new DbConnectionEventArgs(conn);
-            ConnectionPreOpened?.Invoke(this, args);
+            ConnectionOpening?.Invoke(this, args);
             return args.Connection;
         }
 
@@ -3153,7 +3153,7 @@ private async Task<object> CommandHelper(CancellationToken cancellationToken, Db
         /// <summary>
         ///     Occurs when a database connection is about to be opened.
         /// </summary>
-        public event EventHandler<DbConnectionEventArgs> ConnectionPreOpened;
+        public event EventHandler<DbConnectionEventArgs> ConnectionOpening;
 
         /// <summary>
         ///     Occurs when a database exception has been thrown.

diff --git a/PetaPoco/DatabaseConfigurationExtensions.cs b/PetaPoco/DatabaseConfigurationExtensions.cs
@@ -26,7 +26,7 @@ public static class DatabaseConfigurationExtensions
         internal const string TransactionEnding = "TransactionEnding";
         internal const string CommandExecuting = "CommandExecuting";
         internal const string CommandExecuted = "CommandExecuted";
-        internal const string ConnectionPreOpened = "ConnectionPreOpened";
+        internal const string ConnectionOpening = "ConnectionOpening";
         internal const string ConnectionOpened = "ConnectionOpened";
         internal const string ConnectionClosing = "ConnectionClosing";
         internal const string ExceptionThrown = "ExceptionThrown";
@@ -359,9 +359,9 @@ public static IDatabaseBuildConfiguration UsingCommandExecuted(this IDatabaseBui
         /// <param name="source">The configuration source.</param>
         /// <param name="handler"></param>
         /// <returns>The configuration source, to form a fluent interface.</returns>
-        public static IDatabaseBuildConfiguration UsingConnectionPreOpened(this IDatabaseBuildConfiguration source, EventHandler<DbConnectionEventArgs> handler)
+        public static IDatabaseBuildConfiguration UsingConnectionOpening(this IDatabaseBuildConfiguration source, EventHandler<DbConnectionEventArgs> handler)
         {
-            source.SetSetting(ConnectionPreOpened, handler);
+            source.SetSetting(ConnectionOpening, handler);
             return source;
         }