This is an automated email from the ASF dual-hosted git repository.
fmartelli pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new a6af009 [SYNCOPE-1416] removes null attr views
a6af009 is described below
commit a6af009915b5516a5744c773529ee336a1e61686
Author: fmartelli <[email protected]>
AuthorDate: Fri Dec 14 10:09:16 2018 +0100
[SYNCOPE-1416] removes null attr views
---
.../core/persistence/jpa/dao/JPAAnySearchDAO.java | 84 ++++++++++++++++++----
core/persistence-jpa/src/main/resources/views.xml | 42 -----------
.../core/persistence/jpa/inner/AnySearchTest.java | 23 ++++++
.../src/main/resources/postgres/views.xml | 42 -----------
.../src/main/resources/sqlserver/views.xml | 42 -----------
.../org/apache/syncope/fit/core/SearchITCase.java | 12 ++++
6 files changed, 106 insertions(+), 139 deletions(-)
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
index c9b3c87..1fcd907 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
@@ -127,7 +127,10 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO {
Pair<String, Set<String>> filter = getAdminRealmsFilter(adminRealms,
svs, parameters);
// 1. get the query string from the search condition
- StringBuilder queryString = getQuery(buildEffectiveCond(cond,
filter.getRight()), parameters, svs);
+ Pair<StringBuilder, Set<String>> queryInfo =
+ getQuery(buildEffectiveCond(cond, filter.getRight()),
parameters, svs);
+
+ StringBuilder queryString = queryInfo.getLeft();
// 2. take into account administrative realms
queryString.insert(0, "SELECT u.any_id FROM (");
@@ -161,16 +164,19 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO
{
Pair<String, Set<String>> filter =
getAdminRealmsFilter(adminRealms, svs, parameters);
// 1. get the query string from the search condition
- StringBuilder queryString = getQuery(buildEffectiveCond(cond,
filter.getRight()), parameters, svs);
+ Pair<StringBuilder, Set<String>> queryInfo =
getQuery(buildEffectiveCond(cond, filter.getRight()),
+ parameters, svs);
+
+ StringBuilder queryString = queryInfo.getLeft();
// 2. take into account realms and ordering
OrderBySupport obs = parseOrderBy(kind, svs, orderBy);
if (queryString.charAt(0) == '(') {
queryString.insert(0, buildSelect(obs));
- queryString.append(buildWhere(svs, obs));
+ queryString.append(buildWhere(svs, queryInfo.getRight(), obs));
} else {
queryString.insert(0, buildSelect(obs).append('('));
- queryString.append(')').append(buildWhere(svs, obs));
+ queryString.append(')').append(buildWhere(svs,
queryInfo.getRight(), obs));
}
queryString.
append(filter.getLeft()).
@@ -233,15 +239,48 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO
{
return select;
}
- private StringBuilder buildWhere(final SearchSupport svs, final
OrderBySupport obs) {
+ private StringBuilder buildWhere(
+ final SearchSupport svs, final Set<String> involvedPlainAttrs,
final OrderBySupport obs) {
+
+ Set<String> attrs = new HashSet<>(involvedPlainAttrs);
+ for (OrderBySupport.Item item : obs.items) {
+ attrs.add(item.orderBy.substring(0, item.orderBy.indexOf(" ")));
+ }
+
StringBuilder where = new StringBuilder(" u");
+
for (SearchSupport.SearchView searchView : obs.views) {
where.append(',');
if (searchView.name.equals(svs.attr().name)) {
+ StringBuilder attrWhere = new StringBuilder();
+ StringBuilder nullAttrWhere = new StringBuilder();
+
where.append(" (SELECT * FROM ").append(searchView.name);
if (svs.nonMandatorySchemas || obs.nonMandatorySchemas) {
- where.append(" UNION SELECT * FROM
").append(svs.nullAttr().name);
+ for (String field : attrs) {
+ if (attrWhere.length() == 0) {
+ attrWhere.append(" WHERE
schema_id='").append(field).append("'");
+ } else {
+ attrWhere.append(" OR
").append("schema_id='").append(field).append("'");
+ }
+
+ nullAttrWhere.append(" UNION SELECT any_id, ").
+ append("'").
+ append(field).
+ append("' AS schema_id, ").
+ append("null AS booleanvalue, ").
+ append("null AS datevalue, ").
+ append("null AS doublevalue, ").
+ append("null AS longvalue, ").
+ append("null AS stringvalue FROM
").append(svs.field().name).
+ append(" WHERE ").
+ append("any_id NOT IN (").
+ append("SELECT any_id FROM ").
+ append(svs.attr().name).append('
').append(searchView.alias).
+ append(" WHERE
").append("schema_id='").append(field).append("')");
+ }
+ where.append(attrWhere).append(nullAttrWhere);
}
where.append(')');
@@ -342,8 +381,10 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO {
return obs;
}
- private StringBuilder getQuery(final SearchCond cond, final List<Object>
parameters, final SearchSupport svs) {
+ private Pair<StringBuilder, Set<String>> getQuery(
+ final SearchCond cond, final List<Object> parameters, final
SearchSupport svs) {
StringBuilder query = new StringBuilder();
+ Set<String> involvedAttributes = new HashSet<>();
switch (cond.getType()) {
case LEAF:
@@ -383,6 +424,11 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO {
} else if (cond.getAttributeCond() != null) {
query.append(getQuery(cond.getAttributeCond(),
cond.getType() == SearchCond.Type.NOT_LEAF,
parameters, svs));
+ try {
+ involvedAttributes.add(check(cond.getAttributeCond(),
svs.anyTypeKind).getLeft().getKey());
+ } catch (IllegalArgumentException e) {
+ // ignore
+ }
} else if (cond.getAnyCond() != null) {
query.append(getQuery(cond.getAnyCond(),
cond.getType() == SearchCond.Type.NOT_LEAF,
parameters, svs));
@@ -390,29 +436,41 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO
{
break;
case AND:
- String andSubQuery = getQuery(cond.getLeftSearchCond(),
parameters, svs).toString();
+ Pair<StringBuilder, Set<String>> leftAndInfo =
getQuery(cond.getLeftSearchCond(), parameters, svs);
+ involvedAttributes.addAll(leftAndInfo.getRight());
+
+ Pair<StringBuilder, Set<String>> rigthAndInfo =
getQuery(cond.getRightSearchCond(), parameters, svs);
+ involvedAttributes.addAll(rigthAndInfo.getRight());
+
+ String andSubQuery = leftAndInfo.getKey().toString();
// Add extra parentheses
andSubQuery = andSubQuery.replaceFirst("WHERE ", "WHERE (");
query.append(andSubQuery).
append(" AND any_id IN ( ").
- append(getQuery(cond.getRightSearchCond(), parameters,
svs)).
+ append(rigthAndInfo.getKey()).
append("))");
break;
case OR:
- String orSubQuery = getQuery(cond.getLeftSearchCond(),
parameters, svs).toString();
+ Pair<StringBuilder, Set<String>> leftOrInfo =
getQuery(cond.getLeftSearchCond(), parameters, svs);
+ involvedAttributes.addAll(leftOrInfo.getRight());
+
+ Pair<StringBuilder, Set<String>> rigthOrInfo =
getQuery(cond.getRightSearchCond(), parameters, svs);
+ involvedAttributes.addAll(rigthOrInfo.getRight());
+
+ String orSubQuery = leftOrInfo.getKey().toString();
// Add extra parentheses
orSubQuery = orSubQuery.replaceFirst("WHERE ", "WHERE (");
query.append(orSubQuery).
append(" OR any_id IN ( ").
- append(getQuery(cond.getRightSearchCond(), parameters,
svs)).
+ append(rigthOrInfo.getKey()).
append("))");
break;
default:
}
- return query;
+ return Pair.of(query, involvedAttributes);
}
private String getQuery(
@@ -731,7 +789,7 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO {
} else {
query.append('=');
}
- if ((schema.getType() == AttrSchemaType.String
+ if ((schema.getType() == AttrSchemaType.String
|| schema.getType() == AttrSchemaType.Enum) &&
ignoreCase) {
query.append("LOWER(?").append(setParameter(parameters,
attrValue.getValue())).append(')');
} else {
diff --git a/core/persistence-jpa/src/main/resources/views.xml
b/core/persistence-jpa/src/main/resources/views.xml
index 88b4bb8..255f795 100644
--- a/core/persistence-jpa/src/main/resources/views.xml
+++ b/core/persistence-jpa/src/main/resources/views.xml
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- CREATE VIEW user_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- NULL AS datevalue,
- NULL AS doublevalue,
- NULL AS longvalue,
- NULL AS stringvalue
- FROM SyncopeUser u CROSS JOIN PlainSchema
- LEFT OUTER JOIN UPlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -157,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- NULL AS datevalue,
- NULL AS doublevalue,
- NULL AS longvalue,
- NULL AS stringvalue
- FROM AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -230,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- NULL AS datevalue,
- NULL AS doublevalue,
- NULL AS longvalue,
- NULL AS stringvalue
- FROM SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
index 1ba9913..6c9f1df 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
@@ -781,4 +781,27 @@ public class AnySearchTest extends AbstractTest {
AnyTypeKind.USER);
assertFalse(users.isEmpty());
}
+
+ @Test
+ public void issueSYNCOPE1416() {
+ AttributeCond idLeftCond = new
AttributeCond(AttributeCond.Type.ISNOTNULL);
+ idLeftCond.setSchema("surname");
+
+ AttributeCond idRightCond = new
AttributeCond(AttributeCond.Type.ISNOTNULL);
+ idRightCond.setSchema("firstname");
+
+ SearchCond searchCondition = SearchCond.getAndCond(
+ SearchCond.getLeafCond(idLeftCond),
SearchCond.getLeafCond(idRightCond));
+
+ List<OrderByClause> orderByClauses = new ArrayList<>();
+ OrderByClause orderByClause = new OrderByClause();
+ orderByClause.setField("ctype");
+ orderByClause.setDirection(OrderByClause.Direction.ASC);
+ orderByClauses.add(orderByClause);
+
+ List<User> users = searchDAO.search(searchCondition, orderByClauses,
AnyTypeKind.USER);
+ assertEquals(
+ searchDAO.count(SyncopeConstants.FULL_ADMIN_REALMS,
searchCondition, AnyTypeKind.USER),
+ users.size());
+ }
}
diff --git a/fit/core-reference/src/main/resources/postgres/views.xml
b/fit/core-reference/src/main/resources/postgres/views.xml
index 1427872..255f795 100644
--- a/fit/core-reference/src/main/resources/postgres/views.xml
+++ b/fit/core-reference/src/main/resources/postgres/views.xml
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- CREATE VIEW user_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL::int4 AS booleanvalue,
- NULL::timestamp AS datevalue,
- NULL::float8 AS doublevalue,
- NULL::int8 AS longvalue,
- NULL AS stringvalue
- FROM SyncopeUser u CROSS JOIN PlainSchema
- LEFT OUTER JOIN UPlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -157,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL::int4 AS booleanvalue,
- NULL::timestamp AS datevalue,
- NULL::float8 AS doublevalue,
- NULL::int8 AS longvalue,
- NULL AS stringvalue
- FROM AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -230,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL::int4 AS booleanvalue,
- NULL::timestamp AS datevalue,
- NULL::float8 AS doublevalue,
- NULL::int8 AS longvalue,
- NULL AS stringvalue
- FROM SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS
diff --git a/fit/core-reference/src/main/resources/sqlserver/views.xml
b/fit/core-reference/src/main/resources/sqlserver/views.xml
index 32d48df..255f795 100644
--- a/fit/core-reference/src/main/resources/sqlserver/views.xml
+++ b/fit/core-reference/src/main/resources/sqlserver/views.xml
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- CREATE VIEW user_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- CAST (NULL AS DATETIME2) datevalue,
- CAST (NULL AS FLOAT) doublevalue,
- CAST (NULL AS BIGINT) longvalue,
- CAST (NULL AS VARCHAR(255)) AS stringvalue
- FROM SyncopeUser u CROSS JOIN PlainSchema
- LEFT OUTER JOIN UPlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -157,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- CAST (NULL AS DATETIME2) datevalue,
- CAST (NULL AS FLOAT) doublevalue,
- CAST (NULL AS BIGINT) longvalue,
- CAST (NULL AS VARCHAR(255)) AS stringvalue
- FROM AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -230,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- CAST (NULL AS DATETIME2) datevalue,
- CAST (NULL AS FLOAT) doublevalue,
- CAST (NULL AS BIGINT) longvalue,
- CAST (NULL AS VARCHAR(255)) AS stringvalue
- FROM SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND
ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
index 7c3e96a..54b81f4 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
@@ -36,6 +36,7 @@ import org.apache.syncope.common.lib.patch.AnyObjectPatch;
import org.apache.syncope.common.lib.patch.AttrPatch;
import org.apache.syncope.common.lib.patch.MembershipPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
+import org.apache.syncope.common.lib.search.SpecialAttr;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTypeTO;
import org.apache.syncope.common.lib.to.PagedResult;
@@ -305,6 +306,17 @@ public class SearchITCase extends AbstractITCase {
and("username").equalTo("bellini").query()).
build());
assertEquals(users, issueSYNCOPE1321);
+
+ // SYNCOPE-1416 (check the search for attributes of type different
from stringvalue)
+ PagedResult<UserTO> issueSYNCOPE1416 = userService.search(new
AnyQuery.Builder().
+ realm(SyncopeConstants.ROOT_REALM).
+ fiql(SyncopeClient.getUserSearchConditionBuilder().
+ is("loginDate").lexicalNotBefore("2009-05-26").
+ and("username").equalTo("rossini").query()).
+
orderBy(SyncopeClient.getOrderByClauseBuilder().asc("loginDate").build()).
+ build());
+ assertEquals(1, issueSYNCOPE1416.getSize());
+ assertEquals("rossini",
issueSYNCOPE1416.getResult().get(0).getUsername());
}
@Test