Changeset 7550

Timestamp:

Dec 11, 2018, 2:18:39 PM (4 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2140: Hql.sharedTo() generates incorrect HQL

File:

• branches/3.13-stable/src/core/net/sf/basedb/core/query/SharedToRestriction.java (modified) (4 diffs)

branches/3.13-stable/src/core/net/sf/basedb/core/query/SharedToRestriction.java

@@ -112 +112 @@
           sb.append("where " + users.toQl(query, dc));
           sb.append(")");
-          if (groups != null) sb.append(sharedTo ? " OR " : " AND ");
         }
         if (groups != null)
         {
+          if (users != null) sb.append(sharedTo ? " OR " : " AND ");
           sb.append(root).append(".itemKey ").append(sharedTo ? "IN (" : "NOT IN (");
           sb.append("select ik.id from GroupData grp JOIN grp.itemKeys ik ");
@@ -125 +125 @@
       if (projects != null)
       {
-        if (sb.length() > 0) sb.append(sharedTo ? " OR " : " AND ");
+        if (users != null || groups != null) sb.append(sharedTo ? " OR " : " AND ");
         sb.append("(");
         if (!sharedTo)
@@ -176 +176 @@
           sb.append("where " + users.toString());
           sb.append(")");
-          if (groups != null) sb.append(sharedTo ? " OR " : " AND ");
         }
         if (groups != null)
         {
+          if (users != null) sb.append(sharedTo ? " OR " : " AND ");
           sb.append("itemKey ").append(sharedTo ? "IN (" : "NOT IN (");
           sb.append("select ik.id from GroupData grp JOIN grp.itemKeys ik ");
@@ -189 +189 @@
       if (projects != null)
       {
-        if (sb.length() > 0) sb.append(sharedTo ? " OR " : " AND ");
+        if (users != null || groups != null) sb.append(sharedTo ? " OR " : " AND ");
         sb.append("(");
         if (!sharedTo)