diff options
| author | Michael Trier <mtrier@gmail.com> | 2008-07-19 17:52:31 +0000 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2008-07-19 17:52:31 +0000 |
| commit | 5c75aed9be1941144c390673709861e86c1a3e14 (patch) | |
| tree | e8dd32fdc0e96f732788579c25ddfb850ef5f3ed | |
| parent | 0cb0dc0694384614153b83a17a58fe36e2219091 (diff) | |
| download | sqlalchemy-5c75aed9be1941144c390673709861e86c1a3e14.tar.gz | |
Corrected a couple of lingering transactional=True statements in the docs.
| -rw-r--r-- | doc/build/content/plugins.txt | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/declarative.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/build/content/plugins.txt b/doc/build/content/plugins.txt index 5f795d497..29d9c4b62 100644 --- a/doc/build/content/plugins.txt +++ b/doc/build/content/plugins.txt @@ -217,7 +217,7 @@ and Table objects. A typical application setup using `scoped_session` might look {python} engine = create_engine('postgres://scott:tiger@localhost/test') - Session = scoped_session(sessionmaker(transactional=True, autoflush=False, bind=engine)) + Session = scoped_session(sessionmaker(autocommit=False, autoflush=False, bind=engine)) Base = declarative_base() Mapped instances then make usage of `Session` in the usual way. diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 68a0d8e81..f8008ab8b 100644 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -192,7 +192,7 @@ objects. A typical application setup using ``scoped_session`` might look like:: engine = create_engine('postgres://scott:tiger@localhost/test') - Session = scoped_session(sessionmaker(transactional=True, + Session = scoped_session(sessionmaker(autocommit=False, autoflush=False, bind=engine)) Base = declarative_base() diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 289294f4c..fbfcd51c6 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -746,7 +746,7 @@ class Session(object): This clears all items and ends any transaction in progress. - If this session were created with ``transactional=True``, a new + If this session were created with ``autocommit=False``, a new transaction is immediately begun. Note that this new transaction does not use any connection resources until they are first needed. |