summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-01-08 17:19:19 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2011-01-08 17:19:19 -0500
commit0342a4886f00b34cf02e0d2d986a0896ba946788 (patch)
treeaecadbc903d553b7b8e7190715efe91430475cf0 /lib
parent4e9e0f041c151cfa08d57773b49b254f1b4f8b6a (diff)
downloadsqlalchemy-0342a4886f00b34cf02e0d2d986a0896ba946788.tar.gz
crappy docs, lets try that again
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/mssql/base.py9
-rw-r--r--lib/sqlalchemy/engine/__init__.py17
2 files changed, 13 insertions, 13 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index facfdd754..0faa97077 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -118,11 +118,12 @@ Triggers
--------
SQLAlchemy by default uses OUTPUT INSERTED to get at newly
-generated primary key values via SEQUENCE columns. MS-SQL does not
+generated primary key values via IDENTITY columns or other
+server side defaults. MS-SQL does not
allow the usage of OUTPUT INSERTED on tables that have triggers.
To disable the usage of OUTPUT INSERTED on a per-table basis,
-specify ``implicit_returning=False`` to each :class:`.Table`
-which has sequences::
+specify ``implicit_returning=False`` for each :class:`.Table`
+which has triggers::
Table('mytable', metadata,
Column('id', Integer, primary_key=True),
@@ -137,7 +138,7 @@ Declarative form::
__table_args__ = {'implicit_returning':False}
-This option can also be specified enginewide using the
+This option can also be specified engine-wide using the
``implicit_returning=False`` argument on :func:`.create_engine`.
Known Issues
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index e33dff53b..010cc22dd 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -175,15 +175,14 @@ def create_engine(*args, **kwargs):
be applied to all connections. See
:meth:`~sqlalchemy.engine.base.Connection.execution_options`
- :param implicit_returning=True: When ``False``, the RETURNING
- feature of the database, if available, will not be used
- to fetch newly generated primary key values. This applies
- to those backends which support RETURNING or a compatible
- construct, including Postgresql, Firebird, Oracle, Microsoft
- SQL Server. The default behavior is to use a compatible RETURNING
- construct when a single-row INSERT statement is emitted with no
- existing returning() clause in order to fetch newly generated
- primary key values.
+ :param implicit_returning=True: When ``True``, a RETURNING-
+ compatible construct, if available, will be used to
+ fetch newly generated primary key values when a single row
+ INSERT statement is emitted with no existing returning()
+ clause. This applies to those backends which support RETURNING
+ or a compatible construct, including Postgresql, Firebird, Oracle,
+ Microsoft SQL Server. Set this to ``False`` to disable
+ the automatic usage of RETURNING.
:param label_length=None: optional integer value which limits
the size of dynamically generated column labels to that many