python/python-asyncpg
SHA256
15
0
Fork 0
forked from pool/python-asyncpg
Code Pull Requests Activity

Accepting request 1205216 from devel:languages:python

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1205216
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-asyncpg?expand=0&rev=12
This commit is contained in:
Ana Guerrero
2024-10-02 19:35:10 +00:00
committed by Git OBS Bridge
parent 2325978743 1ea78cc203
commit d63d6e5b08
3 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
0001-notice-also-the-MERGE-command.patch Normal file
View File

@@ -0,0 +1,55 @@
From 75f68ce46da7c3393ec07ff0e03b654158b6e9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta?= <meggy.calabkova@gmail.com>
Date: Wed, 2 Oct 2024 15:14:07 +0200
Subject: [PATCH] notice also the MERGE command
---
asyncpg/prepared_stmt.py | 4 ++--
asyncpg/protocol/prepared_stmt.pyx | 2 +-
tests/test_exceptions.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/asyncpg/prepared_stmt.py b/asyncpg/prepared_stmt.py
index 8e241d6..195d005 100644
--- a/asyncpg/prepared_stmt.py
+++ b/asyncpg/prepared_stmt.py
@@ -147,8 +147,8 @@ class PreparedStatement(connresource.ConnectionResource):
# will discard any output that a SELECT would return, other
# side effects of the statement will happen as usual. If you
# wish to use EXPLAIN ANALYZE on an INSERT, UPDATE, DELETE,
- # CREATE TABLE AS, or EXECUTE statement without letting the
- # command affect your data, use this approach:
+ # MERGE, CREATE TABLE AS, or EXECUTE statement without letting
+ # the command affect your data, use this approach:
# BEGIN;
# EXPLAIN ANALYZE ...;
# ROLLBACK;
diff --git a/asyncpg/protocol/prepared_stmt.pyx b/asyncpg/protocol/prepared_stmt.pyx
index 7335825..cb0afa2 100644
--- a/asyncpg/protocol/prepared_stmt.pyx
+++ b/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, and VALUES'
+ r' SELECT, INSERT, UPDATE, DELETE, MERGE and VALUES'
r' statements, and will *not* work in statements '
r' like CREATE VIEW or DECLARE CURSOR.')
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
index dbffcc2..e8bb7a1 100644
--- a/tests/test_exceptions.py
+++ b/tests/test_exceptions.py
@@ -42,7 +42,7 @@ class TestExceptions(tb.ConnectedTestCase):
self.assertEqual(
e.detail,
"Function's final statement must be SELECT or "
- "INSERT/UPDATE/DELETE RETURNING.")
+ "INSERT/UPDATE/DELETE/MERGE RETURNING.")
self.assertIn(
'DETAIL: Function', str(e)
)
--
2.46.1

6
python-asyncpg.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 2 13:16:22 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Add 0001-notice-also-the-MERGE-command.patch to support Postgres 15+,
sent upstream
-------------------------------------------------------------------
Sat Nov 25 14:10:47 UTC 2023 - Dirk Müller <dmueller@suse.com>

4
python-asyncpg.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package python-asyncpg
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/MagicStack/asyncpg
Source: https://files.pythonhosted.org/packages/source/a/asyncpg/asyncpg-%{version}.tar.gz
# PATCH-FIX-UPSTREAM https://github.com/MagicStack/asyncpg/pull/1185 notice also the MERGE command
Patch0: 0001-notice-also-the-MERGE-command.patch
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module async_timeout}
BuildRequires: %{python_module devel >= 3.6}