MySQL support (rename columns names conflicting with MySQL reserved words)

darcs-hash:20070928184700-86b55-c9acce01326a0d0ae3c616d6e202ad9ebe6599ba.gz
This commit is contained in:
David Rousselie
2007-09-28 20:47:00 +02:00
parent 53f0ae67f1
commit 23c84a338e
2 changed files with 10 additions and 5 deletions

View File

@@ -7,14 +7,18 @@ service_jid: jmc.localhost
language: en
[db]
#type: mysql
#SQLite config
type: sqlite
#host: root@localhost
host:
name: /var/spool/jabber/jmc.db
#url: %(type)%(host)%(name)?debug=1&debugThreading=1
#Mysql config
#type: mysql
#host: root:pass@localhost
#name: /jmc
#db_url: %(type)s://%(host)s%(name)s?debug=1&debugThreading=1
db_url: %(type)s://%(host)s%(name)s
[component]
pid_file: /var/run/jabber/jmc.pid
#motd: "Message of the day"

View File

@@ -157,8 +157,9 @@ class MailAccount(PresenceAccount):
password = StringCol(default=None)
host = StringCol(default="localhost")
port = IntCol(default=110)
ssl = BoolCol(default=False)
interval = IntCol(default=5)
# explicitly set dbName to avoid MySQL reserved words
ssl = BoolCol(default=False, dbName="_ssl")
interval = IntCol(default=5, dbName="_interval")
store_password = BoolCol(default=True)
live_email_only = BoolCol(default=False)