From: Mike Bayer Date: Mon, 30 Nov 2015 17:55:26 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/pr/217' X-Git-Tag: rel_1_0_10~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66704ad47ab9ad7b361dff6707eae9e755273cf2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Merge remote-tracking branch 'origin/pr/217' (cherry picked from commit 954aafa0645f6e1ccbcfdc358a9f2930a24461a4) --- diff --git a/doc/build/core/pooling.rst b/doc/build/core/pooling.rst index 094eff4c46..f9384fd604 100644 --- a/doc/build/core/pooling.rst +++ b/doc/build/core/pooling.rst @@ -257,7 +257,7 @@ best way to do this is to make use of the # run a SELECT 1. use a core select() so that # the SELECT of a scalar value without a table is # appropriately formatted for the backend - connection.scalar(select[1]) + connection.scalar(select([1])) except exc.DBAPIError as err: # catch SQLAlchemy's DBAPIError, which is a wrapper # for the DBAPI's exception. It includes a .connection_invalidated