main commit

2025-10-16 16:30:25 +09:00
parent 91c7e04474
commit 537e7b363f
1146 changed files with 45926 additions and 77196 deletions
--- a/venv/lib/python3.12/site-packages/asyncpg/protocol/prepared_stmt.pyx
+++ b/venv/lib/python3.12/site-packages/asyncpg/protocol/prepared_stmt.pyx
@@ -142,7 +142,7 @@ cdef class PreparedStatementState:
                # that the user tried to parametrize a statement that does
                # not support parameters.
                hint += (r'  Note that parameters are supported only in'
-                         r' SELECT, INSERT, UPDATE, DELETE, MERGE and VALUES'
+                         r' SELECT, INSERT, UPDATE, DELETE, and VALUES'
                         r' statements, and will *not* work in statements '
                         r' like CREATE VIEW or DECLARE CURSOR.')