Skip to content

Commit

Permalink
Ensure sqlx.In is compatible with latest PostgreSQL
Browse files Browse the repository at this point in the history
Bump version
  • Loading branch information
sauls8t committed Feb 12, 2019
1 parent 9504a8c commit ac84eaf
Show file tree
Hide file tree
Showing 5 changed files with 742 additions and 722 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ Integrations for embedding SaaS data within documents, zero add-on/marketplace f

## Latest Release

[Community Edition: v2.0.3](https://github.com/documize/community/releases)
[Community Edition: v2.0.4](https://github.com/documize/community/releases)

[Enterprise Edition: v2.0.3](https://documize.com/downloads)
[Enterprise Edition: v2.0.4](https://documize.com/downloads)

## OS support

Expand Down
24 changes: 22 additions & 2 deletions domain/user/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,23 @@ func (s Store) GetUsersForSpaces(ctx domain.RequestContext, spaces []string) (u
return
}

query, args, err := sqlx.In(s.Bind(`
// query, args, err := sqlx.In(s.Bind(`
// SELECT u.id, u.c_refid AS refid,
// u.c_firstname AS firstname, u.c_lastname AS lastname, u.c_email AS email,
// u.c_initials AS initials, u.c_globaladmin AS globaladmin,
// u.c_password AS password, u.c_salt AS salt, u.c_reset AS reset, u.c_lastversion AS lastversion,
// u.c_created AS created, u.c_revised AS revised,
// a.c_active AS active, a.c_editor AS editor, a.c_admin AS admin, a.c_users AS viewusers, a.c_analytics AS analytics
// FROM dmz_user u, dmz_user_account a
// WHERE a.c_orgid=? AND u.c_refid = a.c_userid AND a.c_active=true AND u.c_refid IN (
// SELECT c_whoid from dmz_permission WHERE c_orgid=? AND c_who='user' AND c_scope='object' AND c_location='space' AND c_refid IN(?)
// UNION ALL
// SELECT r.c_userid from dmz_group_member r LEFT JOIN dmz_permission p ON p.c_whoid=r.c_groupid WHERE p.c_orgid=? AND p.c_who='role' AND p.c_scope='object' AND p.c_location='space' AND p.c_refid IN(?)
// )
// ORDER BY u.c_firstname, u.c_lastname`),
// ctx.OrgID, ctx.OrgID, spaces, ctx.OrgID, spaces)

query, args, err := sqlx.In(`
SELECT u.id, u.c_refid AS refid,
u.c_firstname AS firstname, u.c_lastname AS lastname, u.c_email AS email,
u.c_initials AS initials, u.c_globaladmin AS globaladmin,
Expand All @@ -249,8 +265,12 @@ func (s Store) GetUsersForSpaces(ctx domain.RequestContext, spaces []string) (u
UNION ALL
SELECT r.c_userid from dmz_group_member r LEFT JOIN dmz_permission p ON p.c_whoid=r.c_groupid WHERE p.c_orgid=? AND p.c_who='role' AND p.c_scope='object' AND p.c_location='space' AND p.c_refid IN(?)
)
ORDER BY u.c_firstname, u.c_lastname`),
ORDER BY u.c_firstname, u.c_lastname`,
ctx.OrgID, ctx.OrgID, spaces, ctx.OrgID, spaces)
if err != nil {
err = errors.Wrap(err, fmt.Sprintf("GetUsersForSpaces IN query failed %s", ctx.UserID))
return
}

query = s.Runtime.Db.Rebind(query)
err = s.Runtime.Db.Select(&u, query, args...)
Expand Down
4 changes: 2 additions & 2 deletions edition/community.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ func main() {
rt.Product = domain.Product{}
rt.Product.Major = "2"
rt.Product.Minor = "0"
rt.Product.Patch = "3"
rt.Product.Revision = "190210120245"
rt.Product.Patch = "4"
rt.Product.Revision = "190211190723"
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
rt.Product.Edition = domain.CommunityEdition
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)
Expand Down
Loading

0 comments on commit ac84eaf

Please sign in to comment.