Commit 5b14653

authored

Make prepare() not use named statements by default when cache is disabled (#1245)

We allow disabling the statement cache to circumvent a proxy's inability to cope with them, however there are still some holes where the use of a named statement is attempted: `prepare()` with the default arguments, and `copy_in()`. Fix both so that the use of a named statement is dependent upon whether the prepared statement cache is enabled. Fixes: #1219 Closes: #1218

1 parent 0525b53 commit 5b14653Copy full SHA for 5b14653

File tree

1 file changed

-5

lines changed

asyncpg
- connection.py

1 file changed

-5

lines changed

`‎asyncpg/connection.py`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ async def _get_statement(`
`405`	`405`	`query,`
`406`	`406`	`timeout,`
`407`	`407`	`*,`
`408`		`- named=False,`
	`408`	`+ named: typing.Union[str, bool, None] =False,`
`409`	`409`	`use_cache=True,`
`410`	`410`	`ignore_custom_codec=False,`
`411`	`411`	`record_class=None`
`@@ -639,24 +639,25 @@ async def prepare(`
`639`	`639`	`query,`
`640`	`640`	`name=name,`
`641`	`641`	`timeout=timeout,`
`642`		`- use_cache=False,`
`643`	`642`	`record_class=record_class,`
`644`	`643`	`)`
`645`	`644`
`646`	`645`	`async def _prepare(`
`647`	`646`	`self,`
`648`	`647`	`query,`
`649`	`648`	`*,`
`650`		`- name=None,`
	`649`	`+ name: typing.Union[str, bool, None] =None,`
`651`	`650`	`timeout=None,`
`652`	`651`	`use_cache: bool=False,`
`653`	`652`	`record_class=None`
`654`	`653`	`):`
`655`	`654`	`self._check_open()`
	`655`	`+ if name is None:`
	`656`	`+ name = self._stmt_cache_enabled`
`656`	`657`	`stmt = await self._get_statement(`
`657`	`658`	`query,`
`658`	`659`	`timeout,`
`659`		`- named=TrueifnameisNoneelsename,`
	`660`	`+ named=name,`
`660`	`661`	`use_cache=use_cache,`
`661`	`662`	`record_class=record_class,`
`662`	`663`	`)`
`@@ -1115,7 +1116,7 @@ async def copy_records_to_table(self, table_name, *, records,`
`1115`	`1116`	`intro_query = 'SELECT {cols} FROM {tab} LIMIT 1'.format(`
`1116`	`1117`	`tab=tabname, cols=col_list)`
`1117`	`1118`
`1118`		`- intro_ps = await self._prepare(intro_query, use_cache=True)`
	`1119`	`+ intro_ps = await self.prepare(intro_query)`
`1119`	`1120`
`1120`	`1121`	`cond = self._format_copy_where(where)`
`1121`	`1122`	`opts = '(FORMAT binary)'`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5b14653

File tree

1 file changed

1 file changed

`‎asyncpg/connection.py`

0 commit comments