merge tutorialfix branch

3 files changed, 10 insertions, 11 deletions

diff --git a/repoze/bfg/paster_templates/alchemy/+package+/models.py b/repoze/bfg/paster_templates/alchemy/+package+/models.py
index 7d973c628..336613cf9 100755
--- a/repoze/bfg/paster_templates/alchemy/+package+/models.py
+++ b/repoze/bfg/paster_templates/alchemy/+package+/models.py
@@ -19,7 +19,7 @@ DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
 class MyModel(Base):
-    __tablename__ = 'mymodel'
+    __tablename__ = 'models'
     id = Column(Integer, primary_key=True)
     name = Column(Unicode(255), unique=True)
     value = Column(Integer)
@@ -73,7 +73,7 @@ def populate():
     session.flush()
     transaction.commit()
 
-def initialize_sql(db_string, db_echo):
+def initialize_sql(db_string, db_echo=False):
     engine = create_engine(db_string, echo=db_echo)
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -83,6 +83,6 @@ def initialize_sql(db_string, db_echo):
     except IntegrityError:
         pass
 
-def appmaker(db_string, db_echo):
+def appmaker(db_string, db_echo=False):
     initialize_sql(db_string, db_echo)
     return default_get_root
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl b/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
index 3c2711028..026505f3a 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/alchemy/+package+/run.py_tmpl
@@ -1,4 +1,5 @@
 from repoze.bfg.configuration import Configurator
+from paste.deploy.converters import asbool
 
 from {{package}}.models import appmaker
 
@@ -11,11 +12,9 @@ def app(global_config, **settings):
     zcml_file = settings.get('configure_zcml', 'configure.zcml')
     db_string = settings.get('db_string')
     if db_string is None:
-        raise ValueError("No 'db_string' in application configuration.")
-    db_echo = settings.get('db_echo')
-    if db_echo is None:
-        db_echo = True
-    get_root = appmaker(db_string, db_echo)
+        raise ValueError("No 'db_string' value in application configuration.")
+    db_echo = settings.get('db_echo', 'false')
+    get_root = appmaker(db_string, asbool(db_echo))
     config = Configurator(settings=settings, root_factory=get_root)
     config.begin()
     config.load_zcml(zcml_file)
diff --git a/repoze/bfg/paster_templates/alchemy/+project+.ini_tmpl b/repoze/bfg/paster_templates/alchemy/+project+.ini_tmpl
index 1fa0609e0..8260104d5 100644
--- a/repoze/bfg/paster_templates/alchemy/+project+.ini_tmpl
+++ b/repoze/bfg/paster_templates/alchemy/+project+.ini_tmpl
@@ -1,8 +1,8 @@
 [DEFAULT]
 debug = true
 
-[app:alchemy]
-use = egg:{{project}}#app
+[app:sqlalchemy]
+use = egg:{{package}}#app
 reload_templates = true
 debug_authorization = false
 debug_notfound = false
@@ -14,7 +14,7 @@ db_echo = false
 [pipeline:main]
 pipeline =
     egg:repoze.tm2#tm
-    alchemy
+    sqlalchemy
 
 [server:main]
 use = egg:Paste#http