diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
| commit | a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e (patch) | |
| tree | 985cb699d278f68522b08b60b1e7b84e0bd243fc /store/sqlstore/compliance_store.go | |
| parent | 7941c30117efe1b957ac0458c2f0479e3824196d (diff) | |
| parent | 7bd298ceaa24c0721e0acd65692cb2d1ca4983f3 (diff) | |
| download | chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.gz chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.bz2 chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'store/sqlstore/compliance_store.go')
| -rw-r--r-- | store/sqlstore/compliance_store.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/store/sqlstore/compliance_store.go b/store/sqlstore/compliance_store.go index a25b01548..03d92d5e1 100644 --- a/store/sqlstore/compliance_store.go +++ b/store/sqlstore/compliance_store.go @@ -225,7 +225,8 @@ func (s SqlComplianceStore) MessageExport(after int64, limit int) store.StoreCha Channels.Id AS ChannelId, Channels.DisplayName AS ChannelDisplayName, Users.Id AS UserId, - Users.Email AS UserEmail + Users.Email AS UserEmail, + Users.Username FROM Posts LEFT OUTER JOIN Channels ON Posts.ChannelId = Channels.Id |