comparison 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
comparison
equal deleted inserted replaced
6213:591effa1fc4d 6214:f973b866fffc
482 ######################################################### 482 #########################################################
483 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### 483 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ###
484 ######################################################### 484 #########################################################
485 485
486 # SQLITE [default] 486 # SQLITE [default]
487 sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60 487 sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60
488 488
489 # POSTGRESQL 489 # POSTGRESQL
490 #sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea 490 #sqlalchemy.url = postgresql://user:pass@localhost/kallithea
491 491
492 # MySQL 492 # MySQL
493 #sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea?charset=utf8 493 #sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8
494 494
495 # see sqlalchemy docs for others 495 # see sqlalchemy docs for others
496 496
497 sqlalchemy.db1.echo = false 497 sqlalchemy.echo = false
498 sqlalchemy.db1.pool_recycle = 3600 498 sqlalchemy.pool_recycle = 3600
499 499
500 ################################ 500 ################################
501 ### ALEMBIC CONFIGURATION #### 501 ### ALEMBIC CONFIGURATION ####
502 ################################ 502 ################################
503 503