Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2020-03-29 05:52:20 +0000
committerRyan D. Brooks2020-12-15 20:59:18 +0000
commitc11c3c3661d2b72c189fff4f64c1f4a5857ee327 (patch)
tree100e8688044d07207ab758c4dd3cad54ced0e31d /plugins
parent0cf35187a12a4edcd5abcb03df99e6277ade3cad (diff)
downloadorg.eclipse.osee-c11c3c3661d2b72c189fff4f64c1f4a5857ee327.tar.gz
org.eclipse.osee-c11c3c3661d2b72c189fff4f64c1f4a5857ee327.tar.xz
org.eclipse.osee-c11c3c3661d2b72c189fff4f64c1f4a5857ee327.zip
feature: Add search support for new relation type
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/FollowRelationSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeNotExistsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java13
8 files changed, 20 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/FollowRelationSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/FollowRelationSqlHandler.java
index 239ad401ce7..c7e3555d675 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/FollowRelationSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/FollowRelationSqlHandler.java
@@ -52,7 +52,7 @@ public class FollowRelationSqlHandler extends SqlHandler<CriteriaRelationTypeFol
if (sourceArtTable != null) {
writer.addTable(sourceArtTable);
}
- relAlias = writer.addTable(SqlTable.RELATION_TABLE);
+ relAlias = writer.addTable(criteria.getType());
relTxsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
index 6c7a90ee767..fea3612670e 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
@@ -79,7 +79,7 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo> {
if (criteria.hasMultipleIds()) {
jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE);
}
- relAlias = writer.addTable(SqlTable.RELATION_TABLE);
+ relAlias = writer.addTable(criteria.getType());
txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
index 855d6068758..f0bc2fac360 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
@@ -30,7 +30,7 @@ public class RelationTypeExistsSqlHandler extends AbstractRelationSqlHandler<Cri
@Override
public void addTables(AbstractSqlWriter writer) {
super.addTables(writer);
- relAlias = writer.addTable(SqlTable.RELATION_TABLE);
+ relAlias = writer.addTable(criteria.getType());
txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java
index 684e6a9deea..af658cdd6c7 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeFollowSqlHandler.java
@@ -54,7 +54,7 @@ public class RelationTypeFollowSqlHandler extends SqlHandler<CriteriaRelationTyp
} else {
artAlias0 = artAliases.iterator().next();
}
- relAlias1 = writer.addTable(SqlTable.RELATION_TABLE);
+ relAlias1 = writer.addTable(criteria.getType());
txsAlias1 = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION);
String branchAlias = writer.getFirstAlias(SqlTable.BRANCH_TABLE);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeNotExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeNotExistsSqlHandler.java
index 5dbb24adc88..10d42b5d74e 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeNotExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeNotExistsSqlHandler.java
@@ -28,7 +28,7 @@ public class RelationTypeNotExistsSqlHandler extends AbstractRelationSqlHandler<
super.addPredicates(writer);
writer.write("NOT EXISTS (SELECT 1 FROM ");
- String relAlias = writer.writeTable(SqlTable.RELATION_TABLE);
+ String relAlias = writer.writeTable(criteria.getType());
writer.write(", ");
String txsAlias = writer.writeTable(SqlTable.TXS_TABLE);
writer.write(" WHERE ");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java
index ca75d643164..74f85af864a 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideExistsSqlHandler.java
@@ -30,7 +30,7 @@ public class RelationTypeSideExistsSqlHandler extends AbstractRelationSqlHandler
@Override
public void addTables(AbstractSqlWriter writer) {
super.addTables(writer);
- relAlias = writer.addTable(SqlTable.RELATION_TABLE);
+ relAlias = writer.addTable(criteria.getType());
txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java
index 7520950bd87..689ad704f81 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeSideNotExistsSqlHandler.java
@@ -30,7 +30,7 @@ public class RelationTypeSideNotExistsSqlHandler extends AbstractRelationSqlHand
RelationTypeSide relationType = criteria.getType();
writer.write("NOT EXISTS (SELECT 1 FROM ");
- String relAlias = writer.writeTable(SqlTable.RELATION_TABLE);
+ String relAlias = writer.writeTable(criteria.getType());
writer.write(", ");
String txsAlias = writer.writeTable(SqlTable.TXS_TABLE);
writer.write(" WHERE ");
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java
index 3482403eac8..5b1608ba9e7 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java
@@ -19,6 +19,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.eclipse.osee.framework.core.data.BranchId;
+import org.eclipse.osee.framework.core.data.RelationTypeToken;
import org.eclipse.osee.framework.core.enums.CoreTupleTypes;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.ObjectType;
@@ -398,6 +399,10 @@ public abstract class AbstractSqlWriter implements HasOptions {
return addTable(table, table.getObjectType());
}
+ public String addTable(RelationTypeToken relationType) {
+ return addTable(getRelationTable(relationType));
+ }
+
public void addTable(String tableName) {
tableEntries.add(tableName);
}
@@ -422,6 +427,14 @@ public abstract class AbstractSqlWriter implements HasOptions {
return alias;
}
+ public String writeTable(RelationTypeToken relationType) {
+ return writeTable(getRelationTable(relationType));
+ }
+
+ private TableEnum getRelationTable(RelationTypeToken relationType) {
+ return relationType.isVersion2() ? TableEnum.RELATION_TABLE2 : TableEnum.RELATION_TABLE;
+ }
+
public void write(String format, Object... params) {
if (params != null && params.length > 0) {
output.append(String.format(format, params));

Back to the top