diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/databases/postgres.py | 10 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/schema.py | 2 |
4 files changed, 8 insertions, 8 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 diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index b0f446598..bb2b1b5be 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -173,7 +173,7 @@ def create_engine(*args, **kwargs): :param module=None: used by database implementations which support multiple DBAPI modules, this is a reference to a DBAPI2 module to be used instead of the engine's default module. For - Postgres, the default is psycopg2. For Oracle, it's cx_Oracle. + PostgreSQL, the default is psycopg2. For Oracle, it's cx_Oracle. :param pool=None: an already-constructed instance of :class:`~sqlalchemy.pool.Pool`, such as a diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index a80d17642..4c4ec8513 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -338,7 +338,7 @@ def relation(argument, secondary=None, **kwargs): the foreign key in the database, and that the database will handle propagation of an UPDATE from a source column to dependent rows. Note that with databases which enforce - referential integrity (i.e. Postgres, MySQL with InnoDB tables), + referential integrity (i.e. PostgreSQL, MySQL with InnoDB tables), ON UPDATE CASCADE is required for this operation. The relation() will update the value of the attribute on related items which are locally present in the session during a flush. diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 2ec359f38..5d31543d8 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -472,7 +472,7 @@ class Column(SchemaItem, expression.ColumnClause): or :meth:`create_all()`. The flag has no relevance at any other time. * The database supports autoincrementing behavior, such as - Postgres or MySQL, and this behavior can be disabled (which does + PostgreSQL or MySQL, and this behavior can be disabled (which does not include SQLite). :param default: A scalar, Python callable, or :class:`~sqlalchemy.sql.expression.ClauseElement` |