From 8f35bfdc9a00c64d297df538cc45e5b534b87439 Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Fri, 11 Sep 2015 21:45:28 +0300
Subject: [PATCH] Redmine 3.0: users.email -> email_addresses.address.

---
 gitorious_redmine.sh | 5 ++++-
 rhodecode_redmine.sh | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gitorious_redmine.sh b/gitorious_redmine.sh
index 681b0e5..b88d33b 100755
--- a/gitorious_redmine.sh
+++ b/gitorious_redmine.sh
@@ -54,6 +54,7 @@ REDMINE_ID_GITORIOUS_REPO=`mysql --default-character-set=utf8 -h$MYSQL_HOSTNAME
                               $REDMINE_MYSQL_DBNAME.projects,
                               $REDMINE_MYSQL_DBNAME.roles,
                               $REDMINE_MYSQL_DBNAME.users,
+                              $REDMINE_MYSQL_DBNAME.email_addresses,
                               $GITORIOUS_MYSQL_DBNAME.repositories,
                               $GITORIOUS_MYSQL_DBNAME.roles,
                               $GITORIOUS_MYSQL_DBNAME.users
@@ -63,7 +64,9 @@ REDMINE_ID_GITORIOUS_REPO=`mysql --default-character-set=utf8 -h$MYSQL_HOSTNAME
                                AND $REDMINE_MYSQL_DBNAME.members.project_id=$REDMINE_MYSQL_DBNAME.projects.id
                                AND $REDMINE_MYSQL_DBNAME.projects.name=$GITORIOUS_MYSQL_DBNAME.repositories.name
                                AND $REDMINE_MYSQL_DBNAME.users.type='User'
-                               AND $REDMINE_MYSQL_DBNAME.users.mail=$GITORIOUS_MYSQL_DBNAME.users.email
+                               AND $REDMINE_MYSQL_DBNAME.email_addresses.address=$GITORIOUS_MYSQL_DBNAME.users.email
+                               AND $REDMINE_MYSQL_DBNAME.users.id=$REDMINE_MYSQL_DBNAME.email_addresses.user_id
+                               AND $REDMINE_MYSQL_DBNAME.email_addresses.is_default='1'
                                AND $REDMINE_MYSQL_DBNAME.roles.name IN ($roles_mysql_string)
                                AND $GITORIOUS_MYSQL_DBNAME.repositories.user_id=$GITORIOUS_MYSQL_DBNAME.users.id;" \
                          | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+3`
diff --git a/rhodecode_redmine.sh b/rhodecode_redmine.sh
index eb2f2fe..96b183e 100755
--- a/rhodecode_redmine.sh
+++ b/rhodecode_redmine.sh
@@ -66,9 +66,11 @@ done
 for i in `seq 0 $((nrepos-1))`; do
 	# === GET DATA FROM REDMINE MYSQL BASE ===
 	USERID=`mysql -h$REDMINE_MYSQL_HOSTNAME -u $REDMINE_MYSQL_USER -e "SELECT id
-	                                                               FROM $REDMINE_MYSQL_DBNAME.users
+	                                                               FROM $REDMINE_MYSQL_DBNAME.users,$REDMINE_MYSQL_DBNAME.email_addresses
 	                                                               WHERE users.status='1'
-	                                                                     AND users.mail='${repos_mails[$i]}'
+	                                                                     AND email_addresses.address='${repos_mails[$i]}'
+	                                                                     AND email_addresses.is_default='1'
+	                                                                     AND users.id=email_addresses.user_id
 	                                                                     AND users.type='User'" \
 	                                                               | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2`
 	[ "$USERID" == "" ] && continue