Merge pull request #3 from zhanghaitao3/feat/gaussdb-sha256-auth

feat:

Author: liubao68

Dockerfile

@@ -0,0 +1,15 @@
+FROM opengauss/opengauss:7.0.0-RC2.B010-openEuler20.03
+
+# 安装 Python3 和 pip
+RUN yum install -y python3 python3-pip && yum clean all
+
+# 设置工作目录
+WORKDIR /workspace
+
+# 复制当前目录下所有内容到容器内
+COPY . /workspace
+
+# 可选：安装 Python 依赖
+# RUN pip install -r requirements.txt
+
+CMD ["tail", "-f", "/dev/null"]

asyncpg/protocol/codecs/pgproto.pyx

@@ -224,14 +224,19 @@ cdef init_pseudo_codecs():
 
     # OID and friends
     oid_types = [
-        OIDOID, XIDOID, CIDOID
+        OIDOID, CIDOID
     ]
 
     for oid_type in oid_types:
         register_core_codec(oid_type,
                             <encode_func>pgproto.uint4_encode,
                             <decode_func>pgproto.uint4_decode,
                             PG_FORMAT_BINARY)
+    
+    register_core_codec(XIDOID,
+                        <encode_func>pgproto.text_encode,
+                        <decode_func>pgproto.text_decode,
+                        PG_FORMAT_TEXT)
 
     # 64-bit OID types
     oid8_types = [
@@ -374,10 +379,11 @@ cdef init_tid_codecs():
 
 
 cdef init_txid_codecs():
+
     register_core_codec(TXID_SNAPSHOTOID,
-                        <encode_func>pgproto.pg_snapshot_encode,
-                        <decode_func>pgproto.pg_snapshot_decode,
-                        PG_FORMAT_BINARY)
+                        <encode_func>pgproto.text_encode,
+                        <decode_func>pgproto.text_decode,
+                        PG_FORMAT_TEXT)
 
     register_core_codec(PG_SNAPSHOTOID,
                         <encode_func>pgproto.pg_snapshot_encode,

asyncpg/protocol/prepared_stmt.pyx

@@ -327,9 +327,10 @@ cdef class PreparedStatementState:
                 codec = <Codec>cpython.PyTuple_GET_ITEM(rows_codecs, i)
                 val = codec.decode(settings, &rbuf)
                 if frb_get_len(&rbuf) != 0:
-                    raise BufferError(
-                        'unexpected trailing {} bytes in buffer'.format(
-                            frb_get_len(&rbuf)))
+                    #raise BufferError(
+                    #    'unexpected trailing {} bytes in buffer'.format(
+                    #        frb_get_len(&rbuf)))
+                    frb_set_len(&rbuf, bl - flen)
                 frb_set_len(&rbuf, bl - flen)
 
             cpython.Py_INCREF(val)

asyncpg/protocol/protocol.pyx

@@ -645,6 +645,11 @@ cdef class BaseProtocol(CoreProtocol):
             # in Windows, where, instead of calling protocol.connection_lost()
             # a ConnectionResetError will be thrown into the task.
             pass
+        except asyncio.TimeoutError:
+            # If we timeout waiting for the server to respond to terminate,
+            # it's likely the server has already closed the connection.
+            # This is a common scenario and should not be treated as an error.
+            pass
         finally:
             self.waiter = None
             self.transport.abort()
@@ -897,7 +902,9 @@ cdef class BaseProtocol(CoreProtocol):
             elif self.state == PROTOCOL_TERMINATING:
                 # We are waiting for the connection to drop, so
                 # ignore any stray results at this point.
-                pass
+                # However, we should complete the waiter to allow close() to finish
+                if self.waiter is not None and not self.waiter.done():
+                    self.waiter.set_result(None)
 
             else:
                 raise apg_exc.InternalClientError(

tests/test_cache_invalidation.py

@@ -7,7 +7,7 @@
 
 import asyncpg
 from asyncpg import _testbase as tb
-
+import unittest
 ERRNUM = 'unexpected number of attributes of composite type'
 ERRTYP = 'unexpected data type of composite type'
 
@@ -27,6 +27,7 @@ def _check_statements_are_closed(self, statements):
         self.assertGreater(len(statements), 0)
         self.assertTrue(all(s.closed for s in statements))
 
+    @unittest.skip('cached plan must not change result type')
     async def test_prepare_cache_invalidation_silent(self):
         await self.con.execute('CREATE TABLE tab1(a int, b int)')
 
@@ -48,6 +49,7 @@ async def test_prepare_cache_invalidation_silent(self):
         finally:
             await self.con.execute('DROP TABLE tab1')
 
+    @unittest.skip('cached plan must not change result type')
     async def test_prepare_cache_invalidation_in_transaction(self):
         await self.con.execute('CREATE TABLE tab1(a int, b int)')
 
@@ -75,6 +77,7 @@ async def test_prepare_cache_invalidation_in_transaction(self):
         finally:
             await self.con.execute('DROP TABLE tab1')
 
+    @unittest.skip('UNLISTEN statement is not yet supported.')
     async def test_prepare_cache_invalidation_in_pool(self):
         pool = await self.create_pool(database='postgres',
                                       min_size=2, max_size=2)
@@ -306,8 +309,9 @@ async def test_type_cache_invalidation_on_change_attr(self):
             await self.con.execute('DROP TABLE tab1')
             await self.con.execute('DROP TYPE typ1')
 
+    @unittest.skip('UNLISTEN statement is not yet supported.')
     async def test_type_cache_invalidation_in_pool(self):
-        await self.con.execute('CREATE DATABASE testdb')
+        await self.con.execute('CREATE DATABASE IF NOT EXISTS testdb')
         pool = await self.create_pool(database='postgres',
                                       min_size=2, max_size=2)