Remove EndUserAction on pg error from ReadMessageLong (npgsql#4924)

Author: vonzshik

src/Npgsql/BackendMessages/AuthenticationMessages.cs

@@ -40,7 +40,7 @@ sealed class AuthenticationMD5PasswordMessage  : AuthenticationRequestMessage
 {
     internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationMD5Password;
 
-    internal byte[] Salt { get; private set; }
+    internal byte[] Salt { get; }
 
     internal static AuthenticationMD5PasswordMessage Load(NpgsqlReadBuffer buf)
     {
@@ -75,7 +75,7 @@ sealed class AuthenticationGSSContinueMessage : AuthenticationRequestMessage
 {
     internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationGSSContinue;
 
-    internal byte[] AuthenticationData { get; private set; }
+    internal byte[] AuthenticationData { get; }
 
     internal static AuthenticationGSSContinueMessage Load(NpgsqlReadBuffer buf, int len)
     {

src/Npgsql/BackendMessages/BackendKeyDataMessage.cs

@@ -6,8 +6,8 @@ sealed class BackendKeyDataMessage : IBackendMessage
 {
     public BackendMessageCode Code => BackendMessageCode.BackendKeyData;
 
-    internal int BackendProcessId { get; private set; }
-    internal int BackendSecretKey { get; private set; }
+    internal int BackendProcessId { get; }
+    internal int BackendSecretKey { get; }
 
     internal BackendKeyDataMessage(NpgsqlReadBuffer buf)
     {

src/Npgsql/Internal/NpgsqlConnector.cs

@@ -1307,8 +1307,6 @@ internal ValueTask<IBackendMessage> ReadMessage(
         case BackendMessageCode.ErrorResponse:
             ReadBuffer.ReadPosition--;
             return ReadMessageLong(async, dataRowLoadingMode, readingNotifications: false)!;
-        case BackendMessageCode.ReadyForQuery:
-            break;
         }
 
         PGUtil.ValidateBackendMessageCode(messageCode);
@@ -1444,10 +1442,6 @@ internal ValueTask<IBackendMessage> ReadMessage(
         }
         catch (PostgresException e)
         {
-            // TODO: move it up the stack, like #3126 did (relevant for non-command-execution scenarios, like COPY)
-            if (CurrentReader is null)
-                EndUserAction();
-
             if (e.SqlState == PostgresErrorCodes.QueryCanceled && PostgresCancellationPerformed)
             {
                 // The query could be canceled because of a user cancellation or a timeout - raise the proper exception.

src/Npgsql/Internal/TypeHandling/TypeMappingInfo.cs

@@ -5,7 +5,7 @@
 
 namespace Npgsql.Internal.TypeHandling;
 
-public class TypeMappingInfo
+public sealed class TypeMappingInfo
 {
     public TypeMappingInfo(NpgsqlDbType? npgsqlDbType, string? dataTypeName, Type clrType)
         => (NpgsqlDbType, DataTypeName, ClrTypes) = (npgsqlDbType, dataTypeName, new[] { clrType });

src/Npgsql/NameTranslation/NpgsqlNullNameTranslator.cs

@@ -5,7 +5,7 @@ namespace Npgsql.NameTranslation;
 /// <summary>
 /// A name translator which preserves CLR names (e.g. SomeClass) when mapping names to the database.
 /// </summary>
-public class NpgsqlNullNameTranslator : INpgsqlNameTranslator
+public sealed class NpgsqlNullNameTranslator : INpgsqlNameTranslator
 {
     /// <summary>
     /// Given a CLR type name (e.g class, struct, enum), translates its name to a database type name.

src/Npgsql/NameTranslation/NpgsqlSnakeCaseNameTranslator.cs

@@ -9,7 +9,7 @@ namespace Npgsql.NameTranslation;
 /// A name translator which converts standard CLR names (e.g. SomeClass) to snake-case database
 /// names (some_class)
 /// </summary>
-public class NpgsqlSnakeCaseNameTranslator : INpgsqlNameTranslator
+public sealed class NpgsqlSnakeCaseNameTranslator : INpgsqlNameTranslator
 {
     /// <summary>
     /// Creates a new <see cref="NpgsqlSnakeCaseNameTranslator"/>.

src/Npgsql/NpgsqlBinaryImporter.cs

@@ -551,7 +551,6 @@ async ValueTask CloseAsync(bool async, CancellationToken cancellationToken = def
             throw new Exception("Invalid state: " + _state);
         }
 
-        _connector.EndUserAction();
         Cleanup();
     }
 
@@ -566,8 +565,9 @@ void Cleanup()
 
         if (connector != null)
         {
+            connector.EndUserAction();
             connector.CurrentCopyOperation = null;
-            _connector.Connection?.EndBindingScope(ConnectorBindingScope.Copy);
+            connector.Connection?.EndBindingScope(ConnectorBindingScope.Copy);
             _connector = null;
         }
 

src/Npgsql/NpgsqlDataSource.cs

@@ -41,7 +41,7 @@ public abstract class NpgsqlDataSource : DbDataSource
     /// <summary>
     /// Information about PostgreSQL and PostgreSQL-like databases (e.g. type definitions, capabilities...).
     /// </summary>
-    internal NpgsqlDatabaseInfo DatabaseInfo { get; set; } = null!; // Initialized at bootstrapping
+    internal NpgsqlDatabaseInfo DatabaseInfo { get; private set; } = null!; // Initialized at bootstrapping
 
     internal Func<NpgsqlConnector, SslMode, NpgsqlTimeout, bool, bool, Task>? EncryptionNegotiator { get; }
     internal RemoteCertificateValidationCallback? UserCertificateValidationCallback { get; }

src/Npgsql/NpgsqlRawCopyStream.cs

@@ -372,7 +372,6 @@ async Task Cancel(bool async)
             }
             catch (PostgresException e)
             {
-                _connector.EndUserAction();
                 Cleanup();
 
                 if (e.SqlState != PostgresErrorCodes.QueryCanceled)
@@ -442,7 +441,6 @@ async ValueTask DisposeAsync(bool disposing, bool async)
         }
         finally
         {
-            _connector.EndUserAction();
             Cleanup();
         }
     }
@@ -452,6 +450,7 @@ void Cleanup()
     {
         Debug.Assert(!_isDisposed);
         LogMessages.CopyOperationCompleted(_copyLogger, _connector.Id);
+        _connector.EndUserAction();
         _connector.CurrentCopyOperation = null;
         _connector.Connection?.EndBindingScope(ConnectorBindingScope.Copy);
         _connector = null;

src/Npgsql/NpgsqlTypes/PgNameAttribute.cs

@@ -18,14 +18,12 @@ public class PgNameAttribute : Attribute
     /// <summary>
     /// The name of PostgreSQL field that corresponds to this CLR property or field
     /// </summary>
-    public string PgName { get; private set; }
+    public string PgName { get; }
 
     /// <summary>
     /// Indicates that this property or field corresponds to a PostgreSQL field with the specified name
     /// </summary>
     /// <param name="pgName">The name of PostgreSQL field that corresponds to this CLR property or field</param>
     public PgNameAttribute(string pgName)
-    {
-        PgName = pgName;
-    }
+        => PgName = pgName;
 }

src/Npgsql/Util/PGUtil.cs

@@ -25,7 +25,7 @@ static Statics()
         LegacyTimestampBehavior = AppContext.TryGetSwitch("Npgsql.EnableLegacyTimestampBehavior", out var enabled) && enabled;
         DisableDateTimeInfinityConversions = AppContext.TryGetSwitch("Npgsql.DisableDateTimeInfinityConversions", out enabled) && enabled;
     }
-    
+
     internal static T Expect<T>(IBackendMessage msg, NpgsqlConnector connector)
     {
         if (msg.GetType() != typeof(T))