mirror of
https://github.com/documize/community.git
synced 2025-07-19 13:19:43 +02:00
Ensure sqlx.In is compatible with latest PostgreSQL
Bump version
This commit is contained in:
parent
9504a8cf6c
commit
ac84eaf85d
5 changed files with 749 additions and 729 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
@ -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...)
|
||||
|
|
|
@ -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)
|
||||
|
|
1444
embed/bindata.go
1444
embed/bindata.go
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "documize",
|
||||
"version": "2.0.3",
|
||||
"version": "2.0.4",
|
||||
"description": "The Document IDE",
|
||||
"repository": "",
|
||||
"license": "AGPL",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue