Skip to content

The Unified and Autonomous Development Platform

Add "Depends On" and "Dependencies Of" criteria for build query

Robin Shen777e47f482c8
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 461790d405..a521d0ca1a 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -14,6 +14,7 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -143,23 +144,22 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
EntityCriteria<Build> criteria = newCriteria();
- if (term == null)
- term = "";
-
- if (term.startsWith("#")) {
- term = term.substring(1);
- try {
- long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq("number", buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.ilike("version", "%#" + term + "%"));
- }
- } else {
- try {
- long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq("number", buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.ilike("version", "%" + term + "%"));
+ if (StringUtils.isNotBlank(term)) {
+ if (term.startsWith("#")) {
+ term = term.substring(1);
+ try {
+ long buildNumber = Long.parseLong(term);
+ criteria.add(Restrictions.eq("number", buildNumber));
+ } catch (NumberFormatException e) {
+ criteria.add(Restrictions.ilike("version", "%#" + term + "%"));
+ }
+ } else {
+ try {
+ long buildNumber = Long.parseLong(term);
+ criteria.add(Restrictions.eq("number", buildNumber));
+ } catch (NumberFormatException e) {
+ criteria.add(Restrictions.ilike("version", "%" + term + "%"));
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index eb9521b7b1..22ff27f73c 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -18,6 +18,7 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -146,11 +147,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
orders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));
} else {
Join<Issue, IssueFieldEntity> join = root.join(IssueConstants.ATTR_FIELD_ENTITIES, JoinType.LEFT);
- join.on(builder.equal(join.get(IssueFieldEntity.FIELD_ATTR_NAME), sort.getField()));
+ join.on(builder.equal(join.get(IssueFieldEntity.ATTR_NAME), sort.getField()));
if (sort.getDirection() == Direction.ASCENDING)
- orders.add(builder.asc(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL)));
+ orders.add(builder.asc(join.get(IssueFieldEntity.ATTR_ORDINAL)));
else
- orders.add(builder.desc(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL)));
+ orders.add(builder.desc(join.get(IssueFieldEntity.ATTR_ORDINAL)));
}
}
@@ -282,27 +283,26 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
EntityCriteria<Issue> criteria = newCriteria();
- if (term == null)
- term = "";
-
- if (term.startsWith("#")) {
- term = term.substring(1);
- try {
- long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq("number", buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.or(
- Restrictions.ilike("title", "%#" + term + "%"),
- Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));
- }
- } else {
- try {
- long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq("number", buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.or(
- Restrictions.ilike("title", "%" + term + "%"),
- Restrictions.ilike("noSpaceTitle", "%" + term + "%")));
+ if (StringUtils.isNotBlank(term)) {
+ if (term.startsWith("#")) {
+ term = term.substring(1);
+ try {
+ long buildNumber = Long.parseLong(term);
+ criteria.add(Restrictions.eq("number", buildNumber));
+ } catch (NumberFormatException e) {
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("title", "%#" + term + "%"),
+ Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));
+ }
+ } else {
+ try {
+ long buildNumber = Long.parseLong(term);
+ criteria.add(Restrictions.eq("number", buildNumber));
+ } catch (NumberFormatException e) {
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("title", "%" + term + "%"),
+ Restrictions.ilike("noSpaceTitle", "%" + term + "%")));
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 544bcd8eee..60e6c7e313 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -1039,27 +1039,26 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
EntityCriteria<PullRequest> criteria = newCriteria();
- if (term == null)
- term = "";
-
- if (term.startsWith("#")) {
- term = term.substring(1);
- try {
- long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq("number", buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.or(
- Restrictions.ilike("title", "%#" + term + "%"),
- Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));
- }
- } else {
- try {
- long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq("number", buildNumber));
- } catch (NumberFormatException e) {
- criteria.add(Restrictions.or(
- Restrictions.ilike("title", "%" + term + "%"),
- Restrictions.ilike("noSpaceTitle", "%" + term + "%")));
+ if (StringUtils.isNotBlank(term)) {
+ if (term.startsWith("#")) {
+ term = term.substring(1);
+ try {
+ long buildNumber = Long.parseLong(term);
+ criteria.add(Restrictions.eq("number", buildNumber));
+ } catch (NumberFormatException e) {
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("title", "%#" + term + "%"),
+ Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));
+ }
+ } else {
+ try {
+ long buildNumber = Long.parseLong(term);
+ criteria.add(Restrictions.eq("number", buildNumber));
+ } catch (NumberFormatException e) {
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("title", "%" + term + "%"),
+ Restrictions.ilike("noSpaceTitle", "%" + term + "%")));
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/model/BuildDependence.java b/core/src/main/java/io/onedev/server/model/BuildDependence.java
index e068a9a73c..2e766e4c02 100644
--- a/core/src/main/java/io/onedev/server/model/BuildDependence.java
+++ b/core/src/main/java/io/onedev/server/model/BuildDependence.java
@@ -16,6 +16,10 @@ import javax.persistence.UniqueConstraint;
public class BuildDependence extends AbstractEntity {
private static final long serialVersionUID = 1L;
+
+ public static final String ATTR_DEPENDENT = "dependent";
+
+ public static final String ATTR_DEPENDENCY = "dependency";
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
diff --git a/core/src/main/java/io/onedev/server/model/BuildParam.java b/core/src/main/java/io/onedev/server/model/BuildParam.java
index bf58da3829..0b317b9b7a 100644
--- a/core/src/main/java/io/onedev/server/model/BuildParam.java
+++ b/core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -17,9 +17,9 @@ public class BuildParam extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public static final String FIELD_ATTR_NAME = "name";
+ public static final String ATTR_NAME = "name";
- public static final String FIELD_ATTR_VALUE = "value";
+ public static final String ATTR_VALUE = "value";
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java b/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java
index d00110da64..d239550bd8 100644
--- a/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java
+++ b/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java
@@ -19,11 +19,11 @@ public class IssueFieldEntity extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public static final String FIELD_ATTR_NAME = "name";
+ public static final String ATTR_NAME = "name";
- public static final String FIELD_ATTR_VALUE = "value";
+ public static final String ATTR_VALUE = "value";
- public static final String FIELD_ATTR_ORDINAL = "ordinal";
+ public static final String ATTR_ORDINAL = "ordinal";
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 612093e674..153f1e641c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -100,6 +100,8 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
}
public static Build getBuild(Project project, String number) {
+ if (number.startsWith("#"))
+ number = number.substring(1);
Build build = OneDev.getInstance(BuildManager.class).find(project, getLongValue(number));
if (build != null)
return build;
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index 8762a15ff3..396caa59a9 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -8,7 +8,7 @@ query
criteria
: operator=(Successful|Failed|InError|Cancelled|Running|Waiting|Queueing|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria
- | operator=(FixedIssue|SubmittedBy|CancelledBy) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
@@ -72,6 +72,14 @@ CancelledBy
: 'cancelled' WS+ 'by'
;
+DependsOn
+ : 'depends' WS+ 'on'
+ ;
+
+DependenciesOf
+ : 'dependencies' WS+ 'of'
+ ;
+
FixedIssue
: 'fixed' WS+ 'issue'
;
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index e3679831f6..e8e127e7c5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -134,6 +134,10 @@ public class BuildQuery extends EntityQuery<Build> {
return new CancelledByCriteria(getUser(value), value);
} else if (ctx.FixedIssue() != null) {
return new FixedIssueCriteria(getIssue(project, value));
+ } else if (ctx.DependsOn() != null) {
+ return new DependsOnCriteria(getBuild(project, value));
+ } else if (ctx.DependenciesOf() != null) {
+ return new DependenciesOfCriteria(getBuild(project, value));
} else {
throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java
index adf6d00504..bf2f4149ae 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQueryBuildContext.java
@@ -18,9 +18,16 @@ public class BuildQueryBuildContext extends QueryBuildContext<Build> {
@Override
public Join<?, ?> newJoin(String joinName) {
- Join<Build, ?> join = getRoot().join(BuildConstants.ATTR_PARAMS, JoinType.LEFT);
- join.on(getBuilder().equal(join.get(BuildParam.FIELD_ATTR_NAME), joinName));
- return join;
- }
+ switch (joinName) {
+ case BuildConstants.FIELD_DEPENDENCIES:
+ return getRoot().join(BuildConstants.ATTR_DEPENDENCIES, JoinType.LEFT);
+ case BuildConstants.FIELD_DEPENDENTS:
+ return getRoot().join(BuildConstants.ATTR_DEPENDENTS, JoinType.LEFT);
+ default:
+ Join<Build, ?> join = getRoot().join(BuildConstants.ATTR_PARAMS, JoinType.LEFT);
+ join.on(getBuilder().equal(join.get(BuildParam.ATTR_NAME), joinName));
+ return join;
+ }
+ }
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
new file mode 100644
index 0000000000..49263d57b5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
@@ -0,0 +1,49 @@
+package io.onedev.server.search.entity.build;
+
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildDependence;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
+
+public class DependenciesOfCriteria extends EntityCriteria<Build> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Build value;
+
+ public DependenciesOfCriteria(Build value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
+ From<?, ?> join = context.getJoin(BuildConstants.FIELD_DEPENDENTS);
+ return context.getBuilder().equal(join.get(BuildDependence.ATTR_DEPENDENT), value);
+ }
+
+ @Override
+ public boolean matches(Build build, User user) {
+ for (BuildDependence dependence: value.getDependencies()) {
+ if (dependence.getDependency().equals(build))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf) + " " + BuildQuery.quote("#" + value.getNumber());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
new file mode 100644
index 0000000000..86d94187da
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
@@ -0,0 +1,49 @@
+package io.onedev.server.search.entity.build;
+
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildDependence;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
+
+public class DependsOnCriteria extends EntityCriteria<Build> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Build value;
+
+ public DependsOnCriteria(Build value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
+ From<?, ?> join = context.getJoin(BuildConstants.FIELD_DEPENDENCIES);
+ return context.getBuilder().equal(join.get(BuildDependence.ATTR_DEPENDENCY), value);
+ }
+
+ @Override
+ public boolean matches(Build build, User user) {
+ for (BuildDependence dependence: value.getDependents()) {
+ if (dependence.getDependent().equals(build))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return BuildQuery.getRuleName(BuildQueryLexer.DependsOn) + " " + BuildQuery.quote("#" + value.getNumber());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
index a5d11b7c06..b5327c10be 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
@@ -28,7 +28,7 @@ public class ParamCriteria extends EntityCriteria<Build> {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Build> context, User user) {
From<?, ?> join = context.getJoin(name);
- return context.getBuilder().equal(join.get(BuildParam.FIELD_ATTR_VALUE), value);
+ return context.getBuilder().equal(join.get(BuildParam.ATTR_VALUE), value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
index 520858a976..abf5d8611c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
@@ -25,7 +25,7 @@ public class BooleanFieldCriteria extends FieldCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_VALUE);
+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_VALUE);
return context.getBuilder().equal(attribute, String.valueOf(value));
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index 8ccfe91bbe..3213927fff 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -46,14 +46,14 @@ public class ChoiceFieldCriteria extends FieldCriteria {
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
From<?, ?> join = context.getJoin(getFieldName());
if (allowMultiple) {
- return context.getBuilder().equal(join.get(IssueFieldEntity.FIELD_ATTR_VALUE), value);
+ return context.getBuilder().equal(join.get(IssueFieldEntity.ATTR_VALUE), value);
} else {
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(join.get(IssueFieldEntity.FIELD_ATTR_VALUE), value);
+ return context.getBuilder().equal(join.get(IssueFieldEntity.ATTR_VALUE), value);
else if (operator == IssueQueryLexer.IsGreaterThan)
- return context.getBuilder().greaterThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), ordinal);
+ return context.getBuilder().greaterThan(join.get(IssueFieldEntity.ATTR_ORDINAL), ordinal);
else
- return context.getBuilder().lessThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), ordinal);
+ return context.getBuilder().lessThan(join.get(IssueFieldEntity.ATTR_ORDINAL), ordinal);
}
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
index 2c0cc3b186..02d6957b17 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
@@ -32,9 +32,9 @@ public class DateFieldCriteria extends FieldCriteria {
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
From<?, ?> join = context.getJoin(getFieldName());
if (operator == IssueQueryLexer.IsBefore)
- return context.getBuilder().lessThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), value.getTime());
+ return context.getBuilder().lessThan(join.get(IssueFieldEntity.ATTR_ORDINAL), value.getTime());
else
- return context.getBuilder().greaterThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), value.getTime());
+ return context.getBuilder().greaterThan(join.get(IssueFieldEntity.ATTR_ORDINAL), value.getTime());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index 6465beb372..26f525152e 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -26,7 +26,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_VALUE);
+ Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_VALUE);
if (operator == IssueQueryLexer.IsEmpty)
return context.getBuilder().isNull(attribute);
else
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
index 5e867d7fc7..b7adb27693 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
@@ -25,7 +25,7 @@ public class IssueQueryBuildContext extends QueryBuildContext<Issue> {
return getRoot().join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT);
default:
Join<Issue, ?> join = getRoot().join(IssueConstants.ATTR_FIELD_ENTITIES, JoinType.LEFT);
- join.on(getBuilder().equal(join.get(IssueFieldEntity.FIELD_ATTR_NAME), joinName));
+ join.on(getBuilder().equal(join.get(IssueFieldEntity.ATTR_NAME), joinName));
return join;
}
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java
index 4d92b4b8ad..9df616418c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java
@@ -28,7 +28,7 @@ public class NumberFieldCriteria extends FieldCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_ORDINAL);
+ Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_ORDINAL);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(attribute, value);
else if (operator == IssueQueryLexer.IsGreaterThan)
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
index 0bcbc58d5f..02d6266d04 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java
@@ -24,7 +24,7 @@ public class ReferenceableFieldCriteria extends FieldCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_ORDINAL);
+ Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_ORDINAL);
return context.getBuilder().equal(attribute, value);
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
index 6c93893ecb..f2aee1eb28 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
@@ -31,7 +31,7 @@ public class StringFieldCriteria extends FieldCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {
- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_VALUE);
+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.ATTR_VALUE);
if (operator == IssueQueryLexer.Is)
return context.getBuilder().equal(context.getBuilder().lower(attribute), value.toLowerCase());
else
diff --git a/core/src/main/java/io/onedev/server/util/BuildConstants.java b/core/src/main/java/io/onedev/server/util/BuildConstants.java
index 8aa3a18c3c..79a3036089 100644
--- a/core/src/main/java/io/onedev/server/util/BuildConstants.java
+++ b/core/src/main/java/io/onedev/server/util/BuildConstants.java
@@ -63,10 +63,18 @@ public class BuildConstants {
public static final String ATTR_PARAMS = "params";
+ public static final String FIELD_DEPENDENCIES = "Dependencies";
+
+ public static final String ATTR_DEPENDENCIES = "dependencies";
+
+ public static final String FIELD_DEPENDENTS = "Dependents";
+
+ public static final String ATTR_DEPENDENTS = "dependents";
+
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,
FIELD_SUBMIT_DATE, FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,
- FIELD_COMMIT, FIELD_PROJECT, FIELD_VERSION);
+ FIELD_COMMIT, FIELD_PROJECT, FIELD_VERSION, FIELD_DEPENDENCIES, FIELD_DEPENDENTS);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,
diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 061af7f766..fc7bef6697 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -95,6 +95,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (fieldElements.isEmpty()) {
if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy)
suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
+ else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf)
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));
else
suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, unfencedLowerCaseMatchWith)));
} else {