community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #672 from harshanL/cloud-3.1.0

Browse Source 
Fix for Advanced Search Issue #670
This commit is contained in:
Kamidu Sachith Punchihewa 2017-03-28 13:54:13 +05:30 committed by GitHub
commit 75bcc720d6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
View File

@ -35,6 +35,7 @@ public class QueryBuilderImpl implements QueryBuilder {
private static final Log log = LogFactory.getLog(QueryBuilderImpl.class); private static final Log log = LogFactory.getLog(QueryBuilderImpl.class);
private final String WILDCARD_OPERATOR = "%"; private final String WILDCARD_OPERATOR = "%";
private final String OR_OPERATOR = "OR";
private String current_username; private String current_username;
private boolean isDeviceAdminUser; private boolean isDeviceAdminUser;
@ -131,7 +132,7 @@ public class QueryBuilderImpl implements QueryBuilder {
for (Condition con : conditions) { for (Condition con : conditions) {
if (Utils.checkDeviceDetailsColumns(con.getKey())) { if (Utils.checkDeviceDetailsColumns(con.getKey())) {
if (con.operator.equals(WILDCARD_OPERATOR)) { if (con.operator.equals(WILDCARD_OPERATOR)) {
querySuffix = querySuffix + " OR DD." + Utils.getDeviceDetailsColumnNames().get(con.getKey()) querySuffix = querySuffix + " AND DD." + Utils.getDeviceDetailsColumnNames().get(con.getKey())
+ " LIKE ? "; + " LIKE ? ";
ValueType type = new ValueType(); ValueType type = new ValueType();
type.setColumnType(ValueType.columnType.STRING); type.setColumnType(ValueType.columnType.STRING);
@ -215,6 +216,11 @@ public class QueryBuilderImpl implements QueryBuilder {
} catch (Exception e) { } catch (Exception e) {
throw new InvalidOperatorException("Error occurred while building the sql", e); throw new InvalidOperatorException("Error occurred while building the sql", e);
} }
if (!querySuffix.isEmpty()) {
//Replacing the first OR operator as it's unnecessary
querySuffix = querySuffix.replaceFirst(OR_OPERATOR, "");
querySuffix = " AND (" + querySuffix + ")";
}
return querySuffix; return querySuffix;
} }