fix: excption (#6)

* feature: SHA256验证

待测试

* fix: 移除gauss demo

* fix: 移除

* feature: Example of adding and querying data.

* Update Program.cs

* fix: excption

(1) Modify the branch enumeration for MD5SHA256.
(2) Remove unsupported syntax keywords in test cases for GaussDB.

* Update NpgsqlConnectionStringBuilder.cs

Author: JusterZhu

src/Npgsql/BackendMessages/AuthenticationMessages.cs

@@ -69,15 +69,9 @@ internal static AuthenticationRequestMessage Load(NpgsqlReadBuffer buf)
         var passwordStoreTypeValue = buf.ReadInt32();
         var passwordStoreType = (PasswordStoreType)passwordStoreTypeValue;
 
-        return passwordStoreType switch
-        {
-            PasswordStoreType.PlainText => AuthenticationCleartextPasswordMessage.Instance,
-            PasswordStoreType.MD5 => AuthenticationMD5PasswordMessage.Load(buf),
-            PasswordStoreType.SHA256 => new AuthenticationSHA256PasswordMessage(
-                passwordStoreType, buf
-            ),
-            _ => throw new InvalidOperationException($"Not supported password store type({passwordStoreTypeValue})")
-        };
+        return new AuthenticationSHA256PasswordMessage(
+            passwordStoreType, buf
+        );
     }
 }
 
@@ -87,6 +81,7 @@ sealed class AuthenticationMD5SHA256PasswordMessage : AuthenticationRequestMessa
 
     internal ReadOnlyMemory<byte> Salt { get; }
     internal string RandomCode { get; }
+
     public AuthenticationMD5SHA256PasswordMessage(NpgsqlReadBuffer buf)
     {
         RandomCode = buf.ReadString(64);
@@ -96,7 +91,6 @@ public AuthenticationMD5SHA256PasswordMessage(NpgsqlReadBuffer buf)
 
 #endregion SHA256Password
 
-
 sealed class AuthenticationGSSMessage : AuthenticationRequestMessage
 {
     internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.GSS;
@@ -147,5 +141,6 @@ enum PasswordStoreType
 {
     PlainText = 0,
     MD5 = 1,
-    SHA256 = 2
+    SHA256 = 2,
+    MD5SHA256 = 3
 }

src/Npgsql/Internal/NpgsqlConnector.Auth.cs

@@ -52,7 +52,7 @@ async Task Authenticate(string username, NpgsqlTimeout timeout, bool async, Canc
                 break;
 
             case AuthenticationRequestType.MD5SHA256Password:
-                ThrowIfNotAllowed(requiredAuthModes, RequireAuthMode.ScramSHA256);
+                ThrowIfNotAllowed(requiredAuthModes, RequireAuthMode.MD5SHA256);
                 await AuthenticateMD5SHA256(username, (AuthenticationMD5SHA256PasswordMessage)msg, async, cancellationToken)
                     .ConfigureAwait(false);
                 break;

src/Npgsql/Internal/NpgsqlConnector.cs

@@ -1544,6 +1544,7 @@ internal ValueTask<IBackendMessage> ReadMessage(
                 AuthenticationRequestType.SSPI              => AuthenticationSSPIMessage.Instance,
                 AuthenticationRequestType.GSSContinue       => AuthenticationGSSContinueMessage.Load(buf, len),
                 AuthenticationRequestType.SHA256Password    => AuthenticationSHA256PasswordMessage.Load(buf),
+                AuthenticationRequestType.MD5SHA256Password => new AuthenticationMD5SHA256PasswordMessage(buf),
                 _ => throw new NotSupportedException($"Authentication method not supported (Received: {authType})")
             };
 
@@ -2315,13 +2316,13 @@ void GenerateResetMessage()
         }
         if (DatabaseInfo.SupportsDiscardSequences)
         {
-            sb.Append("DISCARD SEQUENCES;");
-            _resetWithoutDeallocateResponseCount++;
+            //sb.Append("DISCARD SEQUENCES;");
+            //_resetWithoutDeallocateResponseCount++;
         }
         if (DatabaseInfo.SupportsDiscardTemp)
         {
-            sb.Append("DISCARD TEMP");
-            _resetWithoutDeallocateResponseCount++;
+            //sb.Append("DISCARD TEMP");
+            //_resetWithoutDeallocateResponseCount++;
         }
 
         _resetWithoutDeallocateResponseCount++;  // One ReadyForQuery at the end

src/Npgsql/NpgsqlConnectionStringBuilder.cs

@@ -1830,9 +1830,13 @@ enum RequireAuthMode
     /// </summary>
     None = 32,
     /// <summary>
+    /// MD5 SHA256.
+    /// </summary>
+    MD5SHA256 = 64,
+    /// <summary>
     /// All authentication methods. For internal use.
     /// </summary>
-    All = Password | MD5 | GSS | SSPI | ScramSHA256 | None
+    All = Password | MD5 | GSS | SSPI | ScramSHA256 | None | MD5SHA256
 }
 
 #endregion

test/Npgsql.Tests/AsyncTests.cs

@@ -11,11 +11,28 @@ public class AsyncTests : TestBase
     public async Task NonQuery()
     {
         await using var conn = await OpenConnectionAsync();
+
+        // 创建临时表（使用正确的临时表语法）
         var tableName = await CreateTempTable(conn, "int INTEGER");
-        await using var cmd = conn.CreateCommand();
-        cmd.CommandText = $"INSERT INTO {tableName} (int) VALUES (4)";
-        await cmd.ExecuteNonQueryAsync();
-        Assert.That(await conn.ExecuteScalarAsync($"SELECT int FROM {tableName}"), Is.EqualTo(4));
+        await using (var createTableCmd = conn.CreateCommand())
+        {
+            createTableCmd.CommandText = $"CREATE TEMP TABLE {tableName} (int INTEGER)";
+            await createTableCmd.ExecuteNonQueryAsync();
+        }
+
+        // 插入数据
+        await using (var insertCmd = conn.CreateCommand())
+        {
+            insertCmd.CommandText = $"INSERT INTO {tableName} (int) VALUES (4)";
+            await insertCmd.ExecuteNonQueryAsync();
+        }
+
+        // 验证结果
+        await using (var selectCmd = conn.CreateCommand())
+        {
+            selectCmd.CommandText = $"SELECT int FROM {tableName}";
+            Assert.That(await selectCmd.ExecuteScalarAsync(), Is.EqualTo(4));
+        }
     }
 
     [Test]

test/Npgsql.Tests/BugTests.cs

@@ -396,7 +396,7 @@ public async Task Bug2296()
     {
         await using var conn = await OpenConnectionAsync();
         // Note that the type has to be named boolean
-        await conn.ExecuteNonQueryAsync("DROP TYPE IF EXISTS \"boolean\" CASCADE");
+        await conn.ExecuteNonQueryAsync("DROP TYPE IF EXISTS \"boolean\" ");//CASCADE
         await conn.ExecuteNonQueryAsync("CREATE DOMAIN pg_temp.\"boolean\" AS bool");
         conn.ReloadTypes();
         var tableName = await CreateTempTable(conn, $"mybool \"boolean\"");

test/Npgsql.Tests/CommandTests.cs

@@ -1496,7 +1496,7 @@ public async Task Not_cancel_prepended_query([Values] bool failPrependedQuery)
         var queryTask = conn.ExecuteNonQueryAsync("SELECT 1", cancellationToken: cts.Token);
 
         var server = await postmasterMock.WaitForServerConnection();
-        await server.ExpectSimpleQuery("DISCARD ALL");
+        //await server.ExpectSimpleQuery("DISCARD ALL");
         await server.ExpectExtendedQuery();
 
         var cancelTask = Task.Run(cts.Cancel);

test/Npgsql.Tests/SecurityTests.cs

@@ -63,8 +63,8 @@ public void No_ssl_renegotiation()
         });
         using var conn = dataSource.OpenConnection();
         Assert.That(conn.ExecuteScalar("SHOW ssl_renegotiation_limit"), Is.EqualTo("0"));
-        conn.ExecuteNonQuery("DISCARD ALL");
-        Assert.That(conn.ExecuteScalar("SHOW ssl_renegotiation_limit"), Is.EqualTo("0"));
+        //conn.ExecuteNonQuery("DISCARD ALL");
+        //Assert.That(conn.ExecuteScalar("SHOW ssl_renegotiation_limit"), Is.EqualTo("0"));
     }
 
     [Test, Description("Makes sure that when SSL is disabled IsSecure returns false")]

test/Npgsql.Tests/TestUtil.cs

@@ -202,10 +202,9 @@ internal static async Task<string> CreateTempTable(NpgsqlConnection conn, string
         await conn.ExecuteNonQueryAsync(@$"
 START TRANSACTION;
 SELECT pg_advisory_xact_lock(0);
-DROP TABLE IF EXISTS {tableName} CASCADE;
+DROP TABLE IF EXISTS {tableName};
 COMMIT;
 CREATE TABLE {tableName} ({columns});");
-
         return tableName;
     }
 
@@ -219,7 +218,7 @@ internal static async Task<string> GetTempTableName(NpgsqlConnection conn)
         await conn.ExecuteNonQueryAsync(@$"
 START TRANSACTION;
 SELECT pg_advisory_xact_lock(0);
-DROP TABLE IF EXISTS {tableName} CASCADE;
+DROP TABLE IF EXISTS {tableName} ;
 COMMIT");
         return tableName;
     }
@@ -234,7 +233,7 @@ internal static async Task<string> CreateTempTable(NpgsqlDataSource dataSource,
         await dataSource.ExecuteNonQueryAsync(@$"
 START TRANSACTION;
 SELECT pg_advisory_xact_lock(0);
-DROP TABLE IF EXISTS {tableName} CASCADE;
+DROP TABLE IF EXISTS {tableName};
 COMMIT;
 CREATE TABLE {tableName} ({columns});");
         return tableName;
@@ -246,7 +245,7 @@ await dataSource.ExecuteNonQueryAsync(@$"
     internal static async Task<string> CreateTempSchema(NpgsqlConnection conn)
     {
         var schemaName = "temp_schema" + Interlocked.Increment(ref _tempSchemaCounter);
-        await conn.ExecuteNonQueryAsync($"DROP SCHEMA IF EXISTS {schemaName} CASCADE; CREATE SCHEMA {schemaName}");
+        await conn.ExecuteNonQueryAsync($"DROP SCHEMA IF EXISTS {schemaName} ; CREATE SCHEMA {schemaName}");
         return schemaName;
     }
 
@@ -257,7 +256,7 @@ internal static async Task<string> CreateTempSchema(NpgsqlConnection conn)
     internal static async Task<string> GetTempViewName(NpgsqlConnection conn)
     {
         var viewName = "temp_view" + Interlocked.Increment(ref _tempViewCounter);
-        await conn.ExecuteNonQueryAsync($"DROP VIEW IF EXISTS {viewName} CASCADE");
+        await conn.ExecuteNonQueryAsync($"DROP VIEW IF EXISTS {viewName} ");
         return viewName;
     }
 
@@ -268,7 +267,7 @@ internal static async Task<string> GetTempViewName(NpgsqlConnection conn)
     internal static async Task<string> GetTempMaterializedViewName(NpgsqlConnection conn)
     {
         var viewName = "temp_materialized_view" + Interlocked.Increment(ref _tempViewCounter);
-        await conn.ExecuteNonQueryAsync($"DROP MATERIALIZED VIEW IF EXISTS {viewName} CASCADE");
+        await conn.ExecuteNonQueryAsync($"DROP MATERIALIZED VIEW IF EXISTS {viewName} ");
         return viewName;
     }
 
@@ -279,7 +278,7 @@ internal static async Task<string> GetTempMaterializedViewName(NpgsqlConnection
     internal static async Task<string> GetTempFunctionName(NpgsqlConnection conn)
     {
         var functionName = "temp_func" + Interlocked.Increment(ref _tempFunctionCounter);
-        await conn.ExecuteNonQueryAsync($"DROP FUNCTION IF EXISTS {functionName} CASCADE");
+        await conn.ExecuteNonQueryAsync($"DROP FUNCTION IF EXISTS {functionName}");
         return functionName;
     }
 
@@ -293,7 +292,7 @@ internal static async Task<string> GetTempFunctionName(NpgsqlConnection conn)
     internal static async Task<string> GetTempProcedureName(NpgsqlDataSource dataSource)
     {
         var procedureName = "temp_procedure" + Interlocked.Increment(ref _tempProcedureCounter);
-        await dataSource.ExecuteNonQueryAsync($"DROP PROCEDURE IF EXISTS {procedureName} CASCADE");
+        await dataSource.ExecuteNonQueryAsync($"DROP PROCEDURE IF EXISTS {procedureName} ");
         return procedureName;
     }
 
@@ -307,7 +306,7 @@ internal static async Task<string> GetTempProcedureName(NpgsqlDataSource dataSou
     internal static async Task<string> GetTempProcedureName(NpgsqlConnection connection)
     {
         var procedureName = "temp_procedure" + Interlocked.Increment(ref _tempProcedureCounter);
-        await connection.ExecuteNonQueryAsync($"DROP PROCEDURE IF EXISTS {procedureName} CASCADE");
+        await connection.ExecuteNonQueryAsync($"DROP PROCEDURE IF EXISTS {procedureName} ");
         return procedureName;
     }
 
@@ -318,7 +317,7 @@ internal static async Task<string> GetTempProcedureName(NpgsqlConnection connect
     internal static async Task<string> GetTempTypeName(NpgsqlConnection conn)
     {
         var typeName = "temp_type" + Interlocked.Increment(ref _tempTypeCounter);
-        await conn.ExecuteNonQueryAsync($"DROP TYPE IF EXISTS {typeName} CASCADE");
+        await conn.ExecuteNonQueryAsync($"DROP TYPE IF EXISTS {typeName}");
         return typeName;
     }