diff development.ini @ 6214:f973b866fffc

Turbogears2 migration: use sqlalchemy.url iso sqlalchemy.db1.url In Turbogears2, much of the application initialization is handled by the framework, whereas in Pylons the application was responsible for it. Initializing SQLAlchemy is one such part of initialization which is handled by Turbogears2. Turbogears2 expects the configuration file to refer to the database using 'sqlalchemy.url' rather than the current 'sqlalchemy.db1.url'. While the exact name is not really important, not following this approach means we'll need to override the sqlalchemy initialization method. Therefore, as a preparation to the Turbogears2 migration, already change the database reference string under Pylons. When upgrading to a version of Kallithea containing this commit, the .ini file will manually need to be adapted to remove the .db1 strings.
author Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
date Mon, 22 Aug 2016 17:50:51 +0200
parents d3957c90499b
children d89d586b26ae
line wrap: on
line diff
--- a/development.ini	Mon Sep 12 17:41:20 2016 +0200
+++ b/development.ini	Mon Aug 22 17:50:51 2016 +0200
@@ -484,18 +484,18 @@
 #########################################################
 
 # SQLITE [default]
-sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60
+sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60
 
 # POSTGRESQL
-#sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
+#sqlalchemy.url = postgresql://user:pass@localhost/kallithea
 
 # MySQL
-#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea?charset=utf8
+#sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
 
 # see sqlalchemy docs for others
 
-sqlalchemy.db1.echo = false
-sqlalchemy.db1.pool_recycle = 3600
+sqlalchemy.echo = false
+sqlalchemy.pool_recycle = 3600
 
 ################################
 ### ALEMBIC CONFIGURATION   ####