From 60d45724092fc4ff468bf9faa88477456ae28bf6 Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Wed, 18 Jul 2018 13:26:33 +0300 Subject: [PATCH 1/2] safe_psql() should always raise error on wrong input (issue #52) --- testgres/node.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/testgres/node.py b/testgres/node.py index 77538896..e202fab4 100644 --- a/testgres/node.py +++ b/testgres/node.py @@ -812,7 +812,8 @@ def psql(self, filename=None, dbname=None, username=None, - input=None): + input=None, + **kwargs): """ Execute a query using psql. @@ -822,9 +823,18 @@ def psql(self, dbname: database name to connect to. username: database user name. input: raw input to be passed. + **kwargs: variables to be set before execution. Returns: A tuple of (code, stdout, stderr). + + Examples: + >>> psql('select 1') + (0, b'1\n', b'') + >>> psql('postgres', 'select 2') + (0, b'2\n', b'') + >>> psql(query='select 3', ON_ERROR_STOP=1) + (0, b'3\n', b'') """ # Set default arguments @@ -843,6 +853,10 @@ def psql(self, dbname ] # yapf: disable + # set variables before execution + for key, value in iteritems(kwargs): + psql_params.extend(["--set", '{}={}'.format(key, value)]) + # select query source if query: psql_params.extend(("-c", query)) @@ -874,10 +888,15 @@ def safe_psql(self, query=None, **kwargs): username: database user name. input: raw input to be passed. + **kwargs are passed to psql(). + Returns: psql's output as str. """ + # force this setting + kwargs['ON_ERROR_STOP'] = 1 + ret, out, err = self.psql(query=query, **kwargs) if ret: raise QueryException((err or b'').decode('utf-8'), query) From b9648ee4a2eee7d7213720306ddfa988e08f97e3 Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Wed, 18 Jul 2018 13:37:36 +0300 Subject: [PATCH 2/2] style fixes suggested by @ildus --- testgres/node.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testgres/node.py b/testgres/node.py index e202fab4..6d67d2cf 100644 --- a/testgres/node.py +++ b/testgres/node.py @@ -813,7 +813,7 @@ def psql(self, dbname=None, username=None, input=None, - **kwargs): + **variables): """ Execute a query using psql. @@ -823,7 +823,7 @@ def psql(self, dbname: database name to connect to. username: database user name. input: raw input to be passed. - **kwargs: variables to be set before execution. + **variables: vars to be set before execution. Returns: A tuple of (code, stdout, stderr). @@ -854,7 +854,7 @@ def psql(self, ] # yapf: disable # set variables before execution - for key, value in iteritems(kwargs): + for key, value in iteritems(variables): psql_params.extend(["--set", '{}={}'.format(key, value)]) # select query source pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy