From 7b0f6638bdbb09c4cae16ba4f147ce954ffce4ed Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Tue, 21 Feb 2012 20:36:30 +0100 Subject: [PATCH] avoid ssl MySQL reserved keyword --- sqlobject_history/jmc_0.3rc1-0.3rc2.sql | 2 +- src/jmc/model/account.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sqlobject_history/jmc_0.3rc1-0.3rc2.sql b/sqlobject_history/jmc_0.3rc1-0.3rc2.sql index eec5210..d0e9cc9 100644 --- a/sqlobject_history/jmc_0.3rc1-0.3rc2.sql +++ b/sqlobject_history/jmc_0.3rc1-0.3rc2.sql @@ -1 +1 @@ -ALTER TABLE global_smtp_account ADD COLUMN ssl TINYINT; +ALTER TABLE global_smtp_account ADD COLUMN _ssl TINYINT; diff --git a/src/jmc/model/account.py b/src/jmc/model/account.py index 5a43df2..28f181b 100644 --- a/src/jmc/model/account.py +++ b/src/jmc/model/account.py @@ -697,7 +697,7 @@ class GlobalSMTPAccount(AbstractSMTPAccount): host = StringCol(default=lambda: smtp_default_host) port = IntCol(default=lambda: smtp_default_port) tls = BoolCol(default=lambda: smtp_default_tls) - ssl = BoolCol(default=lambda: smtp_default_ssl) + ssl = BoolCol(default=lambda: smtp_default_ssl, dbName="_ssl") store_password = BoolCol(default=True) waiting_password_reply = BoolCol(default=False)