kolan
/
Redmine-Integration
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Redmine 3.0: users.email -> email_addresses.address.

This commit is contained in:
Kolan Sh 2015-09-11 21:45:28 +03:00
parent 4e9f85f9e1
commit 8f35bfdc9a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitorious_redmine.sh
View File

@ -54,6 +54,7 @@ REDMINE_ID_GITORIOUS_REPO=`mysql --default-character-set=utf8 -h$MYSQL_HOSTNAME
$REDMINE_MYSQL_DBNAME.projects, $REDMINE_MYSQL_DBNAME.projects,
$REDMINE_MYSQL_DBNAME.roles, $REDMINE_MYSQL_DBNAME.roles,
$REDMINE_MYSQL_DBNAME.users, $REDMINE_MYSQL_DBNAME.users,
$REDMINE_MYSQL_DBNAME.email_addresses,
$GITORIOUS_MYSQL_DBNAME.repositories, $GITORIOUS_MYSQL_DBNAME.repositories,
$GITORIOUS_MYSQL_DBNAME.roles, $GITORIOUS_MYSQL_DBNAME.roles,
$GITORIOUS_MYSQL_DBNAME.users $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.members.project_id=$REDMINE_MYSQL_DBNAME.projects.id
AND $REDMINE_MYSQL_DBNAME.projects.name=$GITORIOUS_MYSQL_DBNAME.repositories.name AND $REDMINE_MYSQL_DBNAME.projects.name=$GITORIOUS_MYSQL_DBNAME.repositories.name
AND $REDMINE_MYSQL_DBNAME.users.type='User' 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 $REDMINE_MYSQL_DBNAME.roles.name IN ($roles_mysql_string)
AND $GITORIOUS_MYSQL_DBNAME.repositories.user_id=$GITORIOUS_MYSQL_DBNAME.users.id;" \ AND $GITORIOUS_MYSQL_DBNAME.repositories.user_id=$GITORIOUS_MYSQL_DBNAME.users.id;" \
| grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+3` | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+3`

6
rhodecode_redmine.sh
View File

@ -66,9 +66,11 @@ done
for i in `seq 0 $((nrepos-1))`; do for i in `seq 0 $((nrepos-1))`; do
# === GET DATA FROM REDMINE MYSQL BASE === # === GET DATA FROM REDMINE MYSQL BASE ===
USERID=`mysql -h$REDMINE_MYSQL_HOSTNAME -u $REDMINE_MYSQL_USER -e "SELECT id 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' 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'" \ AND users.type='User'" \
| grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2` | grep -v tables_col|xargs|sed "s/ /\n/g"|tail -n+2`
[ "$USERID" == "" ] && continue [ "$USERID" == "" ] && continue