diff --git a/.appveyor.yml b/.appveyor.yml
index 1761e99f..a2d9c348 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,7 +12,7 @@ environment:
matrix:
# For Python versions available on Appveyor, see
- # http://www.appveyor.com/docs/installed-software#python
+ # https://www.appveyor.com/docs/build-environment/
- {PYVER: "27", PYTHON_ARCH: "32"}
- {PYVER: "27", PYTHON_ARCH: "64"}
- {PYVER: "34", PYTHON_ARCH: "32"}
@@ -21,6 +21,9 @@ environment:
- {PYVER: "35", PYTHON_ARCH: "64"}
- {PYVER: "36", PYTHON_ARCH: "32"}
- {PYVER: "36", PYTHON_ARCH: "64"}
+ - {PYVER: "37", PYTHON_ARCH: "32"}
+ - {PYVER: "37", PYTHON_ARCH: "64"}
+
OPENSSL_VERSION: "1_0_2n"
POSTGRES_VERSION: "10_1"
@@ -64,6 +67,7 @@ init:
- IF "%PYVER%"=="34" SET VS_VER=10.0
- IF "%PYVER%"=="35" SET VS_VER=14.0
- IF "%PYVER%"=="36" SET VS_VER=14.0
+ - IF "%PYVER%"=="37" SET VS_VER=14.0
- IF "%VS_VER%"=="10.0" IF "%PYTHON_ARCH%"=="64" SET DISTUTILS_USE_SDK=1
@@ -78,7 +82,7 @@ init:
- "%PYTHON%\\python -c \"import sys; print('64bit: ' + str(sys.maxsize > 2**32))\""
# Get & Install NASM
- #- curl -L -o nasminst.exe http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-installer-x64.exe && start /wait nasminst.exe /S
+ #- curl -L -o nasminst.exe https://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-installer-x64.exe && start /wait nasminst.exe /S
#- SET PATH="C:\Program Files (x86)\nasm;%PATH%"
# Fix problem with VS2008 Express and 64bit builds
diff --git a/.travis.yml b/.travis.yml
index 51cba9a7..a40e807f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
# Travis CI configuration file for psycopg2
-dist: trusty
+dist: xenial
sudo: required
language: python
-python:
- - 2.7
- - 3.7-dev
- - 3.6
- - 3.5
- - 3.4
+matrix:
+ include:
+ - python: 2.7
+ - python: 3.7
+ - python: 3.6
+ - python: 3.5
+ - python: 3.4
+ dist: trusty
install:
- pip install -U pip setuptools wheel
diff --git a/LICENSE b/LICENSE
index 8974d779..9029e70f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -25,7 +25,7 @@ statement from all source files in the program, then also delete it here.
You should have received a copy of the GNU Lesser General Public License
along with psycopg2 (see the doc/ directory.)
-If not, see .
+If not, see .
Alternative licenses
diff --git a/NEWS b/NEWS
index 5c577498..6094994c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,18 @@ New features:
- Added `~psycopg2.errors` module. Every PostgreSQL error is converted into
a specific exception class (:ticket:`#682`).
- Added `~psycopg2.extensions.encrypt_password()` function (:ticket:`#576`).
+- Added `~psycopg2.extensions.Column.table_oid` and
+ `~psycopg2.extensions.Column.table_column` attributes on `cursor.description`
+ items (:ticket:`#661`).
+- Added `connection.host` property (:ticket:`#726`).
+- `~psycopg2.sql.Identifier` can represent qualified names in SQL composition
+ (:ticket:`#732`).
+- `!str()` on `~psycopg2.extras.Range` produces a human-readable representation
+ (:ticket:`#773`).
- `~psycopg2.extras.DictCursor` and `~psycopg2.extras.RealDictCursor` rows
maintain columns order (:ticket:`#177`).
+- Added `!severity_nonlocalized` attribute on the
+ `~psycopg2.extensions.Diagnostics` object (:ticket:`#783`).
Other changes:
@@ -23,6 +33,18 @@ Other changes:
install``.
+What's new in psycopg 2.7.6
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Close named cursors if exist, even if `~cursor.execute()` wasn't called
+ (:ticket:`#746`).
+- Fixed building on modern FreeBSD versions with Python 3.7 (:ticket:`#755`).
+- Fixed hang trying to :sql:`COPY` via `~cursor.execute()` (:ticket:`#781`).
+- Fixed segfault accessing the `connection.readonly` and
+ `connection.deferrable` repeatedly (:ticket:`#790`).
+- `~psycopg2.errorcodes` map updated to PostgreSQL 11.
+
+
What's new in psycopg 2.7.5
^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -351,7 +373,7 @@ Other changes:
- Dropped support for Python 2.4. Please use Psycopg 2.4.x if you need it.
- `~psycopg2.errorcodes` map updated to PostgreSQL 9.2.
- Dropped Zope adapter from source repository. ZPsycopgDA now has its own
- project at .
+ project at .
What's new in psycopg 2.4.6
diff --git a/doc/src/advanced.rst b/doc/src/advanced.rst
index 724cb281..62873e79 100644
--- a/doc/src/advanced.rst
+++ b/doc/src/advanced.rst
@@ -156,7 +156,7 @@ geometric type:
.. |point| replace:: :sql:`point`
-.. _point: http://www.postgresql.org/docs/current/static/datatype-geometric.html#DATATYPE-GEOMETRIC
+.. _point: https://www.postgresql.org/docs/current/static/datatype-geometric.html#DATATYPE-GEOMETRIC
The above function call results in the SQL command::
@@ -259,9 +259,9 @@ documentation), you should keep the connection in `~connection.autocommit`
mode if you wish to receive or send notifications in a timely manner.
.. |LISTEN| replace:: :sql:`LISTEN`
-.. _LISTEN: http://www.postgresql.org/docs/current/static/sql-listen.html
+.. _LISTEN: https://www.postgresql.org/docs/current/static/sql-listen.html
.. |NOTIFY| replace:: :sql:`NOTIFY`
-.. _NOTIFY: http://www.postgresql.org/docs/current/static/sql-notify.html
+.. _NOTIFY: https://www.postgresql.org/docs/current/static/sql-notify.html
Notifications are received after every query execution. If the user is
interested in receiving notifications but not in performing any query, the
@@ -375,7 +375,7 @@ completely non-blocking connection attempt: see the libpq documentation for
|PQconnectStart|_.
.. |PQconnectStart| replace:: `!PQconnectStart()`
-.. _PQconnectStart: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PQCONNECTSTARTPARAMS
+.. _PQconnectStart: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PQCONNECTSTARTPARAMS
The same loop should be also used to perform nonblocking queries: after
sending a query via `~cursor.execute()` or `~cursor.callproc()`, call
@@ -484,14 +484,14 @@ psycopg2 scope, as the callback can be tied to the libraries' implementation
details. You can check the `psycogreen`_ project for further informations and
resources about the topic.
-.. _coroutine: http://en.wikipedia.org/wiki/Coroutine
+.. _coroutine: https://en.wikipedia.org/wiki/Coroutine
.. _greenlet: https://pypi.org/project/greenlet/
-.. _green threads: http://en.wikipedia.org/wiki/Green_threads
-.. _Eventlet: http://eventlet.net/
+.. _green threads: https://en.wikipedia.org/wiki/Green_threads
+.. _Eventlet: https://eventlet.net/
.. _gevent: http://www.gevent.org/
-.. _SQLAlchemy: http://www.sqlalchemy.org/
+.. _SQLAlchemy: https://www.sqlalchemy.org/
.. _psycogreen: http://bitbucket.org/dvarrazzo/psycogreen/
-.. __: http://www.postgresql.org/docs/current/static/libpq-async.html
+.. __: https://www.postgresql.org/docs/current/static/libpq-async.html
.. warning::
@@ -536,7 +536,7 @@ Server version 9.4 adds a new feature called *Logical Replication*.
- PostgreSQL `Streaming Replication Protocol`__
- .. __: http://www.postgresql.org/docs/current/static/protocol-replication.html
+ .. __: https://www.postgresql.org/docs/current/static/protocol-replication.html
Logical replication Quick-Start
diff --git a/doc/src/conf.py b/doc/src/conf.py
index 2c52a568..fa22a91f 100644
--- a/doc/src/conf.py
+++ b/doc/src/conf.py
@@ -61,9 +61,8 @@ except ImportError:
release = version
intersphinx_mapping = {
- 'py': ('https://docs.python.org/2', None),
- 'py3': ('https://docs.python.org/3', None),
- }
+ 'py': ('https://docs.python.org/3', None),
+}
# Pattern to generate links to the bug tracker
ticket_url = 'https://github.com/psycopg/psycopg2/issues/%s'
@@ -117,12 +116,12 @@ todo_include_todos = False
rst_epilog = """
.. |DBAPI| replace:: DB API 2.0
-.. _DBAPI: http://www.python.org/dev/peps/pep-0249/
+.. _DBAPI: https://www.python.org/dev/peps/pep-0249/
.. _transaction isolation level:
- http://www.postgresql.org/docs/current/static/transaction-iso.html
+ https://www.postgresql.org/docs/current/static/transaction-iso.html
-.. _mx.DateTime: http://www.egenix.com/products/python/mxBase/mxDateTime/
+.. _mx.DateTime: https://www.egenix.com/products/python/mxBase/mxDateTime/
.. |MVCC| replace:: :abbr:`MVCC (Multiversion concurrency control)`
"""
diff --git a/doc/src/connection.rst b/doc/src/connection.rst
index 2910f301..bd192d6c 100644
--- a/doc/src/connection.rst
+++ b/doc/src/connection.rst
@@ -198,7 +198,7 @@ The ``connection`` class
.. seealso:: the |PREPARE TRANSACTION|_ PostgreSQL command.
.. |PREPARE TRANSACTION| replace:: :sql:`PREPARE TRANSACTION`
- .. _PREPARE TRANSACTION: http://www.postgresql.org/docs/current/static/sql-prepare-transaction.html
+ .. _PREPARE TRANSACTION: https://www.postgresql.org/docs/current/static/sql-prepare-transaction.html
.. index::
@@ -224,7 +224,7 @@ The ``connection`` class
.. seealso:: the |COMMIT PREPARED|_ PostgreSQL command.
.. |COMMIT PREPARED| replace:: :sql:`COMMIT PREPARED`
- .. _COMMIT PREPARED: http://www.postgresql.org/docs/current/static/sql-commit-prepared.html
+ .. _COMMIT PREPARED: https://www.postgresql.org/docs/current/static/sql-commit-prepared.html
.. index::
@@ -246,7 +246,7 @@ The ``connection`` class
.. seealso:: the |ROLLBACK PREPARED|_ PostgreSQL command.
.. |ROLLBACK PREPARED| replace:: :sql:`ROLLBACK PREPARED`
- .. _ROLLBACK PREPARED: http://www.postgresql.org/docs/current/static/sql-rollback-prepared.html
+ .. _ROLLBACK PREPARED: https://www.postgresql.org/docs/current/static/sql-rollback-prepared.html
.. index::
@@ -267,7 +267,7 @@ The ``connection`` class
transactions initiated by a program using such driver should be
unpacked correctly.
- .. __: http://jdbc.postgresql.org/
+ .. __: https://jdbc.postgresql.org/
Xids returned by `!tpc_recover()` also have extra attributes
`~psycopg2.extensions.Xid.prepared`, `~psycopg2.extensions.Xid.owner`,
@@ -277,7 +277,7 @@ The ``connection`` class
.. seealso:: the |pg_prepared_xacts|_ system view.
.. |pg_prepared_xacts| replace:: `pg_prepared_xacts`
- .. _pg_prepared_xacts: http://www.postgresql.org/docs/current/static/view-pg-prepared-xacts.html
+ .. _pg_prepared_xacts: https://www.postgresql.org/docs/current/static/view-pg-prepared-xacts.html
@@ -309,7 +309,7 @@ The ``connection`` class
|PQcancel|_.
.. |PQcancel| replace:: `!PQcancel()`
- .. _PQcancel: http://www.postgresql.org/docs/current/static/libpq-cancel.html#LIBPQ-PQCANCEL
+ .. _PQcancel: https://www.postgresql.org/docs/current/static/libpq-cancel.html#LIBPQ-PQCANCEL
.. versionadded:: 2.3
@@ -325,10 +325,10 @@ The ``connection`` class
available for recover.
.. |RESET| replace:: :sql:`RESET`
- .. _RESET: http://www.postgresql.org/docs/current/static/sql-reset.html
+ .. _RESET: https://www.postgresql.org/docs/current/static/sql-reset.html
.. |SET SESSION AUTHORIZATION| replace:: :sql:`SET SESSION AUTHORIZATION`
- .. __: http://www.postgresql.org/docs/current/static/sql-set-session-authorization.html
+ .. __: https://www.postgresql.org/docs/current/static/sql-set-session-authorization.html
.. versionadded:: 2.0.12
@@ -366,7 +366,7 @@ The ``connection`` class
`autocommit` attribute.
.. _isolation level:
- http://www.postgresql.org/docs/current/static/transaction-iso.html
+ https://www.postgresql.org/docs/current/static/transaction-iso.html
Arguments set to `!None` (the default for all) will not be changed.
The parameters *isolation_level*, *readonly* and *deferrable* also
@@ -376,11 +376,11 @@ The ``connection`` class
|default_transaction_read_only|__, |default_transaction_deferrable|__.
.. |default_transaction_isolation| replace:: :sql:`default_transaction_isolation`
- .. __: http://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-DEFAULT-TRANSACTION-ISOLATION
+ .. __: https://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-DEFAULT-TRANSACTION-ISOLATION
.. |default_transaction_read_only| replace:: :sql:`default_transaction_read_only`
- .. __: http://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-DEFAULT-TRANSACTION-READ-ONLY
+ .. __: https://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-DEFAULT-TRANSACTION-READ-ONLY
.. |default_transaction_deferrable| replace:: :sql:`default_transaction_deferrable`
- .. __: http://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-DEFAULT-TRANSACTION-DEFERRABLE
+ .. __: https://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-DEFAULT-TRANSACTION-DEFERRABLE
The function must be invoked with no transaction in progress.
@@ -388,7 +388,7 @@ The ``connection`` class
of the transaction parameters in the server.
.. |SET TRANSACTION| replace:: :sql:`SET TRANSACTION`
- .. _SET TRANSACTION: http://www.postgresql.org/docs/current/static/sql-set-transaction.html
+ .. _SET TRANSACTION: https://www.postgresql.org/docs/current/static/sql-set-transaction.html
.. versionadded:: 2.4.2
@@ -534,7 +534,7 @@ The ``connection`` class
is the encoding defined by the database. It should be one of the
`characters set supported by PostgreSQL`__
- .. __: http://www.postgresql.org/docs/current/static/multibyte.html
+ .. __: https://www.postgresql.org/docs/current/static/multibyte.html
.. index::
@@ -568,7 +568,7 @@ The ``connection`` class
configuration parameters`__ such as ``log_statement``,
``client_min_messages``, ``log_min_duration_statement`` etc.
- .. __: http://www.postgresql.org/docs/current/static/runtime-config-logging.html
+ .. __: https://www.postgresql.org/docs/current/static/runtime-config-logging.html
.. attribute:: notifies
@@ -599,6 +599,24 @@ The ``connection`` class
.. versionadded:: 2.5
+ .. index::
+ pair: Backend; Host
+
+ .. attribute:: host
+
+ The server host name of the active connection.
+
+ This can be a host name, an IP address, or a directory path if the
+ connection is via Unix socket. (The path case can be distinguished
+ because it will always be an absolute path, beginning with ``/``.)
+
+ .. seealso:: libpq docs for `PQhost()`__ for details.
+
+ .. __: https://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQHOST
+
+ .. versionadded:: 2.8.0
+
+
.. index::
pair: Backend; PID
@@ -612,7 +630,7 @@ The ``connection`` class
.. seealso:: libpq docs for `PQbackendPID()`__ for details.
- .. __: http://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQBACKENDPID
+ .. __: https://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQBACKENDPID
.. versionadded:: 2.0.8
@@ -633,7 +651,7 @@ The ``connection`` class
.. seealso:: libpq docs for `PQparameterStatus()`__ for details.
- .. __: http://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQPARAMETERSTATUS
+ .. __: https://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQPARAMETERSTATUS
.. versionadded:: 2.0.12
@@ -656,7 +674,7 @@ The ``connection`` class
.. seealso:: libpq docs for `PQconninfo()`__ for details.
- .. __: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PQCONNINFO
+ .. __: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PQCONNINFO
.. versionadded:: 2.7
@@ -673,7 +691,7 @@ The ``connection`` class
.. seealso:: libpq docs for `PQtransactionStatus()`__ for details.
- .. __: http://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQTRANSACTIONSTATUS
+ .. __: https://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQTRANSACTIONSTATUS
.. index::
@@ -688,7 +706,7 @@ The ``connection`` class
.. seealso:: libpq docs for `PQprotocolVersion()`__ for details.
- .. __: http://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQPROTOCOLVERSION
+ .. __: https://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQPROTOCOLVERSION
.. versionadded:: 2.0.12
@@ -706,7 +724,7 @@ The ``connection`` class
.. seealso:: libpq docs for `PQserverVersion()`__ for details.
- .. __: http://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQSERVERVERSION
+ .. __: https://www.postgresql.org/docs/current/static/libpq-status.html#LIBPQ-PQSERVERVERSION
.. versionadded:: 2.0.12
@@ -743,7 +761,7 @@ The ``connection`` class
`~psycopg2.extensions.lobject` to be instantiated.
.. |lo_import| replace:: `!lo_import()`
- .. _lo_import: http://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-IMPORT
+ .. _lo_import: https://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-IMPORT
Available values for *mode* are:
diff --git a/doc/src/cursor.rst b/doc/src/cursor.rst
index 5a6935e6..1d7098f2 100644
--- a/doc/src/cursor.rst
+++ b/doc/src/cursor.rst
@@ -37,46 +37,49 @@ The ``cursor`` class
.. attribute:: description
- This read-only attribute is a sequence of 7-item sequences.
+ Read-only attribute describing the result of a query. It is a
+ sequence of `~psycopg2.extensions.Column` instances, each one
+ describing one result column in order. The attribute is `!None` for
+ operations that do not return rows or if the cursor has not had an
+ operation invoked via the |execute*|_ methods yet.
- Each of these sequences is a named tuple (a regular tuple if
- :func:`collections.namedtuple` is not available) containing information
- describing one result column:
+ For compatibility with the DB-API, every object can be unpacked as a
+ 7-items sequence: the attributes retuned this way are the following.
+ For further details and other attributes available check the
+ `~psycopg2.extensions.Column` documentation.
- 0. `!name`: the name of the column returned.
- 1. `!type_code`: the PostgreSQL OID of the column. You can use the
- |pg_type|_ system table to get more informations about the type.
- This is the value used by Psycopg to decide what Python type use
- to represent the value. See also
- :ref:`type-casting-from-sql-to-python`.
- 2. `!display_size`: the actual length of the column in bytes.
- Obtaining this value is computationally intensive, so it is
- always `!None` unless the :envvar:`PSYCOPG_DISPLAY_SIZE` parameter
- is set at compile time. See also PQgetlength_.
- 3. `!internal_size`: the size in bytes of the column associated to
- this column on the server. Set to a negative value for
- variable-size types See also PQfsize_.
- 4. `!precision`: total number of significant digits in columns of
- type |NUMERIC|_. `!None` for other types.
- 5. `!scale`: count of decimal digits in the fractional part in
- columns of type |NUMERIC|. `!None` for other types.
- 6. `!null_ok`: always `!None` as not easy to retrieve from the libpq.
+ 0. `~psycopg2.extensions.Column.name`: the name of the column returned.
- This attribute will be `!None` for operations that do not return rows
- or if the cursor has not had an operation invoked via the
- |execute*|_ methods yet.
+ 1. `~psycopg2.extensions.Column.type_code`: the PostgreSQL OID of the
+ column.
- .. |pg_type| replace:: :sql:`pg_type`
- .. _pg_type: http://www.postgresql.org/docs/current/static/catalog-pg-type.html
- .. _PQgetlength: http://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQGETLENGTH
- .. _PQfsize: http://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQFSIZE
- .. _NUMERIC: http://www.postgresql.org/docs/current/static/datatype-numeric.html#DATATYPE-NUMERIC-DECIMAL
- .. |NUMERIC| replace:: :sql:`NUMERIC`
+ 2. `~psycopg2.extensions.Column.display_size`: the actual length of
+ the column in bytes.
+
+ 3. `~psycopg2.extensions.Column.internal_size`: the size in bytes of
+ the column associated to this column on the server.
+
+ 4. `~psycopg2.extensions.Column.precision`: total number of
+ significant digits in columns of type |NUMERIC|. `!None`
+ for other types.
+
+ 5. `~psycopg2.extensions.Column.scale`: count of decimal digits in
+ the fractional part in columns of type |NUMERIC|. `!None`
+ for other types.
+
+ 6. `~psycopg2.extensions.Column.null_ok`: always `!None` as not easy
+ to retrieve from the libpq.
.. versionchanged:: 2.4
if possible, columns descriptions are named tuple instead of
regular tuples.
+ .. versionchanged:: 2.8
+ columns descriptions are instances of `!Column`, exposing extra
+ attributes.
+
+ .. |NUMERIC| replace:: :sql:`NUMERIC`
+
.. method:: close()
Close the cursor now (rather than whenever `del` is executed).
@@ -129,7 +132,7 @@ The ``cursor`` class
backward scroll (see the |declare-notes|__).
.. |declare-notes| replace:: :sql:`DECLARE` notes
- .. __: http://www.postgresql.org/docs/current/static/sql-declare.html#SQL-DECLARE-NOTES
+ .. __: https://www.postgresql.org/docs/current/static/sql-declare.html#SQL-DECLARE-NOTES
.. note::
@@ -430,10 +433,10 @@ The ``cursor`` class
more flexibility.
.. |CREATE-TABLE| replace:: :sql:`CREATE TABLE`
- .. __: http://www.postgresql.org/docs/current/static/sql-createtable.html
+ .. __: https://www.postgresql.org/docs/current/static/sql-createtable.html
.. |INSERT-RETURNING| replace:: :sql:`INSERT ... RETURNING`
- .. __: http://www.postgresql.org/docs/current/static/sql-insert.html
+ .. __: https://www.postgresql.org/docs/current/static/sql-insert.html
.. attribute:: query
@@ -620,7 +623,7 @@ The ``cursor`` class
...
.. |COPY| replace:: :sql:`COPY`
- .. __: http://www.postgresql.org/docs/current/static/sql-copy.html
+ .. __: https://www.postgresql.org/docs/current/static/sql-copy.html
.. versionadded:: 2.0.6
diff --git a/doc/src/errorcodes.rst b/doc/src/errorcodes.rst
index ab49afb6..f852aa65 100644
--- a/doc/src/errorcodes.rst
+++ b/doc/src/errorcodes.rst
@@ -39,7 +39,7 @@ From PostgreSQL documentation:
.. seealso:: `PostgreSQL Error Codes table`__
- .. __: http://www.postgresql.org/docs/current/static/errcodes-appendix.html#ERRCODES-TABLE
+ .. __: https://www.postgresql.org/docs/current/static/errcodes-appendix.html#ERRCODES-TABLE
An example of the available constants defined in the module:
@@ -50,7 +50,7 @@ An example of the available constants defined in the module:
'42P01'
Constants representing all the error values defined by PostgreSQL versions
-between 8.1 and 10 are included in the module.
+between 8.1 and 11 are included in the module.
.. autofunction:: lookup(code)
diff --git a/doc/src/extensions.rst b/doc/src/extensions.rst
index 48bcdc29..f3317210 100644
--- a/doc/src/extensions.rst
+++ b/doc/src/extensions.rst
@@ -94,7 +94,7 @@ introspection etc.
The method uses the efficient |lo_export|_ libpq function.
.. |lo_export| replace:: `!lo_export()`
- .. _lo_export: http://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-EXPORT
+ .. _lo_export: https://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-EXPORT
.. method:: seek(offset, whence=0)
@@ -125,7 +125,7 @@ introspection etc.
libpq function.
.. |lo_truncate| replace:: `!lo_truncate()`
- .. _lo_truncate: http://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-TRUNCATE
+ .. _lo_truncate: https://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-TRUNCATE
.. versionadded:: 2.2.0
@@ -154,6 +154,80 @@ introspection etc.
Close the object and remove it from the database.
+.. class:: Column
+
+ Description of one result column, exposed as items of the
+ `cursor.description` sequence.
+
+ .. versionadded:: 2.8
+
+ in previous version the `!description` attribute was a sequence of
+ simple tuples or namedtuples.
+
+ .. attribute:: name
+
+ The name of the column returned.
+
+ .. attribute:: type_code
+
+ The PostgreSQL OID of the column. You can use the |pg_type|_ system
+ table to get more informations about the type. This is the value used
+ by Psycopg to decide what Python type use to represent the value. See
+ also :ref:`type-casting-from-sql-to-python`.
+
+ .. attribute:: display_size
+
+ The actual length of the column in bytes. Obtaining this value is
+ computationally intensive, so it is always `!None` unless the
+ :envvar:`PSYCOPG_DISPLAY_SIZE` parameter is set at compile time. See
+ also PQgetlength_.
+
+ .. attribute:: internal_size
+
+ The size in bytes of the column associated to this column on the
+ server. Set to a negative value for variable-size types See also
+ PQfsize_.
+
+ .. attribute:: precision
+
+ Total number of significant digits in columns of type |NUMERIC|_.
+ `!None` for other types.
+
+ .. attribute:: scale
+
+ Count of decimal digits in the fractional part in columns of type
+ |NUMERIC|. `!None` for other types.
+
+ .. attribute:: null_ok
+
+ Always `!None` as not easy to retrieve from the libpq.
+
+ .. attribute:: table_oid
+
+ The oid of the table from which the column was fetched (matching
+ :sql:`pg_class.oid`). `!None` if the column is not a simple reference
+ to a table column. See also PQftable_.
+
+ .. versionadded:: 2.8
+
+ .. attribute:: table_column
+
+ The number of the column (within its table) making up the result
+ (matching :sql:`pg_attribute.attnum`, so it will start from 1).
+ `!None` if the column is not a simple reference to a table column. See
+ also PQftablecol_.
+
+ .. versionadded:: 2.8
+
+ .. |pg_type| replace:: :sql:`pg_type`
+ .. _pg_type: https://www.postgresql.org/docs/current/static/catalog-pg-type.html
+ .. _PQgetlength: https://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQGETLENGTH
+ .. _PQfsize: https://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQFSIZE
+ .. _PQftable: https://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQFTABLE
+ .. _PQftablecol: https://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQFTABLECOL
+ .. _NUMERIC: https://www.postgresql.org/docs/current/static/datatype-numeric.html#DATATYPE-NUMERIC-DECIMAL
+ .. |NUMERIC| replace:: :sql:`NUMERIC`
+
.. autoclass:: Notify(pid, channel, payload='')
:members: pid, channel, payload
@@ -186,6 +260,7 @@ introspection etc.
message_primary
schema_name
severity
+ severity_nonlocalized
source_file
source_function
source_line
@@ -198,6 +273,9 @@ introspection etc.
not all the fields are available for all the errors and for all the
server versions.
+ .. versionadded:: 2.8
+ The `!severity_nonlocalized` attribute.
+
.. _sql-adaptation-objects:
@@ -423,8 +501,8 @@ details.
Used by Psycopg when adapting or casting unicode strings. See
:ref:`unicode-handling`.
- .. __: http://www.postgresql.org/docs/current/static/multibyte.html
- .. __: http://docs.python.org/library/codecs.html#standard-encodings
+ .. __: https://www.postgresql.org/docs/current/static/multibyte.html
+ .. __: https://docs.python.org/library/codecs.html#standard-encodings
@@ -497,7 +575,7 @@ Other functions
.. seealso:: libpq docs for `PQlibVersion()`__.
- .. __: http://www.postgresql.org/docs/current/static/libpq-misc.html#LIBPQ-PQLIBVERSION
+ .. __: https://www.postgresql.org/docs/current/static/libpq-misc.html#LIBPQ-PQLIBVERSION
.. function:: make_dsn(dsn=None, \*\*kwargs)
@@ -531,7 +609,7 @@ Other functions
`connection URIs`__ are only supported from libpq 9.2). Raise
`~psycopg2.ProgrammingError` if the *dsn* is not valid.
- .. __: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
+ .. __: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
Example::
@@ -545,7 +623,7 @@ Other functions
.. seealso:: libpq docs for `PQconninfoParse()`__.
- .. __: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PQCONNINFOPARSE
+ .. __: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PQCONNINFOPARSE
.. function:: quote_ident(str, scope)
@@ -559,7 +637,7 @@ Other functions
.. seealso:: libpq docs for `PQescapeIdentifier()`__
- .. __: http://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQESCAPEIDENTIFIER
+ .. __: https://www.postgresql.org/docs/current/static/libpq-exec.html#LIBPQ-PQESCAPEIDENTIFIER
.. method:: encrypt_password(password, user, scope=None, algorithm=None)
@@ -644,7 +722,7 @@ methods. The level can be set to one of the following constants:
.. seealso:: `Read Committed Isolation Level`__ in PostgreSQL
documentation.
- .. __: http://www.postgresql.org/docs/current/static/transaction-iso.html#XACT-READ-COMMITTED
+ .. __: https://www.postgresql.org/docs/current/static/transaction-iso.html#XACT-READ-COMMITTED
.. data:: ISOLATION_LEVEL_REPEATABLE_READ
@@ -668,7 +746,7 @@ methods. The level can be set to one of the following constants:
.. seealso:: `Repeatable Read Isolation Level`__ in PostgreSQL
documentation.
- .. __: http://www.postgresql.org/docs/current/static/transaction-iso.html#XACT-REPEATABLE-READ
+ .. __: https://www.postgresql.org/docs/current/static/transaction-iso.html#XACT-REPEATABLE-READ
.. data:: ISOLATION_LEVEL_SERIALIZABLE
@@ -687,7 +765,7 @@ methods. The level can be set to one of the following constants:
.. seealso:: `Serializable Isolation Level`__ in PostgreSQL documentation.
- .. __: http://www.postgresql.org/docs/current/static/transaction-iso.html#XACT-SERIALIZABLE
+ .. __: https://www.postgresql.org/docs/current/static/transaction-iso.html#XACT-SERIALIZABLE
.. data:: ISOLATION_LEVEL_DEFAULT
diff --git a/doc/src/extras.rst b/doc/src/extras.rst
index 15f35e80..e9117820 100644
--- a/doc/src/extras.rst
+++ b/doc/src/extras.rst
@@ -542,10 +542,10 @@ fields to JSON) you can use the `register_json()` function.
The Python :py:mod:`json` module is used by default to convert Python objects
to JSON and to parse data from the database.
-.. _JSON: http://www.json.org/
+.. _JSON: https://www.json.org/
.. |pgjson| replace:: :sql:`json`
.. |jsonb| replace:: :sql:`jsonb`
-.. _pgjson: http://www.postgresql.org/docs/current/static/datatype-json.html
+.. _pgjson: https://www.postgresql.org/docs/current/static/datatype-json.html
In order to pass a Python object to the database as query argument you can use
the `Json` adapter::
@@ -664,7 +664,7 @@ can be enabled using the `register_hstore()` function.
.. |hstore| replace:: :sql:`hstore`
-.. _hstore: http://www.postgresql.org/docs/current/static/hstore.html
+.. _hstore: https://www.postgresql.org/docs/current/static/hstore.html
@@ -686,7 +686,7 @@ after a table row type) into a Python named tuple, or into a regular tuple if
:py:func:`collections.namedtuple` is not found.
.. |CREATE TYPE| replace:: :sql:`CREATE TYPE`
-.. _CREATE TYPE: http://www.postgresql.org/docs/current/static/sql-createtype.html
+.. _CREATE TYPE: https://www.postgresql.org/docs/current/static/sql-createtype.html
.. doctest::
@@ -800,7 +800,7 @@ PostgreSQL |range|_ types. Builtin |range| types are supported out-of-the-box;
user-defined |range| types can be adapted using `register_range()`.
.. |range| replace:: :sql:`range`
-.. _range: http://www.postgresql.org/docs/current/static/rangetypes.html
+.. _range: https://www.postgresql.org/docs/current/static/rangetypes.html
.. autoclass:: Range
@@ -809,7 +809,7 @@ user-defined |range| types can be adapted using `register_range()`.
features: it doesn't perform normalization and doesn't implement all the
operators__ supported by the database.
- .. __: http://www.postgresql.org/docs/current/static/functions-range.html#RANGE-OPERATORS-TABLE
+ .. __: https://www.postgresql.org/docs/current/static/functions-range.html#RANGE-OPERATORS-TABLE
`!Range` objects are immutable, hashable, and support the ``in`` operator
(checking if an element is within the range). They can be tested for
diff --git a/doc/src/faq.rst b/doc/src/faq.rst
index 5824d2b4..432e994a 100644
--- a/doc/src/faq.rst
+++ b/doc/src/faq.rst
@@ -40,7 +40,7 @@ I receive the error *current transaction is aborted, commands ignored until end
PostgreSQL supports nested transactions using the |SAVEPOINT|_ command).
.. |SAVEPOINT| replace:: :sql:`SAVEPOINT`
- .. _SAVEPOINT: http://www.postgresql.org/docs/current/static/sql-savepoint.html
+ .. _SAVEPOINT: https://www.postgresql.org/docs/current/static/sql-savepoint.html
.. _faq-transaction-aborted-multiprocess:
@@ -184,8 +184,8 @@ Transferring binary data from PostgreSQL 9.0 doesn't work.
session before reading binary data;
- upgrade the libpq library on the client to at least 9.0.
- .. __: http://www.postgresql.org/docs/current/static/datatype-binary.html
- .. __: http://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-BYTEA-OUTPUT
+ .. __: https://www.postgresql.org/docs/current/static/datatype-binary.html
+ .. __: https://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-BYTEA-OUTPUT
.. _faq-array:
@@ -318,7 +318,7 @@ I can't compile `!psycopg2`: the compiler says *error: libpq-fe.h: No such file
:program:`pg_config` at install time and the libpq at runtime.
.. |lo_truncate| replace:: `!lo_truncate()`
- .. _lo_truncate: http://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-TRUNCATE
+ .. _lo_truncate: https://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-TRUNCATE
.. _faq-import-mod_wsgi:
@@ -332,5 +332,5 @@ Psycopg raises *ImportError: cannot import name tz* on import in mod_wsgi / ASP,
use the WSGIPythonEggs__ directive.
.. _egg: http://peak.telecommunity.com/DevCenter/PythonEggs
- .. __: http://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-python-egg-cache
- .. __: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPythonEggs
+ .. __: https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-python-egg-cache
+ .. __: https://modwsgi.readthedocs.io/en/develop/configuration-directives/WSGIPythonEggs.html
diff --git a/doc/src/index.rst b/doc/src/index.rst
index 4e920cb6..3f2e401f 100644
--- a/doc/src/index.rst
+++ b/doc/src/index.rst
@@ -24,9 +24,9 @@ Psycopg 2 is both Unicode and Python 3 friendly.
.. _Psycopg: http://initd.org/psycopg/
-.. _PostgreSQL: http://www.postgresql.org/
-.. _Python: http://www.python.org/
-.. _libpq: http://www.postgresql.org/docs/current/static/libpq.html
+.. _PostgreSQL: https://www.postgresql.org/
+.. _Python: https://www.python.org/
+.. _libpq: https://www.postgresql.org/docs/current/static/libpq.html
.. rubric:: Contents
diff --git a/doc/src/install.rst b/doc/src/install.rst
index f60b3c8c..34845b0e 100644
--- a/doc/src/install.rst
+++ b/doc/src/install.rst
@@ -12,11 +12,11 @@ to use Psycopg on a different Python implementation (PyPy, Jython, IronPython)
there is an experimental `porting of Psycopg for Ctypes`__, but it is not as
mature as the C implementation yet.
-.. _PostgreSQL: http://www.postgresql.org/
-.. _Python: http://www.python.org/
-.. _libpq: http://www.postgresql.org/docs/current/static/libpq.html
-.. _CPython: http://en.wikipedia.org/wiki/CPython
-.. _Ctypes: http://docs.python.org/library/ctypes.html
+.. _PostgreSQL: https://www.postgresql.org/
+.. _Python: https://www.python.org/
+.. _libpq: https://www.postgresql.org/docs/current/static/libpq.html
+.. _CPython: https://en.wikipedia.org/wiki/CPython
+.. _Ctypes: https://docs.python.org/library/ctypes.html
.. __: https://github.com/mvantellingen/psycopg2-ctypes
@@ -33,7 +33,7 @@ The current `!psycopg2` implementation supports:
NOTE: keep consistent with setup.py and the /features/ page.
- Python version 2.7
-- Python 3 versions from 3.4 to 3.6
+- Python 3 versions from 3.4 to 3.7
- PostgreSQL server versions from 7.4 to 10
- PostgreSQL client library version from 9.1
@@ -152,7 +152,7 @@ using something like ``pip install -U pip``), then you can run:
.. __: PyPI-binary_
.. _PyPI-binary: https://pypi.org/project/psycopg2-binary/
-.. _wheel: http://pythonwheels.com/
+.. _wheel: https://pythonwheels.com/
.. note::
@@ -188,7 +188,7 @@ displayed, `psycopg2-binary` has become a separate package, and from 2.8 it
has become the only way to install the binary package.
If you are using psycopg 2.7 and you want to disable the use of wheel binary
-packages, relying on the system system libraries available on your client, you
+packages, relying on the system libraries available on your client, you
can use the :command:`pip` |--no-binary option|__, e.g.:
.. code-block:: console
diff --git a/doc/src/module.rst b/doc/src/module.rst
index ef73b586..62689621 100644
--- a/doc/src/module.rst
+++ b/doc/src/module.rst
@@ -50,11 +50,11 @@ The module interface respects the standard defined in the |DBAPI|_.
using `environment variables`__.
.. __:
- .. _connstring: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
+ .. _connstring: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
.. __:
- .. _connparams: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
+ .. _connparams: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
.. __:
- .. _connenvvars: http://www.postgresql.org/docs/current/static/libpq-envars.html
+ .. _connenvvars: https://www.postgresql.org/docs/current/static/libpq-envars.html
Using the *connection_factory* parameter a different class or
connections factory can be specified. It should be a callable object
diff --git a/doc/src/sql.rst b/doc/src/sql.rst
index fe807c6a..9cd18e7e 100644
--- a/doc/src/sql.rst
+++ b/doc/src/sql.rst
@@ -77,16 +77,26 @@ to cursor methods such as `~cursor.execute()`, `~cursor.executemany()`,
.. autoclass:: Identifier
- .. autoattribute:: string
+ .. versionchanged:: 2.8
+ added support for multiple strings.
+
+ .. autoattribute:: strings
+
+ .. versionadded:: 2.8
+ previous verions only had a `!string` attribute. The attribute
+ still exists but is deprecate and will only work if the
+ `!Identifier` wraps a single string.
.. autoclass:: Literal
.. autoattribute:: wrapped
+
.. autoclass:: Placeholder
.. autoattribute:: name
+
.. autoclass:: Composed
.. autoattribute:: seq
diff --git a/doc/src/usage.rst b/doc/src/usage.rst
index db8674c1..e9416e35 100644
--- a/doc/src/usage.rst
+++ b/doc/src/usage.rst
@@ -198,8 +198,8 @@ called `SQL injection`_ and is known to be one of the most widespread forms of
attack to database servers. Before continuing, please print `this page`__ as a
memo and hang it onto your desk.
-.. _SQL injection: http://en.wikipedia.org/wiki/SQL_injection
-.. __: http://xkcd.com/327/
+.. _SQL injection: https://en.wikipedia.org/wiki/SQL_injection
+.. __: https://xkcd.com/327/
Psycopg can `automatically convert Python objects to and from SQL
literals`__: using this feature your code will be more robust and
@@ -221,7 +221,28 @@ argument of the `~cursor.execute()` method::
>>> cur.execute(SQL, data) # Note: no % operator
+Values containing backslashes and LIKE
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Unlike in Python, the backslash (`\\`) is not used as an escape
+character *except* in patterns used with `LIKE` and `ILIKE` where they
+are needed to escape the `%` and `_` characters.
+
+This can lead to confusing situations::
+
+ >>> path = r'C:\Users\Bobby.Tables'
+ >>> cur.execute('INSERT INTO mytable(path) VALUES (%s)', (path,))
+ >>> cur.execute('SELECT * FROM mytable WHERE path LIKE %s', (path,))
+ >>> cur.fetchall()
+ []
+
+The solution is to specify an `ESCAPE` character of `''` (empty string)
+in your `LIKE` query::
+
+ >>> cur.execute("SELECT * FROM mytable WHERE path LIKE %s ESCAPE ''", (path,))
+
+
+
.. index::
single: Adaptation
pair: Objects; Adaptation
@@ -351,7 +372,7 @@ converted into `!Decimal`.
This of course may imply a loss of precision.
.. seealso:: `PostgreSQL numeric types
- `__
+ `__
.. index::
@@ -391,8 +412,8 @@ defined on the database connection (the `PostgreSQL encoding`__, available in
>>> cur.execute("INSERT INTO test (num, data) VALUES (%s,%s);", (74, u))
-.. __: http://www.postgresql.org/docs/current/static/multibyte.html
-.. __: http://docs.python.org/library/codecs.html#standard-encodings
+.. __: https://www.postgresql.org/docs/current/static/multibyte.html
+.. __: https://docs.python.org/library/codecs.html
When reading data from the database, in Python 2 the strings returned are
usually 8 bit `!str` objects encoded in the database client encoding::
@@ -465,7 +486,7 @@ type `!str`). Any object implementing the `Revised Buffer Protocol`__ should
be usable as binary type. Received data is returned as `!buffer` (in Python 2)
or `!memoryview` (in Python 3).
-.. __: http://www.python.org/dev/peps/pep-3118/
+.. __: https://www.python.org/dev/peps/pep-3118/
.. versionchanged:: 2.4
only strings were supported before.
@@ -494,8 +515,8 @@ or `!memoryview` (in Python 3).
server configuration file or in the client session (using a query such as
``SET bytea_output TO escape;``) before receiving binary data.
- .. __: http://www.postgresql.org/docs/current/static/datatype-binary.html
- .. __: http://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-BYTEA-OUTPUT
+ .. __: https://www.postgresql.org/docs/current/static/datatype-binary.html
+ .. __: https://www.postgresql.org/docs/current/static/runtime-config-client.html#GUC-BYTEA-OUTPUT
.. index::
@@ -527,7 +548,7 @@ the same way::
"SELECT '38 days 6027.425337 seconds';"
.. seealso:: `PostgreSQL date/time types
- `__
+ `__
.. index::
@@ -622,7 +643,7 @@ Python lists are converted into PostgreSQL :sql:`ARRAY`\ s::
Furthermore :sql:`ANY` can also work with empty lists, whereas :sql:`IN ()`
is a SQL syntax error.
- .. __: http://www.postgresql.org/docs/current/static/functions-subquery.html#FUNCTIONS-SUBQUERY-ANY-SOME
+ .. __: https://www.postgresql.org/docs/current/static/functions-subquery.html#FUNCTIONS-SUBQUERY-ANY-SOME
.. note::
@@ -846,7 +867,7 @@ lifetime extends well after `~connection.commit()`, calling
.. |DECLARE| replace:: :sql:`DECLARE`
-.. _DECLARE: http://www.postgresql.org/docs/current/static/sql-declare.html
+.. _DECLARE: https://www.postgresql.org/docs/current/static/sql-declare.html
@@ -876,7 +897,7 @@ forked processes`__, so when using a module such as `multiprocessing` or a
forking web deploy method such as FastCGI make sure to create the connections
*after* the fork.
-.. __: http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNECT
+.. __: https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNECT
Connections shouldn't be shared either by different green threads: see
:ref:`green-support` for further details.
@@ -920,7 +941,7 @@ Please refer to the documentation of the single methods for details and
examples.
.. |COPY| replace:: :sql:`COPY`
-.. __: http://www.postgresql.org/docs/current/static/sql-copy.html
+.. __: https://www.postgresql.org/docs/current/static/sql-copy.html
@@ -937,7 +958,7 @@ access to user data that is stored in a special large-object structure. They
are useful with data values too large to be manipulated conveniently as a
whole.
-.. __: http://www.postgresql.org/docs/current/static/largeobjects.html
+.. __: https://www.postgresql.org/docs/current/static/largeobjects.html
Psycopg allows access to the large object using the
`~psycopg2.extensions.lobject` class. Objects are generated using the
@@ -948,9 +969,9 @@ Psycopg large object support efficient import/export with file system files
using the |lo_import|_ and |lo_export|_ libpq functions.
.. |lo_import| replace:: `!lo_import()`
-.. _lo_import: http://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-IMPORT
+.. _lo_import: https://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-IMPORT
.. |lo_export| replace:: `!lo_export()`
-.. _lo_export: http://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-EXPORT
+.. _lo_export: https://www.postgresql.org/docs/current/static/lo-interfaces.html#LO-EXPORT
.. versionchanged:: 2.6
added support for large objects greated than 2GB. Note that the support is
@@ -1014,5 +1035,5 @@ transactions produced by a Java program.
For further details see the documentation for the above methods.
-.. __: http://www.opengroup.org/bookstore/catalog/c193.htm
-.. __: http://jdbc.postgresql.org/
+.. __: https://publications.opengroup.org/c193
+.. __: https://jdbc.postgresql.org/
diff --git a/lib/__init__.py b/lib/__init__.py
index cbec98fd..b88d59c7 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -8,8 +8,8 @@ small and fast, and stable as a rock.
Homepage: http://initd.org/projects/psycopg2
-.. _PostgreSQL: http://www.postgresql.org/
-.. _Python: http://www.python.org/
+.. _PostgreSQL: https://www.postgresql.org/
+.. _Python: https://www.python.org/
:Groups:
* `Connections creation`: connect
@@ -43,7 +43,7 @@ Homepage: http://initd.org/projects/psycopg2
# Note: the first internal import should be _psycopg, otherwise the real cause
# of a failed loading of the C module may get hidden, see
-# http://archives.postgresql.org/psycopg/2011-02/msg00044.php
+# https://archives.postgresql.org/psycopg/2011-02/msg00044.php
# Import the DBAPI-2.0 stuff into top-level module.
diff --git a/lib/_range.py b/lib/_range.py
index fd15a76b..e72c8789 100644
--- a/lib/_range.py
+++ b/lib/_range.py
@@ -62,6 +62,19 @@ class Range(object):
return "%s(%r, %r, %r)" % (self.__class__.__name__,
self._lower, self._upper, self._bounds)
+ def __str__(self):
+ if self._bounds is None:
+ return 'empty'
+
+ items = [
+ self._bounds[0],
+ str(self._lower),
+ ', ',
+ str(self._upper),
+ self._bounds[1]
+ ]
+ return ''.join(items)
+
@property
def lower(self):
"""The lower bound of the range. `!None` if empty or unbound."""
diff --git a/lib/errorcodes.py b/lib/errorcodes.py
index b8742f52..beee37ce 100644
--- a/lib/errorcodes.py
+++ b/lib/errorcodes.py
@@ -26,7 +26,7 @@ This module contains symbolic names for all PostgreSQL error codes.
#
# Based on:
#
-# http://www.postgresql.org/docs/current/static/errcodes-appendix.html
+# https://www.postgresql.org/docs/current/static/errcodes-appendix.html
#
@@ -182,6 +182,7 @@ INVALID_XML_PROCESSING_INSTRUCTION = '2200T'
INVALID_INDICATOR_PARAMETER_VALUE = '22010'
SUBSTRING_ERROR = '22011'
DIVISION_BY_ZERO = '22012'
+INVALID_PRECEDING_OR_FOLLOWING_SIZE = '22013'
INVALID_ARGUMENT_FOR_NTILE_FUNCTION = '22014'
INTERVAL_FIELD_OVERFLOW = '22015'
INVALID_ARGUMENT_FOR_NTH_VALUE_FUNCTION = '22016'
diff --git a/lib/extensions.py b/lib/extensions.py
index 3661e6cd..3111d415 100644
--- a/lib/extensions.py
+++ b/lib/extensions.py
@@ -8,7 +8,7 @@ This module holds all the extensions to the DBAPI-2.0 provided by psycopg.
- `adapt()` -- exposes the PEP-246_ compatible adapting mechanism used
by psycopg to adapt Python types to PostgreSQL ones
-.. _PEP-246: http://www.python.org/peps/pep-0246.html
+.. _PEP-246: https://www.python.org/dev/peps/pep-0246/
"""
# psycopg/extensions.py - DBAPI-2.0 extensions specific to psycopg
#
diff --git a/lib/extras.py b/lib/extras.py
index ff32ab6a..af59d2f1 100644
--- a/lib/extras.py
+++ b/lib/extras.py
@@ -404,7 +404,7 @@ class NamedTupleCursor(_cursor):
class LoggingConnection(_connection):
"""A connection that logs all queries to a file or logger__ object.
- .. __: http://docs.python.org/library/logging.html
+ .. __: https://docs.python.org/library/logging.html
"""
def initialize(self, logobj):
@@ -638,8 +638,8 @@ class ReplicationCursor(_replicationCursor):
class UUID_adapter(object):
"""Adapt Python's uuid.UUID__ type to PostgreSQL's uuid__.
- .. __: http://docs.python.org/library/uuid.html
- .. __: http://www.postgresql.org/docs/current/static/datatype-uuid.html
+ .. __: https://docs.python.org/library/uuid.html
+ .. __: https://www.postgresql.org/docs/current/static/datatype-uuid.html
"""
def __init__(self, uuid):
@@ -759,8 +759,8 @@ def wait_select(conn):
The function is an example of a wait callback to be registered with
`~psycopg2.extensions.set_wait_callback()`. This function uses
- :py:func:`~select.select()` to wait for data available.
-
+ :py:func:`~select.select()` to wait for data to become available, and
+ therefore is able to handle/receive SIGINT/KeyboardInterrupt.
"""
import select
from psycopg2.extensions import POLL_OK, POLL_READ, POLL_WRITE
diff --git a/lib/sql.py b/lib/sql.py
index 7ba92952..241b8279 100644
--- a/lib/sql.py
+++ b/lib/sql.py
@@ -290,7 +290,7 @@ class SQL(Composable):
class Identifier(Composable):
"""
- A `Composable` representing an SQL identifer.
+ A `Composable` representing an SQL identifer or a dot-separated sequence.
Identifiers usually represent names of database objects, such as tables or
fields. PostgreSQL identifiers follow `different rules`__ than SQL string
@@ -307,20 +307,50 @@ class Identifier(Composable):
>>> print(sql.SQL(', ').join([t1, t2, t3]).as_string(conn))
"foo", "ba'r", "ba""z"
- """
- def __init__(self, string):
- if not isinstance(string, string_types):
- raise TypeError("SQL identifiers must be strings")
+ Multiple strings can be passed to the object to represent a qualified name,
+ i.e. a dot-separated sequence of identifiers.
- super(Identifier, self).__init__(string)
+ Example::
+
+ >>> query = sql.SQL("select {} from {}").format(
+ ... sql.Identifier("table", "field"),
+ ... sql.Identifier("schema", "table"))
+ >>> print(query.as_string(conn))
+ select "table"."field" from "schema"."table"
+
+ """
+ def __init__(self, *strings):
+ if not strings:
+ raise TypeError("Identifier cannot be empty")
+
+ for s in strings:
+ if not isinstance(s, string_types):
+ raise TypeError("SQL identifier parts must be strings")
+
+ super(Identifier, self).__init__(strings)
+
+ @property
+ def strings(self):
+ """A tuple with the strings wrapped by the `Identifier`."""
+ return self._wrapped
@property
def string(self):
- """The string wrapped by the `Identifier`."""
- return self._wrapped
+ """The string wrapped by the `Identifier`.
+ """
+ if len(self._wrapped) == 1:
+ return self._wrapped[0]
+ else:
+ raise AttributeError(
+ "the Identifier wraps more than one than one string")
+
+ def __repr__(self):
+ return "%s(%s)" % (
+ self.__class__.__name__,
+ ', '.join(map(repr, self._wrapped)))
def as_string(self, context):
- return ext.quote_ident(self._wrapped, context)
+ return '.'.join(ext.quote_ident(s, context) for s in self._wrapped)
class Literal(Composable):
diff --git a/lib/tz.py b/lib/tz.py
index d593175c..97f3857c 100644
--- a/lib/tz.py
+++ b/lib/tz.py
@@ -44,7 +44,7 @@ class FixedOffsetTimezone(datetime.tzinfo):
offset and name that instance will be returned. This saves memory and
improves comparability.
- .. __: http://docs.python.org/library/datetime.html#datetime-tzinfo
+ .. __: https://docs.python.org/library/datetime.html
"""
_name = None
_offset = ZERO
diff --git a/psycopg/column.h b/psycopg/column.h
new file mode 100644
index 00000000..59e9d9cb
--- /dev/null
+++ b/psycopg/column.h
@@ -0,0 +1,48 @@
+/* column.h - definition for a column in cursor.description type
+ *
+ * Copyright (C) 2018 Daniele Varrazzo
+ *
+ * This file is part of psycopg.
+ *
+ * psycopg2 is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link this program with the OpenSSL library (or with
+ * modified versions of OpenSSL that use the same license as OpenSSL),
+ * and distribute linked combinations including the two.
+ *
+ * You must obey the GNU Lesser General Public License in all respects for
+ * all of the code used other than OpenSSL.
+ *
+ * psycopg2 is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ */
+
+#ifndef PSYCOPG_COLUMN_H
+#define PSYCOPG_COLUMN_H 1
+
+extern HIDDEN PyTypeObject columnType;
+
+typedef struct {
+ PyObject_HEAD
+
+ PyObject *name;
+ PyObject *type_code;
+ PyObject *display_size;
+ PyObject *internal_size;
+ PyObject *precision;
+ PyObject *scale;
+ PyObject *null_ok;
+
+ /* Extensions to the DBAPI */
+ PyObject *table_oid;
+ PyObject *table_column;
+
+} columnObject;
+
+#endif /* PSYCOPG_COLUMN_H */
diff --git a/psycopg/column_type.c b/psycopg/column_type.c
new file mode 100644
index 00000000..8ee7d4c4
--- /dev/null
+++ b/psycopg/column_type.c
@@ -0,0 +1,375 @@
+/* column_type.c - python interface to cursor.description objects
+ *
+ * Copyright (C) 2018 Daniele Varrazzo
+ *
+ * This file is part of psycopg.
+ *
+ * psycopg2 is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link this program with the OpenSSL library (or with
+ * modified versions of OpenSSL that use the same license as OpenSSL),
+ * and distribute linked combinations including the two.
+ *
+ * You must obey the GNU Lesser General Public License in all respects for
+ * all of the code used other than OpenSSL.
+ *
+ * psycopg2 is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ */
+
+#define PSYCOPG_MODULE
+#include "psycopg/psycopg.h"
+
+#include "psycopg/column.h"
+
+
+static const char column_doc[] =
+ "Description of a column returned by a query.\n\n"
+ "The DBAPI demands this object to be a 7-items sequence. This object\n"
+ "respects this interface, but adds names for the exposed attributes\n"
+ "and adds attribute not requested by the DBAPI.";
+
+static const char name_doc[] =
+ "The name of the column returned.";
+
+static const char type_code_doc[] =
+ "The PostgreSQL OID of the column.\n\n"
+ "You can use the pg_type system table to get more informations about the\n"
+ "type. This is the value used by Psycopg to decide what Python type use\n"
+ "to represent the value";
+
+static const char display_size_doc[] =
+ "The actual length of the column in bytes.\n\n"
+ "Obtaining this value is computationally intensive, so it is always None\n"
+ "unless the PSYCOPG_DISPLAY_SIZE parameter is set at compile time.";
+
+static const char internal_size_doc[] =
+ "The size in bytes of the column associated to this column on the server.\n\n"
+ "Set to a negative value for variable-size types.";
+
+static const char precision_doc[] =
+ "Total number of significant digits in columns of type NUMERIC.\n\n"
+ "None for other types.";
+
+static const char scale_doc[] =
+ "Count of decimal digits in the fractional part in columns of type NUMERIC.\n\n"
+ "None for other types.";
+
+static const char null_ok_doc[] =
+ "Always none.";
+
+static const char table_oid_doc[] =
+ "The OID of the table from which the column was fetched.\n\n"
+ "None if not available";
+
+static const char table_column_doc[] =
+ "The number (within its table) of the column making up the result\n\n"
+ "None if not available. Note that PostgreSQL column numbers start at 1";
+
+
+static PyMemberDef column_members[] = {
+ { "name", T_OBJECT, offsetof(columnObject, name), READONLY, (char *)name_doc },
+ { "type_code", T_OBJECT, offsetof(columnObject, type_code), READONLY, (char *)type_code_doc },
+ { "display_size", T_OBJECT, offsetof(columnObject, display_size), READONLY, (char *)display_size_doc },
+ { "internal_size", T_OBJECT, offsetof(columnObject, internal_size), READONLY, (char *)internal_size_doc },
+ { "precision", T_OBJECT, offsetof(columnObject, precision), READONLY, (char *)precision_doc },
+ { "scale", T_OBJECT, offsetof(columnObject, scale), READONLY, (char *)scale_doc },
+ { "null_ok", T_OBJECT, offsetof(columnObject, null_ok), READONLY, (char *)null_ok_doc },
+ { "table_oid", T_OBJECT, offsetof(columnObject, table_oid), READONLY, (char *)table_oid_doc },
+ { "table_column", T_OBJECT, offsetof(columnObject, table_column), READONLY, (char *)table_column_doc },
+ { NULL }
+};
+
+
+static PyObject *
+column_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
+{
+ return type->tp_alloc(type, 0);
+}
+
+
+static int
+column_init(columnObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = {
+ "name", "type_code", "display_size", "internal_size",
+ "precision", "scale", "null_ok", "table_oid", "table_column", NULL};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOOOOOOOO", kwlist,
+ &self->name, &self->type_code, &self->display_size,
+ &self->internal_size, &self->precision, &self->scale,
+ &self->null_ok, &self->table_oid, &self->table_column)) {
+ return -1;
+ }
+
+ return 0;
+}
+
+
+static void
+column_dealloc(columnObject *self)
+{
+ Py_CLEAR(self->name);
+ Py_CLEAR(self->type_code);
+ Py_CLEAR(self->display_size);
+ Py_CLEAR(self->internal_size);
+ Py_CLEAR(self->precision);
+ Py_CLEAR(self->scale);
+ Py_CLEAR(self->null_ok);
+ Py_CLEAR(self->table_oid);
+ Py_CLEAR(self->table_column);
+
+ Py_TYPE(self)->tp_free((PyObject *)self);
+}
+
+
+static PyObject*
+column_repr(columnObject *self)
+{
+ PyObject *rv = NULL;
+ PyObject *format = NULL;
+ PyObject *args = NULL;
+ PyObject *tmp;
+
+ if (!(format = Text_FromUTF8("Column(name=%r, type_code=%r)"))) {
+ goto exit;
+ }
+
+ if (!(args = PyTuple_New(2))) { goto exit; }
+
+ tmp = self->name ? self->name : Py_None;
+ Py_INCREF(tmp);
+ PyTuple_SET_ITEM(args, 0, tmp);
+
+ tmp = self->type_code ? self->type_code : Py_None;
+ Py_INCREF(tmp);
+ PyTuple_SET_ITEM(args, 1, tmp);
+
+ rv = Text_Format(format, args);
+
+exit:
+ Py_XDECREF(args);
+ Py_XDECREF(format);
+
+ return rv;
+}
+
+
+static PyObject *
+column_richcompare(columnObject *self, PyObject *other, int op)
+{
+ PyObject *rv = NULL;
+ PyObject *tself = NULL;
+
+ if (!(tself = PyObject_CallFunctionObjArgs(
+ (PyObject *)&PyTuple_Type, (PyObject *)self, NULL))) {
+ goto exit;
+ }
+
+ rv = PyObject_RichCompare(tself, other, op);
+
+exit:
+ Py_XDECREF(tself);
+ return rv;
+}
+
+
+/* column description can be accessed as a 7 items tuple for DBAPI compatibility */
+
+static Py_ssize_t
+column_len(columnObject *self)
+{
+ return 7;
+}
+
+
+static PyObject *
+column_getitem(columnObject *self, Py_ssize_t item)
+{
+ PyObject *rv = NULL;
+
+ if (item < 0)
+ item += 7;
+
+ switch (item) {
+ case 0:
+ rv = self->name;
+ break;
+ case 1:
+ rv = self->type_code;
+ break;
+ case 2:
+ rv = self->display_size;
+ break;
+ case 3:
+ rv = self->internal_size;
+ break;
+ case 4:
+ rv = self->precision;
+ break;
+ case 5:
+ rv = self->scale;
+ break;
+ case 6:
+ rv = self->null_ok;
+ break;
+ default:
+ PyErr_SetString(PyExc_IndexError, "index out of range");
+ return NULL;
+ }
+
+ if (!rv) {
+ rv = Py_None;
+ }
+
+ Py_INCREF(rv);
+ return rv;
+}
+
+
+static PySequenceMethods column_sequence = {
+ (lenfunc)column_len, /* sq_length */
+ 0, /* sq_concat */
+ 0, /* sq_repeat */
+ (ssizeargfunc)column_getitem, /* sq_item */
+ 0, /* sq_slice */
+ 0, /* sq_ass_item */
+ 0, /* sq_ass_slice */
+ 0, /* sq_contains */
+ 0, /* sq_inplace_concat */
+ 0, /* sq_inplace_repeat */
+};
+
+
+static PyObject *
+column_getstate(columnObject *self)
+{
+ return PyObject_CallFunctionObjArgs(
+ (PyObject *)&PyTuple_Type, (PyObject *)self, NULL);
+}
+
+
+PyObject *
+column_setstate(columnObject *self, PyObject *state)
+{
+ Py_ssize_t size;
+ PyObject *rv = NULL;
+
+ if (state == Py_None) {
+ goto exit;
+ }
+ if (!PyTuple_Check(state)) {
+ PyErr_SetString(PyExc_TypeError, "state is not a tuple");
+ goto error;
+ }
+
+ size = PyTuple_GET_SIZE(state);
+
+ if (size > 0) {
+ Py_CLEAR(self->name);
+ self->name = PyTuple_GET_ITEM(state, 0);
+ Py_INCREF(self->name);
+ }
+ if (size > 1) {
+ Py_CLEAR(self->type_code);
+ self->type_code = PyTuple_GET_ITEM(state, 1);
+ Py_INCREF(self->type_code);
+ }
+ if (size > 2) {
+ Py_CLEAR(self->display_size);
+ self->display_size = PyTuple_GET_ITEM(state, 2);
+ Py_INCREF(self->display_size);
+ }
+ if (size > 3) {
+ Py_CLEAR(self->internal_size);
+ self->internal_size = PyTuple_GET_ITEM(state, 3);
+ Py_INCREF(self->internal_size);
+ }
+ if (size > 4) {
+ Py_CLEAR(self->precision);
+ self->precision = PyTuple_GET_ITEM(state, 4);
+ Py_INCREF(self->precision);
+ }
+ if (size > 5) {
+ Py_CLEAR(self->scale);
+ self->scale = PyTuple_GET_ITEM(state, 5);
+ Py_INCREF(self->scale);
+ }
+ if (size > 6) {
+ Py_CLEAR(self->null_ok);
+ self->null_ok = PyTuple_GET_ITEM(state, 6);
+ Py_INCREF(self->null_ok);
+ }
+ if (size > 7) {
+ Py_CLEAR(self->table_oid);
+ self->table_oid = PyTuple_GET_ITEM(state, 7);
+ Py_INCREF(self->table_oid);
+ }
+ if (size > 8) {
+ Py_CLEAR(self->table_column);
+ self->table_column = PyTuple_GET_ITEM(state, 8);
+ Py_INCREF(self->table_column);
+ }
+
+exit:
+ rv = Py_None;
+ Py_INCREF(rv);
+
+error:
+ return rv;
+}
+
+
+static PyMethodDef column_methods[] = {
+ /* Make Column picklable. */
+ {"__getstate__", (PyCFunction)column_getstate, METH_NOARGS },
+ {"__setstate__", (PyCFunction)column_setstate, METH_O },
+ {NULL}
+};
+
+
+PyTypeObject columnType = {
+ PyVarObject_HEAD_INIT(NULL, 0)
+ "psycopg2.extensions.Column",
+ sizeof(columnObject), 0,
+ (destructor)column_dealloc, /* tp_dealloc */
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ (reprfunc)column_repr, /*tp_repr*/
+ 0, /*tp_as_number*/
+ &column_sequence, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash */
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ 0, /*tp_getattro*/
+ 0, /*tp_setattro*/
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+ column_doc, /*tp_doc*/
+ 0, /*tp_traverse*/
+ 0, /*tp_clear*/
+ (richcmpfunc)column_richcompare, /*tp_richcompare*/
+ 0, /*tp_weaklistoffset*/
+ 0, /*tp_iter*/
+ 0, /*tp_iternext*/
+ column_methods, /*tp_methods*/
+ column_members, /*tp_members*/
+ 0, /*tp_getset*/
+ 0, /*tp_base*/
+ 0, /*tp_dict*/
+ 0, /*tp_descr_get*/
+ 0, /*tp_descr_set*/
+ 0, /*tp_dictoffset*/
+ (initproc)column_init, /*tp_init*/
+ 0, /*tp_alloc*/
+ column_new, /*tp_new*/
+};
diff --git a/psycopg/config.h b/psycopg/config.h
index a96864f3..6b33c2cf 100644
--- a/psycopg/config.h
+++ b/psycopg/config.h
@@ -154,8 +154,7 @@ typedef unsigned __int64 uint64_t;
#endif
/* what's this, we have no round function either? */
-#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) \
- || (defined(_WIN32) && !defined(__GNUC__)) \
+#if (defined(_WIN32) && !defined(__GNUC__)) \
|| (defined(sun) || defined(__sun__)) \
&& (defined(__SunOS_5_8) || defined(__SunOS_5_9))
diff --git a/psycopg/connection_type.c b/psycopg/connection_type.c
index 6a66d48d..6ac02269 100644
--- a/psycopg/connection_type.c
+++ b/psycopg/connection_type.c
@@ -757,6 +757,7 @@ psyco_conn_readonly_get(connectionObject *self)
break;
}
+ Py_XINCREF(rv);
return rv;
}
@@ -803,6 +804,7 @@ psyco_conn_deferrable_get(connectionObject *self)
break;
}
+ Py_XINCREF(rv);
return rv;
}
@@ -992,6 +994,25 @@ psyco_conn_get_backend_pid(connectionObject *self)
return PyInt_FromLong((long)PQbackendPID(self->pgconn));
}
+/* get the current host */
+
+#define psyco_conn_host_get_doc \
+"host -- Get the host name."
+
+static PyObject *
+psyco_conn_host_get(connectionObject *self)
+{
+ const char *val = NULL;
+
+ EXC_IF_CONN_CLOSED(self);
+
+ val = PQhost(self->pgconn);
+ if (!val) {
+ Py_RETURN_NONE;
+ }
+ return conn_text_from_chars(self, val);
+}
+
/* reset the currect connection */
#define psyco_conn_reset_doc \
@@ -1243,6 +1264,9 @@ static struct PyGetSetDef connectionObject_getsets[] = {
(getter)psyco_conn_deferrable_get,
(setter)psyco_conn_deferrable_set,
psyco_conn_deferrable_doc },
+ { "host",
+ (getter)psyco_conn_host_get, NULL,
+ psyco_conn_host_get_doc },
{NULL}
};
#undef EXCEPTION_GETTER
diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c
index d73bc3a4..5920c125 100644
--- a/psycopg/cursor_type.c
+++ b/psycopg/cursor_type.c
@@ -49,21 +49,21 @@
static PyObject *
psyco_curs_close(cursorObject *self)
{
+ PyObject *rv = NULL;
+ char *lname = NULL;
+
EXC_IF_ASYNC_IN_PROGRESS(self, close);
if (self->closed) {
+ rv = Py_None;
+ Py_INCREF(rv);
goto exit;
}
if (self->qname != NULL) {
- char buffer[128];
+ char buffer[256];
PGTransactionStatusType status;
- if (!self->query) {
- Dprintf("skipping named cursor close because unused");
- goto close;
- }
-
if (self->conn) {
status = PQtransactionStatus(self->conn->pgconn);
}
@@ -77,17 +77,45 @@ psyco_curs_close(cursorObject *self)
goto close;
}
+ /* We should close a server-side cursor only if exists, or we get an
+ * error (#716). If we execute()d the cursor should exist alright, but
+ * if we didn't there is still the expectation that the cursor is
+ * closed (#746).
+ *
+ * So if we didn't execute() check for the cursor existence before
+ * closing it (the view exists since PG 8.2 according to docs).
+ */
+ if (!self->query && self->conn->server_version >= 80200) {
+ if (!(lname = psycopg_escape_string(
+ self->conn, self->name, -1, NULL, NULL))) {
+ goto exit;
+ }
+ PyOS_snprintf(buffer, sizeof(buffer),
+ "SELECT 1 FROM pg_catalog.pg_cursors where name = %s",
+ lname);
+ if (pq_execute(self, buffer, 0, 0, 1) == -1) { goto exit; }
+
+ if (self->rowcount == 0) {
+ Dprintf("skipping named cursor close because not existing");
+ goto close;
+ }
+ }
+
EXC_IF_NO_MARK(self);
- PyOS_snprintf(buffer, 127, "CLOSE %s", self->qname);
- if (pq_execute(self, buffer, 0, 0, 1) == -1) return NULL;
+ PyOS_snprintf(buffer, sizeof(buffer), "CLOSE %s", self->qname);
+ if (pq_execute(self, buffer, 0, 0, 1) == -1) { goto exit; }
}
close:
self->closed = 1;
Dprintf("psyco_curs_close: cursor at %p closed", self);
+ rv = Py_None;
+ Py_INCREF(rv);
+
exit:
- Py_RETURN_NONE;
+ PyMem_Free(lname);
+ return rv;
}
@@ -742,7 +770,7 @@ psyco_curs_fetchone(cursorObject *self)
EXC_IF_NO_MARK(self);
EXC_IF_ASYNC_IN_PROGRESS(self, fetchone);
EXC_IF_TPC_PREPARED(self->conn, fetchone);
- PyOS_snprintf(buffer, 127, "FETCH FORWARD 1 FROM %s", self->qname);
+ PyOS_snprintf(buffer, sizeof(buffer), "FETCH FORWARD 1 FROM %s", self->qname);
if (pq_execute(self, buffer, 0, 0, self->withhold) == -1) return NULL;
if (_psyco_curs_prefetch(self) < 0) return NULL;
}
@@ -791,7 +819,7 @@ psyco_curs_next_named(cursorObject *self)
if (self->row >= self->rowcount) {
char buffer[128];
- PyOS_snprintf(buffer, 127, "FETCH FORWARD %ld FROM %s",
+ PyOS_snprintf(buffer, sizeof(buffer), "FETCH FORWARD %ld FROM %s",
self->itersize, self->qname);
if (pq_execute(self, buffer, 0, 0, self->withhold) == -1) return NULL;
if (_psyco_curs_prefetch(self) < 0) return NULL;
@@ -860,7 +888,7 @@ psyco_curs_fetchmany(cursorObject *self, PyObject *args, PyObject *kwords)
EXC_IF_NO_MARK(self);
EXC_IF_ASYNC_IN_PROGRESS(self, fetchmany);
EXC_IF_TPC_PREPARED(self->conn, fetchone);
- PyOS_snprintf(buffer, 127, "FETCH FORWARD %d FROM %s",
+ PyOS_snprintf(buffer, sizeof(buffer), "FETCH FORWARD %d FROM %s",
(int)size, self->qname);
if (pq_execute(self, buffer, 0, 0, self->withhold) == -1) { goto exit; }
if (_psyco_curs_prefetch(self) < 0) { goto exit; }
@@ -936,7 +964,7 @@ psyco_curs_fetchall(cursorObject *self)
EXC_IF_NO_MARK(self);
EXC_IF_ASYNC_IN_PROGRESS(self, fetchall);
EXC_IF_TPC_PREPARED(self->conn, fetchall);
- PyOS_snprintf(buffer, 127, "FETCH FORWARD ALL FROM %s", self->qname);
+ PyOS_snprintf(buffer, sizeof(buffer), "FETCH FORWARD ALL FROM %s", self->qname);
if (pq_execute(self, buffer, 0, 0, self->withhold) == -1) { goto exit; }
if (_psyco_curs_prefetch(self) < 0) { goto exit; }
}
@@ -1233,11 +1261,11 @@ psyco_curs_scroll(cursorObject *self, PyObject *args, PyObject *kwargs)
EXC_IF_TPC_PREPARED(self->conn, scroll);
if (strcmp(mode, "absolute") == 0) {
- PyOS_snprintf(buffer, 127, "MOVE ABSOLUTE %d FROM %s",
+ PyOS_snprintf(buffer, sizeof(buffer), "MOVE ABSOLUTE %d FROM %s",
value, self->qname);
}
else {
- PyOS_snprintf(buffer, 127, "MOVE %d FROM %s", value, self->qname);
+ PyOS_snprintf(buffer, sizeof(buffer), "MOVE %d FROM %s", value, self->qname);
}
if (pq_execute(self, buffer, 0, 0, self->withhold) == -1) return NULL;
if (_psyco_curs_prefetch(self) < 0) return NULL;
diff --git a/psycopg/diagnostics_type.c b/psycopg/diagnostics_type.c
index 0af65265..13e545fd 100644
--- a/psycopg/diagnostics_type.c
+++ b/psycopg/diagnostics_type.c
@@ -29,8 +29,11 @@
#include "psycopg/diagnostics.h"
#include "psycopg/error.h"
-/* These are new in PostgreSQL 9.3. Defining them here so that psycopg2 can
- * use them with a 9.3+ server even if compiled against pre-9.3 headers. */
+
+/* These constants are defined in src/include/postgres_ext.h but some may not
+ * be available with the libpq we currently support at compile time. */
+
+/* Available from PG 9.3 */
#ifndef PG_DIAG_SCHEMA_NAME
#define PG_DIAG_SCHEMA_NAME 's'
#endif
@@ -47,6 +50,11 @@
#define PG_DIAG_CONSTRAINT_NAME 'n'
#endif
+/* Available from PG 9.6 */
+#ifndef PG_DIAG_SEVERITY_NONLOCALIZED
+#define PG_DIAG_SEVERITY_NONLOCALIZED 'V'
+#endif
+
/* Retrieve an error string from the exception's cursor.
*
@@ -70,6 +78,8 @@ psyco_diagnostics_get_field(diagnosticsObject *self, void *closure)
static struct PyGetSetDef diagnosticsObject_getsets[] = {
{ "severity", (getter)psyco_diagnostics_get_field, NULL,
NULL, (void*) PG_DIAG_SEVERITY },
+ { "severity_nonlocalized", (getter)psyco_diagnostics_get_field, NULL,
+ NULL, (void*) PG_DIAG_SEVERITY_NONLOCALIZED },
{ "sqlstate", (getter)psyco_diagnostics_get_field, NULL,
NULL, (void*) PG_DIAG_SQLSTATE },
{ "message_primary", (getter)psyco_diagnostics_get_field, NULL,
@@ -152,7 +162,7 @@ static const char diagnosticsType_doc[] =
"Please refer to the `PostgreSQL documentation`__ for the meaning of all"
" the attributes.\n\n"
".. |PQresultErrorField| replace:: `!PQresultErrorField()`\n"
- ".. _PQresultErrorField: http://www.postgresql.org/docs/current/static/"
+ ".. _PQresultErrorField: https://www.postgresql.org/docs/current/static/"
"libpq-exec.html#LIBPQ-PQRESULTERRORFIELD\n"
".. __: PQresultErrorField_\n";
diff --git a/psycopg/green.h b/psycopg/green.h
index 4057ff7c..7d95f9c7 100644
--- a/psycopg/green.h
+++ b/psycopg/green.h
@@ -48,7 +48,7 @@ extern "C" {
"See `~psycopg2.extras.wait_select()` for an example of a wait callback\n" \
"implementation.\n" \
"\n" \
-".. _Eventlet: http://eventlet.net/\n" \
+".. _Eventlet: https://eventlet.net/\n" \
".. _gevent: http://www.gevent.org/\n"
HIDDEN PyObject *psyco_set_wait_callback(PyObject *self, PyObject *obj);
diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c
index 75ab2687..04a34a22 100644
--- a/psycopg/pqpath.c
+++ b/psycopg/pqpath.c
@@ -41,6 +41,7 @@
#include "psycopg/typecast.h"
#include "psycopg/pgtypes.h"
#include "psycopg/error.h"
+#include "psycopg/column.h"
#include "psycopg/libpq_support.h"
#include "libpq-fe.h"
@@ -108,7 +109,7 @@ exit:
/* Returns the Python exception corresponding to an SQLSTATE error
code. A list of error codes can be found at:
- http://www.postgresql.org/docs/current/static/errcodes-appendix.html */
+ https://www.postgresql.org/docs/current/static/errcodes-appendix.html */
BORROWED static PyObject *
exception_from_sqlstate(const char *sqlstate)
{
@@ -1150,12 +1151,13 @@ pq_send_query(connectionObject *conn, const char *query)
* The function will block only if a command is active and the
* necessary response data has not yet been read by PQconsumeInput.
*
- * The result should be disposed using PQclear()
+ * The result should be disposed of using PQclear()
*/
PGresult *
pq_get_last_result(connectionObject *conn)
{
PGresult *result = NULL, *res;
+ ExecStatusType status;
/* Read until PQgetResult gives a NULL */
while (NULL != (res = PQgetResult(conn->pgconn))) {
@@ -1168,11 +1170,15 @@ pq_get_last_result(connectionObject *conn)
PQclear(result);
}
result = res;
+ status = PQresultStatus(result);
+ Dprintf("pq_get_last_result: got result %s", PQresStatus(status));
- /* After entering copy both mode, libpq will make a phony
+ /* After entering copy mode, libpq will make a phony
* PGresult for us every time we query for it, so we need to
* break out of this endless loop. */
- if (PQresultStatus(result) == PGRES_COPY_BOTH) {
+ if (status == PGRES_COPY_BOTH
+ || status == PGRES_COPY_OUT
+ || status == PGRES_COPY_IN) {
break;
}
}
@@ -1245,12 +1251,17 @@ _pq_fetch_tuples(cursorObject *curs)
Oid ftype = PQftype(curs->pgres, i);
int fsize = PQfsize(curs->pgres, i);
int fmod = PQfmod(curs->pgres, i);
+ Oid ftable = PQftable(curs->pgres, i);
+ int ftablecol = PQftablecol(curs->pgres, i);
- PyObject *dtitem = NULL;
+ columnObject *column = NULL;
PyObject *type = NULL;
PyObject *cast = NULL;
- if (!(dtitem = PyTuple_New(7))) { goto exit; }
+ if (!(column = (columnObject *)PyObject_CallObject(
+ (PyObject *)&columnType, NULL))) {
+ goto exit;
+ }
/* fill the right cast function by accessing three different dictionaries:
- the per-cursor dictionary, if available (can be NULL or None)
@@ -1287,20 +1298,16 @@ _pq_fetch_tuples(cursorObject *curs)
curs->conn, PQfname(curs->pgres, i)))) {
goto err_for;
}
- PyTuple_SET_ITEM(dtitem, 0, tmp);
+ column->name = tmp;
}
- PyTuple_SET_ITEM(dtitem, 1, type);
+ column->type_code = type;
type = NULL;
/* 2/ display size is the maximum size of this field result tuples. */
if (dsize && dsize[i] >= 0) {
PyObject *tmp;
if (!(tmp = PyInt_FromLong(dsize[i]))) { goto err_for; }
- PyTuple_SET_ITEM(dtitem, 2, tmp);
- }
- else {
- Py_INCREF(Py_None);
- PyTuple_SET_ITEM(dtitem, 2, Py_None);
+ column->display_size = tmp;
}
/* 3/ size on the backend */
@@ -1309,18 +1316,18 @@ _pq_fetch_tuples(cursorObject *curs)
if (ftype == NUMERICOID) {
PyObject *tmp;
if (!(tmp = PyInt_FromLong((fmod >> 16)))) { goto err_for; }
- PyTuple_SET_ITEM(dtitem, 3, tmp);
+ column->internal_size = tmp;
}
else { /* If variable length record, return maximum size */
PyObject *tmp;
if (!(tmp = PyInt_FromLong(fmod))) { goto err_for; }
- PyTuple_SET_ITEM(dtitem, 3, tmp);
+ column->internal_size = tmp;
}
}
else {
PyObject *tmp;
if (!(tmp = PyInt_FromLong(fsize))) { goto err_for; }
- PyTuple_SET_ITEM(dtitem, 3, tmp);
+ column->internal_size = tmp;
}
/* 4,5/ scale and precision */
@@ -1330,40 +1337,35 @@ _pq_fetch_tuples(cursorObject *curs)
if (!(tmp = PyInt_FromLong((fmod >> 16) & 0xFFFF))) {
goto err_for;
}
- PyTuple_SET_ITEM(dtitem, 4, tmp);
+ column->precision = tmp;
if (!(tmp = PyInt_FromLong(fmod & 0xFFFF))) {
- PyTuple_SET_ITEM(dtitem, 5, tmp);
+ goto err_for;
}
- PyTuple_SET_ITEM(dtitem, 5, tmp);
- }
- else {
- Py_INCREF(Py_None);
- PyTuple_SET_ITEM(dtitem, 4, Py_None);
- Py_INCREF(Py_None);
- PyTuple_SET_ITEM(dtitem, 5, Py_None);
+ column->scale = tmp;
}
- /* 6/ FIXME: null_ok??? */
- Py_INCREF(Py_None);
- PyTuple_SET_ITEM(dtitem, 6, Py_None);
-
- /* Convert into a namedtuple if available */
- if (Py_None != psyco_DescriptionType) {
- PyObject *tmp = dtitem;
- dtitem = PyObject_CallObject(psyco_DescriptionType, tmp);
- Py_DECREF(tmp);
- if (NULL == dtitem) { goto err_for; }
+ /* table_oid, table_column */
+ if (ftable != InvalidOid) {
+ PyObject *tmp;
+ if (!(tmp = PyInt_FromLong((long)ftable))) { goto err_for; }
+ column->table_oid = tmp;
}
- PyTuple_SET_ITEM(description, i, dtitem);
- dtitem = NULL;
+ if (ftablecol > 0) {
+ PyObject *tmp;
+ if (!(tmp = PyInt_FromLong((long)ftablecol))) { goto err_for; }
+ column->table_column = tmp;
+ }
+
+ PyTuple_SET_ITEM(description, i, (PyObject *)column);
+ column = NULL;
continue;
err_for:
Py_XDECREF(type);
- Py_XDECREF(dtitem);
+ Py_XDECREF(column);
goto exit;
}
diff --git a/psycopg/psycopgmodule.c b/psycopg/psycopgmodule.c
index 23e648d2..ff04b25d 100644
--- a/psycopg/psycopgmodule.c
+++ b/psycopg/psycopgmodule.c
@@ -32,6 +32,7 @@
#include "psycopg/replication_cursor.h"
#include "psycopg/replication_message.h"
#include "psycopg/green.h"
+#include "psycopg/column.h"
#include "psycopg/lobject.h"
#include "psycopg/notify.h"
#include "psycopg/xid.h"
@@ -69,9 +70,6 @@ HIDDEN int psycopg_debug_enabled = 0;
/* Python representation of SQL NULL */
HIDDEN PyObject *psyco_null = NULL;
-/* The type of the cursor.description items */
-HIDDEN PyObject *psyco_DescriptionType = NULL;
-
/* macro trick to stringify a macro expansion */
#define xstr(s) str(s)
#define str(s) #s
@@ -839,63 +837,6 @@ psyco_GetDecimalType(void)
}
-/* Create a namedtuple for cursor.description items
- *
- * Return None in case of expected errors (e.g. namedtuples not available)
- * NULL in case of errors to propagate.
- */
-static PyObject *
-psyco_make_description_type(void)
-{
- PyObject *coll = NULL;
- PyObject *nt = NULL;
- PyTypeObject *t = NULL;
- PyObject *s = NULL;
- PyObject *rv = NULL;
-
- /* Try to import collections.namedtuple */
- if (!(coll = PyImport_ImportModule("collections"))) {
- Dprintf("psyco_make_description_type: collections import failed");
- goto error;
- }
- if (!(nt = PyObject_GetAttrString(coll, "namedtuple"))) {
- Dprintf("psyco_make_description_type: no collections.namedtuple");
- goto error;
- }
-
- /* Build the namedtuple */
- if(!(t = (PyTypeObject *)PyObject_CallFunction(nt, "ss", "Column",
- "name type_code display_size internal_size precision scale null_ok"))) {
- goto exit;
- }
-
- /* Export the tuple on the extensions module
- * Required to guarantee picklability on Py > 3.3 (see Python issue 21374)
- * for previous Py version the module is psycopg2 anyway but for consistency
- * we'd rather expose it from the extensions module. */
- if (!(s = Text_FromUTF8("psycopg2.extensions"))) { goto exit; }
- if (0 > PyDict_SetItemString(t->tp_dict, "__module__", s)) { goto exit; }
-
- rv = (PyObject *)t;
- t = NULL;
-
-exit:
- Py_XDECREF(coll);
- Py_XDECREF(nt);
- Py_XDECREF((PyObject *)t);
- Py_XDECREF(s);
-
- return rv;
-
-error:
- /* controlled error: we will fall back to regular tuples. Return None. */
- PyErr_Clear();
- rv = Py_None;
- Py_INCREF(rv);
- goto exit;
-}
-
-
/** method table and module initialization **/
static PyMethodDef psycopgMethods[] = {
@@ -1041,6 +982,9 @@ INIT_MODULE(_psycopg)(void)
Py_TYPE(&chunkType) = &PyType_Type;
if (PyType_Ready(&chunkType) == -1) goto exit;
+ Py_TYPE(&columnType) = &PyType_Type;
+ if (PyType_Ready(&columnType) == -1) goto exit;
+
Py_TYPE(¬ifyType) = &PyType_Type;
if (PyType_Ready(¬ifyType) == -1) goto exit;
@@ -1119,7 +1063,6 @@ INIT_MODULE(_psycopg)(void)
if (!(psycoEncodings = PyDict_New())) { goto exit; }
if (0 != psyco_encodings_fill(psycoEncodings)) { goto exit; }
psyco_null = Bytes_FromString("NULL");
- if (!(psyco_DescriptionType = psyco_make_description_type())) { goto exit; }
/* set some module's parameters */
PyModule_AddStringConstant(module, "__version__", xstr(PSYCOPG_VERSION));
@@ -1138,6 +1081,7 @@ INIT_MODULE(_psycopg)(void)
PyModule_AddObject(module, "ReplicationCursor", (PyObject*)&replicationCursorType);
PyModule_AddObject(module, "ReplicationMessage", (PyObject*)&replicationMessageType);
PyModule_AddObject(module, "ISQLQuote", (PyObject*)&isqlquoteType);
+ PyModule_AddObject(module, "Column", (PyObject*)&columnType);
PyModule_AddObject(module, "Notify", (PyObject*)¬ifyType);
PyModule_AddObject(module, "Xid", (PyObject*)&xidType);
PyModule_AddObject(module, "Diagnostics", (PyObject*)&diagnosticsType);
@@ -1150,7 +1094,6 @@ INIT_MODULE(_psycopg)(void)
PyModule_AddObject(module, "List", (PyObject*)&listType);
PyModule_AddObject(module, "QuotedString", (PyObject*)&qstringType);
PyModule_AddObject(module, "lobject", (PyObject*)&lobjectType);
- PyModule_AddObject(module, "Column", psyco_DescriptionType);
/* encodings dictionary in module dictionary */
PyModule_AddObject(module, "encodings", psycoEncodings);
diff --git a/psycopg/typecast_binary.c b/psycopg/typecast_binary.c
index e4839dab..8226d3f4 100644
--- a/psycopg/typecast_binary.c
+++ b/psycopg/typecast_binary.c
@@ -212,7 +212,7 @@ static const char hex_lut[128] = {
/* Parse a bytea output buffer encoded in 'hex' format.
*
* the format is described in
- * http://www.postgresql.org/docs/current/static/datatype-binary.html
+ * https://www.postgresql.org/docs/current/static/datatype-binary.html
*
* Parse the buffer in 'bufin', whose length is 'sizein'.
* Return a new buffer allocated by PyMem_Malloc and set 'sizeout' to its size.
@@ -262,7 +262,7 @@ exit:
/* Parse a bytea output buffer encoded in 'escape' format.
*
* the format is described in
- * http://www.postgresql.org/docs/current/static/datatype-binary.html
+ * https://www.postgresql.org/docs/current/static/datatype-binary.html
*
* Parse the buffer in 'bufin', whose length is 'sizein'.
* Return a new buffer allocated by PyMem_Malloc and set 'sizeout' to its size.
diff --git a/sandbox/array.py b/sandbox/array.py
deleted file mode 100644
index 9790d344..00000000
--- a/sandbox/array.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import psycopg2
-
-conn = psycopg2.connect("port=5433 dbname=test")
-curs = conn.cursor()
-
-#curs.execute("SELECT ARRAY[1,2,3] AS foo")
-#print curs.fetchone()[0]
-
-#curs.execute("SELECT ARRAY['1','2','3'] AS foo")
-#print curs.fetchone()[0]
-
-#curs.execute("""SELECT ARRAY[',','"','\\\\'] AS foo""")
-#d = curs.fetchone()[0]
-#print d, '->', d[0], d[1], d[2]
-
-#curs.execute("SELECT ARRAY[ARRAY[1,2],ARRAY[3,4]] AS foo")
-#print curs.fetchone()[0]
-
-#curs.execute("SELECT ARRAY[ARRAY[now(), now()], ARRAY[now(), now()]] AS foo")
-#print curs.description
-#print curs.fetchone()[0]
-
-#curs.execute("SELECT 1 AS foo, ARRAY[1,2] AS bar")
-#print curs.fetchone()
-
-#curs.execute("SELECT * FROM test()")
-#print curs.fetchone()
-
-curs.execute("SELECT %s", ([1,2,None],))
-print(curs.fetchone())
diff --git a/sandbox/async.py b/sandbox/async.py
deleted file mode 100644
index 3ddaa3a8..00000000
--- a/sandbox/async.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import datetime
-import time
-import psycopg2
-
-#d = datetime.timedelta(12, 100, 9876)
-#print d.days, d.seconds, d.microseconds
-#print psycopg.adapt(d).getquoted()
-
-conn = psycopg2.connect("dbname=test_unicode")
-conn.set_client_encoding("xxx")
-curs = conn.cursor()
-#curs.execute("SELECT 1.0 AS foo")
-#print curs.fetchmany(2)
-#print curs.fetchall()
-
-def sleep(curs):
- while not curs.isready():
- print(".")
- time.sleep(.1)
-
-#curs.execute("""
-# DECLARE zz INSENSITIVE SCROLL CURSOR WITH HOLD FOR
-# SELECT now();
-# FOR READ ONLY;""", async = 1)
-curs.execute("SELECT now() AS foo", async=1)
-sleep(curs)
-print(curs.fetchall())
-
-#curs.execute("""
-# FETCH FORWARD 1 FROM zz;""", async = 1)
-curs.execute("SELECT now() AS bar", async=1)
-print(curs.fetchall())
-
-curs.execute("SELECT now() AS bar")
-sleep(curs)
diff --git a/sandbox/crash.py b/sandbox/crash.py
deleted file mode 100644
index 851fa7ee..00000000
--- a/sandbox/crash.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-
-#import psycopg as db
-import psycopg2 as db
-import threading
-import time
-import sys
-
-def query_worker(dsn):
- conn = db.connect(dsn)
- cursor = conn.cursor()
- while True:
- cursor.execute("select * from pg_class")
- while True:
- row = cursor.fetchone()
- if row is None:
- break
-
-if len(sys.argv) != 2:
- print('usage: %s DSN' % sys.argv[0])
- sys.exit(1)
-th = threading.Thread(target=query_worker, args=(sys.argv[1],))
-th.setDaemon(True)
-th.start()
-time.sleep(1)
diff --git a/sandbox/dec2float.py b/sandbox/dec2float.py
deleted file mode 100644
index 481defab..00000000
--- a/sandbox/dec2float.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import psycopg2
-import psycopg2.extensions
-
-DEC2FLOAT = psycopg2.extensions.new_type(
- psycopg2._psycopg.DECIMAL.values,
- 'DEC2FLOAT',
- psycopg2.extensions.FLOAT)
-
-psycopg2.extensions.register_type(DEC2FLOAT)
-
-o = psycopg2.connect("dbname=test")
-c = o.cursor()
-c.execute("SELECT NULL::decimal(10,2)")
-n = c.fetchone()[0]
-print(n, type(n))
diff --git a/sandbox/domainoid.py b/sandbox/domainoid.py
deleted file mode 100644
index c686060c..00000000
--- a/sandbox/domainoid.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import psycopg2
-
-con = psycopg2.connect("dbname=test")
-
-cur = con.cursor()
-cur.execute("SELECT %s::regtype::oid", ('bytea', ))
-print(cur.fetchone()[0])
-# 17
-
-cur.execute("CREATE DOMAIN thing AS bytea")
-cur.execute("SELECT %s::regtype::oid", ('thing', ))
-print(cur.fetchone()[0])
-#62148
-
-cur.execute("CREATE TABLE thingrel (thingcol thing)")
-cur.execute("SELECT * FROM thingrel")
-print(cur.description)
-#(('thingcol', 17, None, -1, None, None, None),)
diff --git a/sandbox/gtk.py b/sandbox/gtk.py
deleted file mode 100644
index b98c1fec..00000000
--- a/sandbox/gtk.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import psycopg2
-
-o = psycopg2.connect("dbname=test")
-c = o.cursor()
-
-def sql():
- c.execute("SELECT 1.23 AS foo")
- print(1, c.fetchone())
- #print c.description
- c.execute("SELECT 1.23::float AS foo")
- print(2, c.fetchone())
- #print c.description
-
-print("BEFORE")
-sql()
-import gtk
-print("AFTER")
-sql()
diff --git a/sandbox/iter.py b/sandbox/iter.py
deleted file mode 100644
index c8becca8..00000000
--- a/sandbox/iter.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import psycopg2
-import psycopg2.extras
-
-conn = psycopg2.connect("dbname=test")
-curs = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-
-curs.execute("SELECT '2005-2-12'::date AS foo, 'boo!' as bar")
-for x in curs.fetchall():
- print(type(x), x[0], x[1], x['foo'], x['bar'])
-
-curs.execute("SELECT '2005-2-12'::date AS foo, 'boo!' as bar")
-for x in curs:
- print(type(x), x[0], x[1], x['foo'], x['bar'])
diff --git a/sandbox/leak.test.py b/sandbox/leak.test.py
deleted file mode 100644
index bae995f8..00000000
--- a/sandbox/leak.test.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""
-script: test_leak.py
-
-This script attempts to repeatedly insert the same list of rows into
-the database table, causing a duplicate key error to occur. It will
-then roll back the transaction and try again.
-
-Database table schema:
- -- CREATE TABLE t (foo TEXT PRIMARY KEY);
-
-There are two ways to run the script, which will launch one of the
-two functions:
-
-# leak() will cause increasingly more RAM to be used by the script.
-$ python leak
-
-# noleak() does not have the RAM usage problem. The only difference
-# between it and leak() is that 'rows' is created once, before the loop.
-$ python