summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-07-13 02:04:54 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-07-13 02:04:54 +0000
commit5503028d8cc404bb28fd5760f5ba6c27cfc37ae2 (patch)
treef66e23eef8e95705a257e5b0e941940411dd34ba /lib/sqlalchemy/databases
parent40772955a58b5013ad3d94b314b61c3979999118 (diff)
downloadsqlalchemy-5503028d8cc404bb28fd5760f5ba6c27cfc37ae2.tar.gz
changed reference to PostgreSQL in docs.rel_0_5_5
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/postgres.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 4fc79921b..154d971e3 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -20,7 +20,7 @@ Connecting
URLs are of the form `postgres://user:password@host:port/dbname[?key=value&key=value...]`.
-Postgres-specific keyword arguments which are accepted by :func:`~sqlalchemy.create_engine()` are:
+PostgreSQL-specific keyword arguments which are accepted by :func:`~sqlalchemy.create_engine()` are:
* *server_side_cursors* - Enable the usage of "server side cursors" for SQL statements which support
this feature. What this essentially means from a psycopg2 point of view is that the cursor is
@@ -33,7 +33,7 @@ Postgres-specific keyword arguments which are accepted by :func:`~sqlalchemy.cre
Sequences/SERIAL
----------------
-Postgres supports sequences, and SQLAlchemy uses these as the default means of creating
+PostgreSQL supports sequences, and SQLAlchemy uses these as the default means of creating
new primary key values for integer-based primary key columns. When creating tables,
SQLAlchemy will issue the ``SERIAL`` datatype for integer-based primary key columns,
which generates a sequence corresponding to the column and associated with it based on
@@ -53,7 +53,7 @@ that when an :func:`~sqlalchemy.sql.expression.insert()` construct is executed u
"executemany" semantics, the sequence is not pre-executed and normal PG SERIAL behavior
is used.
-Postgres 8.3 supports an ``INSERT...RETURNING`` syntax which SQLAlchemy supports
+PostgreSQL 8.3 supports an ``INSERT...RETURNING`` syntax which SQLAlchemy supports
as well. A future release of SQLA will use this feature by default in lieu of
sequence pre-execution in order to retrieve new primary key values, when available.
@@ -84,7 +84,7 @@ option to the Index constructor::
Transactions
------------
-The Postgres dialect fully supports SAVEPOINT and two-phase commit operations.
+The PostgreSQL dialect fully supports SAVEPOINT and two-phase commit operations.
"""
@@ -411,7 +411,7 @@ class PGDialect(default.DefaultDialect):
def last_inserted_ids(self):
if self.context.last_inserted_ids is None:
- raise exc.InvalidRequestError("no INSERT executed, or can't use cursor.lastrowid without Postgres OIDs enabled")
+ raise exc.InvalidRequestError("no INSERT executed, or can't use cursor.lastrowid without PostgreSQL OIDs enabled")
else:
return self.context.last_inserted_ids