- The ``pyramid_routesalchemy`` and ``pyramid_alchemy`` scaffolds

  inappropriately used ``DBSession.rollback()`` instead of
  ``transaction.abort()`` in one place.

- Wiki2 (SQLAlchemy + URL Dispatch) tutorial ``models.initialize_sql`` didn't
  match the ``pyramid_routesalchemy`` scaffold function of the same name; it
  didn't get synchronized when it was changed in the scaffold.

9 files changed, 18 insertions, 14 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 403969fc0..fd11a16d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -30,6 +30,17 @@ Bug Fixes
   second route with the name of a previously added name or c) use a
   Configurator that works in ``autocommit`` mode.
 
+- The ``pyramid_routesalchemy`` and ``pyramid_alchemy`` scaffolds
+  inappropriately used ``DBSession.rollback()`` instead of
+  ``transaction.abort()`` in one place.
+
+Documentation
+-------------
+
+- Wiki2 (SQLAlchemy + URL Dispatch) tutorial ``models.initialize_sql`` didn't
+  match the ``pyramid_routesalchemy`` scaffold function of the same name; it
+  didn't get synchronized when it was changed in the scaffold.
+
 1.1b1 (2011-07-10)
 ==================
 
diff --git a/TODO.txt b/TODO.txt
index 85b11ff06..06eb4d143 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,13 +1,6 @@
 Pyramid TODOs
 =============
 
-Must-Have
----------
-
-- tutorial models.initialize_sql doesn't match scaffold
-  (DBSession.rollback()/transaction.abort() in scaffold vs. "pass" in
-  tutorial)
-
 Should-Have
 -----------
 
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/models.py b/docs/tutorials/wiki2/src/authorization/tutorial/models.py
index 53c6d1122..832545cb1 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/models.py
@@ -41,7 +41,7 @@ def initialize_sql(engine):
         transaction.commit()
     except IntegrityError:
         # already created
-        pass
+        transaction.abort()
 
 class RootFactory(object):
     __acl__ = [ (Allow, Everyone, 'view'),
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
index 4fd010c5c..9b687931b 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/models.py
@@ -40,4 +40,4 @@ def initialize_sql(engine):
     try:
         populate()
     except IntegrityError:
-        pass
+        transaction.abort()
diff --git a/docs/tutorials/wiki2/src/models/tutorial/models.py b/docs/tutorials/wiki2/src/models/tutorial/models.py
index ecc8d567b..30f77a0b9 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/models.py
@@ -39,4 +39,4 @@ def initialize_sql(engine):
         transaction.commit()
     except IntegrityError:
         # already created
-        pass
+        transaction.abort()
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/models.py b/docs/tutorials/wiki2/src/tests/tutorial/models.py
index 53c6d1122..832545cb1 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/models.py
@@ -41,7 +41,7 @@ def initialize_sql(engine):
         transaction.commit()
     except IntegrityError:
         # already created
-        pass
+        transaction.abort()
 
 class RootFactory(object):
     __acl__ = [ (Allow, Everyone, 'view'),
diff --git a/docs/tutorials/wiki2/src/views/tutorial/models.py b/docs/tutorials/wiki2/src/views/tutorial/models.py
index 960c14941..30506f67e 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/models.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/models.py
@@ -38,4 +38,4 @@ def initialize_sql(engine):
         transaction.commit()
     except IntegrityError:
         # already created
-        pass
+        transaction.abort()
diff --git a/pyramid/scaffolds/alchemy/+package+/models.py b/pyramid/scaffolds/alchemy/+package+/models.py
index f1b47f98c..4a93ecf8a 100755
--- a/pyramid/scaffolds/alchemy/+package+/models.py
+++ b/pyramid/scaffolds/alchemy/+package+/models.py
@@ -76,7 +76,7 @@ def initialize_sql(engine):
     try:
         populate()
     except IntegrityError:
-        DBSession.rollback()
+        transaction.abort()
     return DBSession
 
 def appmaker(engine):
diff --git a/pyramid/scaffolds/routesalchemy/+package+/models.py b/pyramid/scaffolds/routesalchemy/+package+/models.py
index a036e8c91..e942732ec 100644
--- a/pyramid/scaffolds/routesalchemy/+package+/models.py
+++ b/pyramid/scaffolds/routesalchemy/+package+/models.py
@@ -39,4 +39,4 @@ def initialize_sql(engine):
     try:
         populate()
     except IntegrityError:
-        DBSession.rollback()
+        transaction.abort()