evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automx: include domain name in query result.

Browse Source
This commit is contained in:
Antoine Nguyen
2019-04-29 12:11:42 +02:00
parent 6c28be4cca
commit 688c7744af
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modoboa_installer/scripts/automx.py
View File

@@ -41,12 +41,14 @@ class Automx(base.Installer):
self.config.get("modoboa", "dbname")) self.config.get("modoboa", "dbname"))
if self.db_driver == "pgsql": if self.db_driver == "pgsql":
sql_query = ( sql_query = (
"SELECT first_name || ' ' || last_name AS display_name, email " "SELECT first_name || ' ' || last_name AS display_name, email"
", SPLIT_PART(email, '@', 2) AS domain "
"FROM core_user WHERE email='%s' AND is_active") "FROM core_user WHERE email='%s' AND is_active")
else: else:
sql_query = ( sql_query = (
"SELECT concat(first_name, ' ', last_name) AS display_name, " "SELECT concat(first_name, ' ', last_name) AS display_name, "
"email FROM core_user WHERE email='%s' AND is_active=1" "email, SUBSTRING_INDEX(email, '@', -1) AS domain "
"FROM core_user WHERE email='%s' AND is_active=1"
) )
context.update({"sql_dsn": sql_dsn, "sql_query": sql_query}) context.update({"sql_dsn": sql_dsn, "sql_query": sql_query})
return context return context