diff --git a/ChangeLog b/ChangeLog index fa814dda..6c4010c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-28 Daniele Varrazzo + + * Cancel patch from Jan integrated. + 2010-11-22 Daniele Varrazzo * psycopg/connection_int.c: dropped notices hack to get COPY errors from diff --git a/NEWS-2.3 b/NEWS-2.3 index 02d0aaf8..40027b1b 100644 --- a/NEWS-2.3 +++ b/NEWS-2.3 @@ -3,13 +3,14 @@ What's new in psycopg 2.3.0 psycopg 2.3 aims to expose some new features introduced in PostgreSQL 9.0. -* New features related to features introduced in PostgreSQL 9.0: +* Main new fratures: - `dict` to `hstore` adapter and `hstore` to `dict` typecaster, using both 9.0 and pre-9.0 syntax. - Two-phase commit protocol support as per DBAPI specification. - Support for payload in notifications received from the backed. - - namedtuple returning cursor. + - namedtuple-returning cursor. + - Query execution cancel. * Other features and changes: diff --git a/doc/src/connection.rst b/doc/src/connection.rst index 153fea5d..c509ee66 100644 --- a/doc/src/connection.rst +++ b/doc/src/connection.rst @@ -281,7 +281,7 @@ The ``connection`` class .. |PQcancel| replace:: `!PQcancel()` .. _PQcancel: http://www.postgresql.org/docs/8.4/static/libpq-cancel.html#AEN34765 - .. versionadded:: 2.2.3 + .. versionadded:: 2.3 .. method:: reset