diff options
| author | broberts | 2020-12-04 07:21:46 +0000 |
|---|---|---|
| committer | Ryan T. Baldwin | 2020-12-04 07:21:46 +0000 |
| commit | 0b94608eb56946410c50a680bb27f7dcabb7bb91 (patch) | |
| tree | dabda0ab30de9d7039edc080145d00117b96e6be /plugins/org.eclipse.osee.orcs.db | |
| parent | 51f959b507d66b8d8a3879a914cc131f7e82ad34 (diff) | |
| download | org.eclipse.osee-0b94608eb56946410c50a680bb27f7dcabb7bb91.tar.gz org.eclipse.osee-0b94608eb56946410c50a680bb27f7dcabb7bb91.tar.xz org.eclipse.osee-0b94608eb56946410c50a680bb27f7dcabb7bb91.zip | |
feature[TW17632]: Remove flywaydb
Change-Id: I8a01e4c4a376785b1240ccadbb905c7024b1b854
Signed-off-by: broberts <baily.e.roberts@boeing.com>
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db')
64 files changed, 323 insertions, 377 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/OSGI-INF/osee.datastore.migration.resource.xml b/plugins/org.eclipse.osee.orcs.db/OSGI-INF/osee.datastore.migration.resource.xml deleted file mode 100644 index babd16448a0..00000000000 --- a/plugins/org.eclipse.osee.orcs.db/OSGI-INF/osee.datastore.migration.resource.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0"?> -<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"> - <implementation - class="org.eclipse.osee.orcs.db.internal.resource.OseeDatastoreMigrationResource" /> - <service> - <provide interface="org.eclipse.osee.jdbc.JdbcMigrationResource"/> - </service> -</scr:component> diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreAdminImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreAdminImpl.java index c5ad0872d35..cc20e70fd28 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreAdminImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/DataStoreAdminImpl.java @@ -60,7 +60,7 @@ public class DataStoreAdminImpl implements DataStoreAdmin { Conditions.checkExpressionFailOnTrue(jdbcClient.getConfig().isProduction(), "Error - attempting to initialize a production datastore."); - jdbcClient.migrate(options, schemaProvider.get()); + jdbcClient.createDataStore(options, schemaProvider.get()); String attributeDataPath = ResourceConstants.getAttributeDataPath(properties); logger.info("Deleting application server binary data [%s]...", attributeDataPath); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MigrateDatastoreCallable.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MigrateDatastoreCallable.java index 555704f11b3..e13bc71c339 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MigrateDatastoreCallable.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/MigrateDatastoreCallable.java @@ -41,7 +41,7 @@ public class MigrateDatastoreCallable extends AbstractDatastoreCallable<DataStor @Override public DataStoreInfo call() throws Exception { - getJdbcClient().migrate(options, schemaProvider.get()); + getJdbcClient().createDataStore(options, schemaProvider.get()); Callable<DataStoreInfo> fetchCallable = new FetchDatastoreInfoCallable(getLogger(), getJdbcClient(), schemaProvider, preferences); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java index 69da8e70775..8c034b2676c 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/LoadSqlWriter.java @@ -15,9 +15,10 @@ package org.eclipse.osee.orcs.db.internal.loader; import java.util.Iterator; import java.util.List; + import org.eclipse.osee.framework.core.OrcsTokenService; import org.eclipse.osee.framework.core.enums.ModificationType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.core.enums.TxCurrent; import org.eclipse.osee.jdbc.JdbcClient; import org.eclipse.osee.orcs.QueryType; @@ -39,8 +40,8 @@ public class LoadSqlWriter extends AbstractSqlWriter { @Override protected void writeSelectFields() { - String txAlias = getLastAlias(TableEnum.TXS_TABLE); - String artJoinAlias = getLastAlias(TableEnum.JOIN_ID4_TABLE); + String txAlias = getLastAlias(SqlTable.TXS_TABLE); + String artJoinAlias = getLastAlias(SqlTable.OSEE_JOIN_ID4_TABLE); writeSelectFields(txAlias, "gamma_id", txAlias, "mod_type", txAlias, "branch_id", txAlias, "transaction_id", txAlias, "app_id"); @@ -53,22 +54,22 @@ public class LoadSqlWriter extends AbstractSqlWriter { @Override public void writeGroupAndOrder() { - String artAlias = getLastAlias(TableEnum.JOIN_ID4_TABLE); - String txAlias = getLastAlias(TableEnum.TXS_TABLE); + String artAlias = getLastAlias(SqlTable.OSEE_JOIN_ID4_TABLE); + String txAlias = getLastAlias(SqlTable.TXS_TABLE); write("\n ORDER BY %s.branch_id, %s.id2", txAlias, artAlias); - if (hasAlias(TableEnum.ATTRIBUTE_TABLE)) { - write(", %s.attr_id", getLastAlias(TableEnum.ATTRIBUTE_TABLE)); + if (hasAlias(SqlTable.ATTRIBUTE_TABLE)) { + write(", %s.attr_id", getLastAlias(SqlTable.ATTRIBUTE_TABLE)); } - if (hasAlias(TableEnum.RELATION_TABLE)) { - write(", %s.rel_link_id", getLastAlias(TableEnum.RELATION_TABLE)); + if (hasAlias(SqlTable.RELATION_TABLE)) { + write(", %s.rel_link_id", getLastAlias(SqlTable.RELATION_TABLE)); } write(", %s.transaction_id desc", txAlias); } @Override public void writeTxBranchFilter(String txsAlias, boolean allowDeleted) { - String artJoinAlias = getLastAlias(TableEnum.JOIN_ID4_TABLE); + String artJoinAlias = getLastAlias(SqlTable.OSEE_JOIN_ID4_TABLE); writeTxFilter(txsAlias, artJoinAlias, allowDeleted); write(" AND "); write(txsAlias); @@ -89,7 +90,7 @@ public class LoadSqlWriter extends AbstractSqlWriter { */ //@formatter:on boolean hasTable[] = - {hasAlias(TableEnum.ARTIFACT_TABLE), hasAlias(TableEnum.ATTRIBUTE_TABLE), hasAlias(TableEnum.RELATION_TABLE)}; + {hasAlias(SqlTable.ARTIFACT_TABLE), hasAlias(SqlTable.ATTRIBUTE_TABLE), hasAlias(SqlTable.RELATION_TABLE)}; /********************************************************************** * Allow deleted artifacts applies even if the artifact table is not in the query. The other two only make sense @@ -156,8 +157,8 @@ public class LoadSqlWriter extends AbstractSqlWriter { * not made */ int count = 0; - if (hasAlias(TableEnum.ARTIFACT_TABLE)) { - List<String> artTables = getAliases(TableEnum.ARTIFACT_TABLE); + if (hasAlias(SqlTable.ARTIFACT_TABLE)) { + List<String> artTables = getAliases(SqlTable.ARTIFACT_TABLE); if (OptionsUtil.areDeletedArtifactsIncluded(getOptions())) { write("("); buildTableGamma(artTables, txsAlias); @@ -167,8 +168,8 @@ public class LoadSqlWriter extends AbstractSqlWriter { count++; } } - if (hasAlias(TableEnum.ATTRIBUTE_TABLE)) { - List<String> attrTables = getAliases(TableEnum.ATTRIBUTE_TABLE); + if (hasAlias(SqlTable.ATTRIBUTE_TABLE)) { + List<String> attrTables = getAliases(SqlTable.ATTRIBUTE_TABLE); if (OptionsUtil.areDeletedAttributesIncluded(getOptions())) { if (count > 1) { write(" AND "); @@ -181,8 +182,8 @@ public class LoadSqlWriter extends AbstractSqlWriter { count++; } } - if (hasAlias(TableEnum.RELATION_TABLE)) { - List<String> relationTables = getAliases(TableEnum.RELATION_TABLE); + if (hasAlias(SqlTable.RELATION_TABLE)) { + List<String> relationTables = getAliases(SqlTable.RELATION_TABLE); if (OptionsUtil.areDeletedAttributesIncluded(getOptions())) { if (count > 1) { write(" AND "); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java index e11523837bd..66bf4f32518 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.loader.handlers; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.db.internal.loader.criteria.CriteriaArtifact; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -47,9 +47,9 @@ public class ArtifactSqlHandler extends SqlHandler<CriteriaArtifact> { @Override public void addTables(AbstractSqlWriter writer) { - jArtAlias = writer.addTable(TableEnum.JOIN_ID4_TABLE); - artAlias = writer.addTable(TableEnum.ARTIFACT_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ARTIFACT); + jArtAlias = writer.addTable(SqlTable.OSEE_JOIN_ID4_TABLE); + artAlias = writer.addTable(SqlTable.ARTIFACT_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ARTIFACT); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java index 1060c1c5070..dc3c689f4f5 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/AttributeSqlHandler.java @@ -16,7 +16,7 @@ package org.eclipse.osee.orcs.db.internal.loader.handlers; import java.util.Collection; import org.eclipse.osee.framework.core.data.AttributeTypeId; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.db.internal.loader.criteria.CriteriaAttribute; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -55,18 +55,18 @@ public class AttributeSqlHandler extends SqlHandler<CriteriaAttribute> { @Override public void addTables(AbstractSqlWriter writer) { - jArtAlias = writer.addTable(TableEnum.JOIN_ID4_TABLE); + jArtAlias = writer.addTable(SqlTable.OSEE_JOIN_ID4_TABLE); if (criteria.getIds().size() > 1) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } if (criteria.getTypes().size() > 1) { - jTypeIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jTypeIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - attrAlias = writer.addTable(TableEnum.ATTRIBUTE_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ATTRIBUTE); + attrAlias = writer.addTable(SqlTable.ATTRIBUTE_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ATTRIBUTE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java index e65167201cc..0fac5438e24 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/RelationSqlHandler.java @@ -16,7 +16,7 @@ package org.eclipse.osee.orcs.db.internal.loader.handlers; import java.util.Collection; import java.util.HashSet; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.orcs.db.internal.loader.criteria.CriteriaRelation; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -57,19 +57,19 @@ public class RelationSqlHandler extends SqlHandler<CriteriaRelation> { @Override public void addTables(AbstractSqlWriter writer) { - jArtAlias = writer.addTable(TableEnum.JOIN_ID4_TABLE); + jArtAlias = writer.addTable(SqlTable.OSEE_JOIN_ID4_TABLE); if (criteria.getIds().size() > 1) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } typeIds = getLocalTypeIds(); if (typeIds.size() > 1) { - jTypeIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jTypeIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - relationAlias = writer.addTable(TableEnum.RELATION_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + relationAlias = writer.addTable(SqlTable.RELATION_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); } private Collection<Long> getLocalTypeIds() { diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java deleted file mode 100644 index d7d0dcd28da..00000000000 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/OseeDatastoreMigrationResource.java +++ /dev/null @@ -1,47 +0,0 @@ -/********************************************************************* - * Copyright (c) 2010 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.orcs.db.internal.resource; - -import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT; -import java.net.URL; -import java.util.Map; -import org.eclipse.osee.framework.core.data.OseeData; -import org.eclipse.osee.framework.core.enums.BranchState; -import org.eclipse.osee.framework.core.enums.BranchType; -import org.eclipse.osee.framework.core.enums.CoreBranches; -import org.eclipse.osee.jdbc.AbstractJdbcMigrationResource; - -public class OseeDatastoreMigrationResource extends AbstractJdbcMigrationResource { - - private static final String FILE_PATH = "migration/"; - private static final String TX_SEQ_PLACEHOLDER = "osee.tx_seq"; - private static final String SYS_ROOT_TYPE_PLACEHOLDER = "osee.sys_root_type"; - private static final String SYS_ROOT_STATE_PLACEHOLDER = "osee.sys_root_state"; - private static final String SYS_ROOT_NAME_PLACEHOLDER = "osee.sys_root_name"; - private static final String SYS_ROOT_ID_PLACEHOLDER = "osee.sys_root_id"; - - @Override - public URL getLocation() { - return getClass().getResource(FILE_PATH); - } - - @Override - public void addPlaceholders(Map<String, String> placeholders) { - placeholders.put(TX_SEQ_PLACEHOLDER, OseeData.TRANSACTION_ID_SEQ); - placeholders.put(SYS_ROOT_TYPE_PLACEHOLDER, BranchType.SYSTEM_ROOT.getIdString()); - placeholders.put(SYS_ROOT_STATE_PLACEHOLDER, BranchState.MODIFIED.getIdString()); - placeholders.put(SYS_ROOT_NAME_PLACEHOLDER, CoreBranches.SYSTEM_ROOT.getName()); - placeholders.put(SYS_ROOT_ID_PLACEHOLDER, SYSTEM_ROOT.getIdString()); - } -} diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/Engines.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/Engines.java index f1e612c2614..9477da4aea6 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/Engines.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/Engines.java @@ -17,7 +17,7 @@ import static org.eclipse.osee.orcs.db.internal.search.handlers.SqlHandlerFactor import static org.eclipse.osee.orcs.db.internal.search.handlers.SqlHandlerFactoryUtil.createBranchSqlHandlerFactory; import static org.eclipse.osee.orcs.db.internal.search.handlers.SqlHandlerFactoryUtil.createObjectSqlHandlerFactory; import static org.eclipse.osee.orcs.db.internal.search.handlers.SqlHandlerFactoryUtil.createTxSqlHandlerFactory; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.core.executor.ExecutorAdmin; import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.jdbc.JdbcClient; @@ -82,19 +82,19 @@ public final class Engines { return new TaggingEngine(tagProcessor); } - public static QuerySqlContextFactory newSqlContextFactory(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient, TableEnum table, String idColumn, SqlHandlerFactory handlerFactory, ObjectQueryType type) { + public static QuerySqlContextFactory newSqlContextFactory(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient, SqlTable table, String idColumn, SqlHandlerFactory handlerFactory, ObjectQueryType type) { return new QuerySqlContextFactoryImpl(logger, joinFactory, jdbcClient, handlerFactory, table, idColumn, type); } public static QuerySqlContextFactory newBranchSqlContextFactory(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient) { SqlHandlerFactory handlerFactory = createBranchSqlHandlerFactory(logger); - return newSqlContextFactory(logger, joinFactory, jdbcClient, TableEnum.BRANCH_TABLE, "branch_id", handlerFactory, + return newSqlContextFactory(logger, joinFactory, jdbcClient, SqlTable.BRANCH_TABLE, "branch_id", handlerFactory, ObjectQueryType.BRANCH); } public static QuerySqlContextFactory newTxSqlContextFactory(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient) { SqlHandlerFactory handlerFactory = createTxSqlHandlerFactory(logger); - return newSqlContextFactory(logger, joinFactory, jdbcClient, TableEnum.TX_DETAILS_TABLE, "transaction_id", + return newSqlContextFactory(logger, joinFactory, jdbcClient, SqlTable.TX_DETAILS_TABLE, "transaction_id", handlerFactory, ObjectQueryType.TX); } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java index c8bfccea669..304fa0376b6 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/ArtifactQuerySqlWriter.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.engines; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.jdbc.JdbcClient; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.QueryData; @@ -31,8 +31,8 @@ public class ArtifactQuerySqlWriter extends AbstractSqlWriter { @Override protected void writeSelectFields() { - String txAlias = getMainTableAlias(TableEnum.TXS_TABLE); - String artAlias = getMainTableAlias(TableEnum.ARTIFACT_TABLE); + String txAlias = getMainTableAlias(SqlTable.TXS_TABLE); + String artAlias = getMainTableAlias(SqlTable.ARTIFACT_TABLE); writeSelectFields(artAlias, "art_id", txAlias, "branch_id"); if (OptionsUtil.isHistorical(getOptions())) { @@ -47,8 +47,8 @@ public class ArtifactQuerySqlWriter extends AbstractSqlWriter { write("\n) xTable"); } } else { - write("\n ORDER BY %s.art_id, %s.branch_id", getMainTableAlias(TableEnum.ARTIFACT_TABLE), - getMainTableAlias(TableEnum.TXS_TABLE)); + write("\n ORDER BY %s.art_id, %s.branch_id", getMainTableAlias(SqlTable.ARTIFACT_TABLE), + getMainTableAlias(SqlTable.TXS_TABLE)); } } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/OrcsScriptSqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/OrcsScriptSqlWriter.java index e53306e6504..da63d57bb36 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/OrcsScriptSqlWriter.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/OrcsScriptSqlWriter.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.type.MutableBoolean; import org.eclipse.osee.jdbc.JdbcClient; import org.eclipse.osee.orcs.core.ds.DynamicData; @@ -53,7 +53,7 @@ import org.eclipse.osee.orcs.db.internal.sql.join.SqlJoinFactory; * @author Roberto E. Escobar */ public class OrcsScriptSqlWriter extends AbstractSqlWriter { - private final HashMap<TableEnum, String> mainAliases = new HashMap<>(); + private final HashMap<SqlTable, String> mainAliases = new HashMap<>(); private static final SqlHandlerComparator HANDLER_COMPARATOR = new SqlHandlerComparator(); private final SqlFieldResolver fieldResolver; @@ -156,15 +156,15 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { @Override public void writeTxBranchFilter(String txsAlias, boolean allowDeleted) { writeTxFilter(txsAlias, allowDeleted); - if (hasAlias(TableEnum.BRANCH_TABLE)) { - String alias = getFirstAlias(TableEnum.BRANCH_TABLE); + if (hasAlias(SqlTable.BRANCH_TABLE)) { + String alias = getFirstAlias(SqlTable.BRANCH_TABLE); write(" AND "); write(txsAlias); write(".branch_id = "); write(alias); write(".branch_id"); - } else if (hasAlias(TableEnum.TX_DETAILS_TABLE)) { - String alias = getFirstAlias(TableEnum.TX_DETAILS_TABLE); + } else if (hasAlias(SqlTable.TX_DETAILS_TABLE)) { + String alias = getFirstAlias(SqlTable.TX_DETAILS_TABLE); write(" AND "); write(txsAlias); write(".transaction_id = "); @@ -194,14 +194,14 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { } if (!artHandlers.isEmpty()) { - TableEnum table = null; + SqlTable table = null; List<SqlHandler<?>> withQueryHandlers = null; if (!branchHandlers.isEmpty()) { withQueryHandlers = branchHandlers; - table = TableEnum.BRANCH_TABLE; + table = SqlTable.BRANCH_TABLE; } else if (!txHandlers.isEmpty()) { withQueryHandlers = txHandlers; - table = TableEnum.TX_DETAILS_TABLE; + table = SqlTable.TX_DETAILS_TABLE; } if (withQueryHandlers != null && table != null) { @@ -237,7 +237,7 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { int level = data.getLevel(); ObjectField objectField = getObjectField(data); - TableEnum table = objectField.getTable(); + SqlTable table = objectField.getTable(); ObjectType type = objectField.getType(); String key = asKey(level, table, type); @@ -253,24 +253,24 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { return toReturn; } - private String asKey(int level, TableEnum table, ObjectType type) { + private String asKey(int level, SqlTable table, ObjectType type) { return String.format("%s.%s.%s", level, table, type); } - private SqlHandler<?> newSqlHandler(int level, TableEnum table, ObjectType type) { + private SqlHandler<?> newSqlHandler(int level, SqlTable table, ObjectType type) { SqlHandler<?> handler = null; SqlHandlerPriority priority = getXtraSqlHandlerPriority(table, type); - switch (table) { - case TX_DETAILS_TABLE: + switch (table.getName()) { + case "osee_tx_details": handler = new XtraTxDataSqlHandler(priority, type); break; - case BRANCH_TABLE: + case "osee_branch": handler = new XtraBranchDataSqlHandler(priority, type); break; - case ATTRIBUTE_TABLE: + case "osee_attribute": handler = new XtraAttributeDataSqlHandler(); break; - case RELATION_TABLE: + case "osee_relation_link": handler = new XtraRelationDataSqlHandler(); break; default: @@ -282,7 +282,7 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { return handler; } - private SqlHandlerPriority getXtraSqlHandlerPriority(TableEnum table, ObjectType type) { + private SqlHandlerPriority getXtraSqlHandlerPriority(SqlTable table, ObjectType type) { SqlHandlerPriority priority = SqlHandlerPriority.LAST; if (type != null) { switch (type) { @@ -306,7 +306,7 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { } @Override - public String getMainTableAlias(TableEnum table) { + public String getMainTableAlias(SqlTable table) { String alias = mainAliases.get(table); if (alias == null) { alias = addTable(table); @@ -316,7 +316,7 @@ public class OrcsScriptSqlWriter extends AbstractSqlWriter { } @Override - protected boolean mainTableAliasExists(TableEnum table) { + protected boolean mainTableAliasExists(SqlTable table) { return mainAliases.containsKey(table); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java index f6f1dfe54e3..f49f78ffa60 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlContextFactoryImpl.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.engines; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.jdbc.JdbcClient; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.OrcsSession; @@ -35,11 +35,11 @@ public class QuerySqlContextFactoryImpl implements QuerySqlContextFactory { private final SqlHandlerFactory handlerFactory; private final JdbcClient jdbcClient; private final SqlJoinFactory joinFactory; - private final TableEnum table; + private final SqlTable table; private final String idColumn; private final ObjectQueryType type; - public QuerySqlContextFactoryImpl(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient, SqlHandlerFactory handlerFactory, TableEnum table, String idColumn, ObjectQueryType type) { + public QuerySqlContextFactoryImpl(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient, SqlHandlerFactory handlerFactory, SqlTable table, String idColumn, ObjectQueryType type) { this.logger = logger; this.joinFactory = joinFactory; this.jdbcClient = jdbcClient; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlWriter.java index 0a2734070f7..349bcb4f5a5 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlWriter.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/engines/QuerySqlWriter.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.engines; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.jdbc.JdbcClient; import org.eclipse.osee.logger.Log; import org.eclipse.osee.orcs.core.ds.QueryData; @@ -28,10 +28,10 @@ import org.eclipse.osee.orcs.db.internal.sql.join.SqlJoinFactory; */ public class QuerySqlWriter extends AbstractSqlWriter { private final String idColumn; - private final TableEnum table; + private final SqlTable table; private String tableAlias; - public QuerySqlWriter(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient, SqlContext context, QueryData queryData, TableEnum table, String idColumn) { + public QuerySqlWriter(Log logger, SqlJoinFactory joinFactory, JdbcClient jdbcClient, SqlContext context, QueryData queryData, SqlTable table, String idColumn) { super(joinFactory, jdbcClient, context, queryData); this.idColumn = idColumn; this.table = table; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllBranchesSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllBranchesSqlHandler.java index 283f287823d..96cb2fd6916 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllBranchesSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllBranchesSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAllBranches; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -25,7 +25,7 @@ public class AllBranchesSqlHandler extends SqlHandler<CriteriaAllBranches> { @Override public void addTables(AbstractSqlWriter writer) { - writer.getMainTableAlias(TableEnum.BRANCH_TABLE); + writer.getMainTableAlias(SqlTable.BRANCH_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllTxsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllTxsSqlHandler.java index ce069a36cce..c65e577085d 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllTxsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllTxsSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAllTxs; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -25,7 +25,7 @@ public class AllTxsSqlHandler extends SqlHandler<CriteriaAllTxs> { @Override public void addTables(AbstractSqlWriter writer) { - writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java index 6981ad91824..bbd8c6ae69a 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.Collection; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaArtifactGuids; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -69,13 +69,13 @@ public class ArtifactGuidSqlHandler extends SqlHandler<CriteriaArtifactGuids> { public void addTables(AbstractSqlWriter writer) { if (cteAlias == null) { if (criteria.getIds().size() > 1) { - jguidAlias = writer.addTable(TableEnum.CHAR_JOIN_TABLE); + jguidAlias = writer.addTable(SqlTable.OSEE_JOIN_CHAR_ID_TABLE); } } else { writer.addTable(cteAlias); } - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); - txsAlias = writer.getMainTableAlias(TableEnum.TXS_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); + txsAlias = writer.getMainTableAlias(SqlTable.TXS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java index 56a4dffadb5..1f22e360cff 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaArtifactIds; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -67,13 +67,13 @@ public class ArtifactIdsSqlHandler extends SqlHandler<CriteriaArtifactIds> { public void addTables(AbstractSqlWriter writer) { if (cteAlias == null) { if (criteria.hasMultipleIds()) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } } else { writer.addTable(cteAlias); } - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); - txsAlias = writer.getMainTableAlias(TableEnum.TXS_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); + txsAlias = writer.getMainTableAlias(SqlTable.TXS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTxCommentSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTxCommentSqlHandler.java index 655910847b9..9997fc974f1 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTxCommentSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTxCommentSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaArtifactTxComment; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -36,11 +36,11 @@ public class ArtifactTxCommentSqlHandler extends SqlHandler<CriteriaArtifactTxCo @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.addTable(TableEnum.TX_DETAILS_TABLE); - txsAttAlias = writer.addTable(TableEnum.TXS_TABLE); - attAlias = writer.addTable(TableEnum.ATTRIBUTE_TABLE); - tuple2Alias = writer.addTable(TableEnum.TUPLE2); - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); + txdAlias = writer.addTable(SqlTable.TX_DETAILS_TABLE); + txsAttAlias = writer.addTable(SqlTable.TXS_TABLE); + attAlias = writer.addTable(SqlTable.ATTRIBUTE_TABLE); + tuple2Alias = writer.addTable(SqlTable.TUPLE2); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java index c529154abf3..1d7580f8768 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactTypeSqlHandler.java @@ -15,7 +15,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.Collection; import org.eclipse.osee.framework.core.data.ArtifactTypeId; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaArtifactType; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -39,10 +39,10 @@ public class ArtifactTypeSqlHandler extends SqlHandler<CriteriaArtifactType> { @Override public void addTables(AbstractSqlWriter writer) { if (criteria.getTypes().size() > 1) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); - txsAlias = writer.getMainTableAlias(TableEnum.TXS_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); + txsAlias = writer.getMainTableAlias(SqlTable.TXS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AssociatedArtIdSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AssociatedArtIdSqlHandler.java index 92c43345dcf..76b5efe8c02 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AssociatedArtIdSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AssociatedArtIdSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAssociatedArtId; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -33,7 +33,7 @@ public class AssociatedArtIdSqlHandler extends SqlHandler<CriteriaAssociatedArtI @Override public void addTables(AbstractSqlWriter writer) { - brAlias = writer.getMainTableAlias(TableEnum.BRANCH_TABLE); + brAlias = writer.getMainTableAlias(SqlTable.BRANCH_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeRawSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeRawSqlHandler.java index 8be0af1695b..0bb7ff9ab6e 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeRawSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeRawSqlHandler.java @@ -20,7 +20,7 @@ import java.util.List; import org.eclipse.osee.framework.core.data.AttributeTypeId; import org.eclipse.osee.framework.core.enums.ObjectType; import org.eclipse.osee.framework.core.enums.QueryOption; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAttributeRaw; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -56,17 +56,17 @@ public class AttributeRawSqlHandler extends SqlHandler<CriteriaAttributeRaw> { values = getValuesForSearch(); if (values.size() > 1) { valueJoinQuery = writer.writeCharJoin(values); - valueJoinAlias = writer.addTable(TableEnum.CHAR_JOIN_TABLE); + valueJoinAlias = writer.addTable(SqlTable.OSEE_JOIN_CHAR_ID_TABLE); } types = criteria.getAttributeTypes(); if (types.size() > 1) { typeJoinQuery = writer.writeJoin(types); - typeJoinAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + typeJoinAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - attrAlias = writer.addTable(TableEnum.ATTRIBUTE_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ATTRIBUTE); + attrAlias = writer.addTable(SqlTable.ATTRIBUTE_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ATTRIBUTE); } private Collection<String> getValuesForSearch() { @@ -138,7 +138,7 @@ public class AttributeRawSqlHandler extends SqlHandler<CriteriaAttributeRaw> { writer.addParameter(valueJoinQuery.getQueryId()); } - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); if (!aliases.isEmpty()) { writer.writeAndLn(); int aSize = aliases.size(); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java index 59747e28d95..2dec626837b 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java @@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.osee.framework.core.data.AttributeTypeId; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAttributeKeywords; import org.eclipse.osee.orcs.db.internal.search.tagger.HasTagProcessor; @@ -87,7 +87,7 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor writer.write("SELECT gamma_id FROM osee_attribute att"); if (joinQuery != null) { writer.write(", "); - jIdAlias = writer.writeTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.writeTable(SqlTable.OSEE_JOIN_ID_TABLE); } writer.write(" WHERE "); if (Strings.isValid(value)) { @@ -128,7 +128,7 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor String jIdAlias = null; if (joinQuery != null) { - jIdAlias = writer.writeTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.writeTable(SqlTable.OSEE_JOIN_ID_TABLE); writer.write(", "); } @@ -154,8 +154,8 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor @Override public void addTables(AbstractSqlWriter writer) { writer.addTable(attrAlias); - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); - writer.getMainTableAlias(TableEnum.TXS_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); + writer.getMainTableAlias(SqlTable.TXS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java index a04ca2064df..4d281547cbf 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.framework.core.data.AttributeTypeId; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAttributeTypeExists; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -72,10 +72,10 @@ public class AttributeTypeExistsSqlHandler extends SqlHandler<CriteriaAttributeT writer.addTable(cteAlias); } if (criteria.getTypes().size() > 1) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - attrAlias = writer.addTable(TableEnum.ATTRIBUTE_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ATTRIBUTE); + attrAlias = writer.addTable(SqlTable.ATTRIBUTE_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ATTRIBUTE); } @Override @@ -99,7 +99,7 @@ public class AttributeTypeExistsSqlHandler extends SqlHandler<CriteriaAttributeT writer.addParameter(type); } - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); if (!aliases.isEmpty()) { writer.writeAndLn(); int aSize = aliases.size(); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeNotExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeNotExistsSqlHandler.java index 4c7ca7f18db..c32f2c076e7 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeNotExistsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeNotExistsSqlHandler.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.eclipse.osee.framework.core.data.AttributeTypeId; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaAttributeTypeNotExists; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -41,20 +41,20 @@ public class AttributeTypeNotExistsSqlHandler extends SqlHandler<CriteriaAttribu @Override public void addTables(AbstractSqlWriter writer) { if (criteria.getTypes().size() > 1) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); - txsAlias = writer.getMainTableAlias(TableEnum.TXS_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); + txsAlias = writer.getMainTableAlias(SqlTable.TXS_TABLE); } @Override public void addPredicates(AbstractSqlWriter writer) { Collection<AttributeTypeId> types = criteria.getTypes(); writer.write("NOT EXISTS (SELECT 1 FROM "); - String attAlias = writer.writeTable(TableEnum.ATTRIBUTE_TABLE); + String attAlias = writer.writeTable(SqlTable.ATTRIBUTE_TABLE); writer.write(", "); - String txsNotAlias = writer.writeTable(TableEnum.TXS_TABLE); + String txsNotAlias = writer.writeTable(SqlTable.TXS_TABLE); writer.write(" WHERE "); writer.writeEqualsAnd(attAlias, artAlias, "art_id"); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java index 27b51059985..c9108f63f97 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchAncestorOfSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchAncestorOf; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -45,7 +45,7 @@ public class BranchAncestorOfSqlHandler extends SqlHandler<CriteriaBranchAncesto @Override public void addTables(AbstractSqlWriter writer) { writer.addTable(cteAlias); - brAlias = writer.getMainTableAlias(TableEnum.BRANCH_TABLE); + brAlias = writer.getMainTableAlias(SqlTable.BRANCH_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchArchivedSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchArchivedSqlHandler.java index a97645c84e2..dee94d26893 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchArchivedSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchArchivedSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class BranchArchivedSqlHandler extends MainTableFieldSqlHandler { public BranchArchivedSqlHandler() { - super(TableEnum.BRANCH_TABLE, "archived", SqlHandlerPriority.BRANCH_ARCHIVED); + super(SqlTable.BRANCH_TABLE, "archived", SqlHandlerPriority.BRANCH_ARCHIVED); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java index 168db2bcab5..caafc475037 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchChildOfSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchChildOf; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -46,7 +46,7 @@ public class BranchChildOfSqlHandler extends SqlHandler<CriteriaBranchChildOf> { @Override public void addTables(AbstractSqlWriter writer) { writer.addTable(cteAlias); - brAlias = writer.getMainTableAlias(TableEnum.BRANCH_TABLE); + brAlias = writer.getMainTableAlias(SqlTable.BRANCH_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java index 6f1f33e9d4d..bd8b18b9ed1 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public class BranchIdsSqlHandler extends MainTableFieldSqlHandler { public BranchIdsSqlHandler() { - super(TableEnum.BRANCH_TABLE, "branch_id", SqlHandlerPriority.BRANCH_ID); + super(SqlTable.BRANCH_TABLE, "branch_id", SqlHandlerPriority.BRANCH_ID); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchNameSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchNameSqlHandler.java index 8a95451f520..6a5e57d994b 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchNameSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchNameSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchName; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -34,7 +34,7 @@ public class BranchNameSqlHandler extends SqlHandler<CriteriaBranchName> { @Override public void addTables(AbstractSqlWriter writer) { - brAlias = writer.getMainTableAlias(TableEnum.BRANCH_TABLE); + brAlias = writer.getMainTableAlias(SqlTable.BRANCH_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchStateSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchStateSqlHandler.java index e223e4db12a..c1465c30829 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchStateSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchStateSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class BranchStateSqlHandler extends MainTableFieldSqlHandler { public BranchStateSqlHandler() { - super(TableEnum.BRANCH_TABLE, "branch_state", SqlHandlerPriority.BRANCH_STATE); + super(SqlTable.BRANCH_TABLE, "branch_state", SqlHandlerPriority.BRANCH_STATE); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchTypesSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchTypesSqlHandler.java index f13d297141b..d9aa2726f69 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchTypesSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchTypesSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class BranchTypesSqlHandler extends MainTableFieldSqlHandler { public BranchTypesSqlHandler() { - super(TableEnum.BRANCH_TABLE, "branch_type", SqlHandlerPriority.BRANCH_TYPE); + super(SqlTable.BRANCH_TABLE, "branch_type", SqlHandlerPriority.BRANCH_TYPE); } }
\ No newline at end of file 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 38c4339c334..239ad401ce7 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 @@ -16,7 +16,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import org.eclipse.osee.framework.core.data.RelationTypeSide; import org.eclipse.osee.framework.core.enums.ObjectType; import org.eclipse.osee.framework.core.enums.RelationSide; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeFollow; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -52,8 +52,8 @@ public class FollowRelationSqlHandler extends SqlHandler<CriteriaRelationTypeFol if (sourceArtTable != null) { writer.addTable(sourceArtTable); } - relAlias = writer.addTable(TableEnum.RELATION_TABLE); - relTxsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + relAlias = writer.addTable(SqlTable.RELATION_TABLE); + relTxsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); } @Override @@ -84,7 +84,7 @@ public class FollowRelationSqlHandler extends SqlHandler<CriteriaRelationTypeFol writer.writeTxBranchFilter(relTxsAlias, includeDeletedRelations); if (criteria.isTerminalFollow()) { writer.write(" AND "); - writer.writeEquals(relAlias, toArtField, writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE), "art_id"); + writer.writeEquals(relAlias, toArtField, writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE), "art_id"); } } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MainTableFieldSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MainTableFieldSqlHandler.java index 2ff06245ac0..eaf52661916 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MainTableFieldSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MainTableFieldSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.Collection; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaMainTableField; @@ -29,12 +29,12 @@ public abstract class MainTableFieldSqlHandler extends SqlHandler<CriteriaMainTa private CriteriaMainTableField criteria; private String mainAlias; private String jIdAlias; - private final TableEnum table; + private final SqlTable table; private final String column; private final SqlHandlerPriority priority; private Collection<? extends Id> values; - public MainTableFieldSqlHandler(TableEnum table, String column, SqlHandlerPriority priority) { + public MainTableFieldSqlHandler(SqlTable table, String column, SqlHandlerPriority priority) { this.table = table; this.column = column; this.priority = priority; @@ -50,7 +50,7 @@ public abstract class MainTableFieldSqlHandler extends SqlHandler<CriteriaMainTa mainAlias = writer.getMainTableAlias(table); values = criteria.getValues(); if (values.size() > 1) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MergeBranchForSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MergeBranchForSqlHandler.java index 8510ee2ff02..8e28f55662c 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MergeBranchForSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/MergeBranchForSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaMergeBranchFor; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -32,8 +32,8 @@ public class MergeBranchForSqlHandler extends SqlHandler<CriteriaMergeBranchFor> @Override public void addTables(AbstractSqlWriter writer) { - mergeAlias = writer.addTable(TableEnum.MERGE_TABLE); - brAlias = writer.getMainTableAlias(TableEnum.BRANCH_TABLE); + mergeAlias = writer.addTable(SqlTable.OSEE_MERGE_TABLE); + brAlias = writer.getMainTableAlias(SqlTable.BRANCH_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedRecursiveHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedRecursiveHandler.java index dc414bde98a..a3b9e51f72d 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedRecursiveHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedRecursiveHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelatedRecursive; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -51,7 +51,7 @@ public class RelatedRecursiveHandler extends SqlHandler<CriteriaRelatedRecursive @Override public void addTables(AbstractSqlWriter writer) { writer.addTable(cteAlias); - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); } @Override 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 58fb8d47baa..6c7a90ee767 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 @@ -16,7 +16,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.List; import org.eclipse.osee.framework.core.data.RelationTypeSide; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelatedTo; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -43,17 +43,17 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo> { writer.write(" FROM osee_txs txs, osee_relation_link rel"); if (criteria.hasMultipleIds()) { writer.write(", "); - writer.write(TableEnum.ID_JOIN_TABLE.getName()); + writer.write(SqlTable.OSEE_JOIN_ID_TABLE.getName()); writer.write(" "); writer.write(jIdAlias); } - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); if (!aliases.isEmpty()) { int aSize = aliases.size(); for (int index = 0; index < aSize; index++) { String artAlias = aliases.get(index); writer.write(", "); - writer.write(TableEnum.ARTIFACT_TABLE.getName()); + writer.write(SqlTable.ARTIFACT_TABLE.getName()); writer.write(" "); writer.write(artAlias); } @@ -77,10 +77,10 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo> { writer.addTable(cteAlias); } if (criteria.hasMultipleIds()) { - jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); + jIdAlias = writer.addTable(SqlTable.OSEE_JOIN_ID_TABLE); } - relAlias = writer.addTable(TableEnum.RELATION_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + relAlias = writer.addTable(SqlTable.RELATION_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); } private void writePredicate(AbstractSqlWriter writer, String txsAliasName, String relAliasName) { @@ -108,7 +108,7 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo> { writer.addParameter(criteria.getId()); } - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); if (!aliases.isEmpty()) { writer.write("\n AND \n"); String oppositeAOrBartId = typeSide.getSide().isSideA() ? ".b_art_id" : ".a_art_id"; 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 95bdbb42cb1..855d6068758 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 @@ -15,7 +15,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.List; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeExists; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -30,8 +30,8 @@ public class RelationTypeExistsSqlHandler extends AbstractRelationSqlHandler<Cri @Override public void addTables(AbstractSqlWriter writer) { super.addTables(writer); - relAlias = writer.addTable(TableEnum.RELATION_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + relAlias = writer.addTable(SqlTable.RELATION_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); } @Override @@ -41,7 +41,7 @@ public class RelationTypeExistsSqlHandler extends AbstractRelationSqlHandler<Cri writer.write(".rel_link_type_id = ?"); writer.addParameter(criteria.getType()); - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); if (!aliases.isEmpty()) { writer.writeAndLn(); int aSize = aliases.size(); 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 81bc5103b27..684e6a9deea 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 @@ -16,7 +16,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.List; import org.eclipse.osee.framework.core.data.RelationTypeSide; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.orcs.core.ds.OptionsUtil; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeFollow; @@ -47,26 +47,26 @@ public class RelationTypeFollowSqlHandler extends SqlHandler<CriteriaRelationTyp @Override public void addTables(AbstractSqlWriter writer) { - List<String> artAliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> artAliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); if (artAliases.isEmpty()) { - artAlias0 = writer.addTable(TableEnum.ARTIFACT_TABLE); - txsAlias0 = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ARTIFACT); + artAlias0 = writer.addTable(SqlTable.ARTIFACT_TABLE); + txsAlias0 = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ARTIFACT); } else { artAlias0 = artAliases.iterator().next(); } - relAlias1 = writer.addTable(TableEnum.RELATION_TABLE); - txsAlias1 = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + relAlias1 = writer.addTable(SqlTable.RELATION_TABLE); + txsAlias1 = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); - String branchAlias = writer.getFirstAlias(TableEnum.BRANCH_TABLE); + String branchAlias = writer.getFirstAlias(SqlTable.BRANCH_TABLE); SqlAliasManager aliasManager = writer.getAliasManager(); aliasManager.nextLevel(); - artAlias2 = writer.addTable(TableEnum.ARTIFACT_TABLE); - txsAlias2 = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ARTIFACT); + artAlias2 = writer.addTable(SqlTable.ARTIFACT_TABLE); + txsAlias2 = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ARTIFACT); if (Strings.isValid(branchAlias)) { - aliasManager.putAlias(TableEnum.BRANCH_TABLE, ObjectType.BRANCH, branchAlias); + aliasManager.putAlias(SqlTable.BRANCH_TABLE, ObjectType.BRANCH, branchAlias); } } 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 0892593352c..5dbb24adc88 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 @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.List; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeNotExists; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -28,13 +28,13 @@ public class RelationTypeNotExistsSqlHandler extends AbstractRelationSqlHandler< super.addPredicates(writer); writer.write("NOT EXISTS (SELECT 1 FROM "); - String relAlias = writer.writeTable(TableEnum.RELATION_TABLE); + String relAlias = writer.writeTable(SqlTable.RELATION_TABLE); writer.write(", "); - String txsAlias = writer.writeTable(TableEnum.TXS_TABLE); + String txsAlias = writer.writeTable(SqlTable.TXS_TABLE); writer.write(" WHERE "); writer.writeEqualsParameterAnd(relAlias, "rel_link_type_id", criteria.getType()); - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); int aSize = aliases.size(); for (int index = 0; index < aSize; index++) { String artAlias = aliases.get(index); 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 52226a3f6b3..ca75d643164 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 @@ -15,7 +15,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.List; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeSideExists; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -30,8 +30,8 @@ public class RelationTypeSideExistsSqlHandler extends AbstractRelationSqlHandler @Override public void addTables(AbstractSqlWriter writer) { super.addTables(writer); - relAlias = writer.addTable(TableEnum.RELATION_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + relAlias = writer.addTable(SqlTable.RELATION_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); } @Override @@ -42,7 +42,7 @@ public class RelationTypeSideExistsSqlHandler extends AbstractRelationSqlHandler writer.write(".rel_link_type_id = ?"); writer.addParameter(criteria.getType()); - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); String side = criteria.getType().getSide().isSideA() ? "a" : "b"; if (!aliases.isEmpty()) { writer.writeAndLn(); 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 d4354499ad3..7520950bd87 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 @@ -15,7 +15,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.List; import org.eclipse.osee.framework.core.data.RelationTypeSide; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaRelationTypeSideNotExists; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; @@ -30,13 +30,13 @@ public class RelationTypeSideNotExistsSqlHandler extends AbstractRelationSqlHand RelationTypeSide relationType = criteria.getType(); writer.write("NOT EXISTS (SELECT 1 FROM "); - String relAlias = writer.writeTable(TableEnum.RELATION_TABLE); + String relAlias = writer.writeTable(SqlTable.RELATION_TABLE); writer.write(", "); - String txsAlias = writer.writeTable(TableEnum.TXS_TABLE); + String txsAlias = writer.writeTable(SqlTable.TXS_TABLE); writer.write(" WHERE "); writer.writeEqualsParameterAnd(relAlias, "rel_link_type_id", relationType); - List<String> aliases = writer.getAliases(TableEnum.ARTIFACT_TABLE); + List<String> aliases = writer.getAliases(SqlTable.ARTIFACT_TABLE); String side = relationType.getSide().isSideA() ? "a" : "b"; int aSize = aliases.size(); for (int index = 0; index < aSize; index++) { diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxAuthorIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxAuthorIdsSqlHandler.java index 294233bd500..2e48e337836 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxAuthorIdsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxAuthorIdsSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class TxAuthorIdsSqlHandler extends MainTableFieldSqlHandler { public TxAuthorIdsSqlHandler() { - super(TableEnum.TX_DETAILS_TABLE, "author", SqlHandlerPriority.TX_AUTHOR); + super(SqlTable.TX_DETAILS_TABLE, "author", SqlHandlerPriority.TX_AUTHOR); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchIdsSqlHandler.java index 7335f9da36e..3c001cdb21d 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchIdsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxBranchIdsSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class TxBranchIdsSqlHandler extends MainTableFieldSqlHandler { public TxBranchIdsSqlHandler() { - super(TableEnum.TX_DETAILS_TABLE, "branch_id", SqlHandlerPriority.TX_BRANCH_ID); + super(SqlTable.TX_DETAILS_TABLE, "branch_id", SqlHandlerPriority.TX_BRANCH_ID); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommentSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommentSqlHandler.java index 7d5da447d68..526db1e7333 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommentSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommentSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxComment; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -34,7 +34,7 @@ public class TxCommentSqlHandler extends SqlHandler<CriteriaTxComment> { @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommitArtIdSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommitArtIdSqlHandler.java index 55962fb3376..fff28b3385c 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommitArtIdSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxCommitArtIdSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class TxCommitArtIdSqlHandler extends MainTableFieldSqlHandler { public TxCommitArtIdSqlHandler() { - super(TableEnum.TX_DETAILS_TABLE, "commit_art_id", SqlHandlerPriority.TX_COMMIT_ART_ID); + super(SqlTable.TX_DETAILS_TABLE, "commit_art_id", SqlHandlerPriority.TX_COMMIT_ART_ID); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateRangeSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateRangeSqlHandler.java index 0d8bb992442..dfb186f1554 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateRangeSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateRangeSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.sql.Timestamp; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaDateRange; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -35,7 +35,7 @@ public class TxDateRangeSqlHandler extends SqlHandler<CriteriaDateRange> { @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateWithOperatorSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateWithOperatorSqlHandler.java index b217ad1a238..6ba09545ef3 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateWithOperatorSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxDateWithOperatorSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.sql.Timestamp; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaDateWithOperator; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -36,7 +36,7 @@ public class TxDateWithOperatorSqlHandler extends SqlHandler<CriteriaDateWithOpe @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java index 2eb0151883d..06ffde9b188 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetHeadSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxGetHead; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -32,7 +32,7 @@ public class TxGetHeadSqlHandler extends SqlHandler<CriteriaTxGetHead> { @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override @@ -40,7 +40,7 @@ public class TxGetHeadSqlHandler extends SqlHandler<CriteriaTxGetHead> { writer.write(txdAlias); writer.write(".transaction_id = "); writer.write("(SELECT max(transaction_id) FROM "); - writer.write(TableEnum.TX_DETAILS_TABLE.getName()); + writer.write(SqlTable.TX_DETAILS_TABLE.getName()); writer.write(" WHERE "); writer.writeEqualsParameter("branch_id", criteria.getBranch()); writer.write(")"); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetPriorSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetPriorSqlHandler.java index 89ad97a5a68..98155ea5a73 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetPriorSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxGetPriorSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import org.eclipse.osee.framework.core.data.BranchId; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxGetPrior; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -33,7 +33,7 @@ public class TxGetPriorSqlHandler extends SqlHandler<CriteriaTxGetPrior> { @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override @@ -43,7 +43,7 @@ public class TxGetPriorSqlHandler extends SqlHandler<CriteriaTxGetPrior> { writer.write(txdAlias); writer.write(".transaction_id = "); writer.write("(SELECT max(transaction_id) FROM "); - writer.writeTableNoAlias(TableEnum.TX_DETAILS_TABLE); + writer.writeTableNoAlias(SqlTable.TX_DETAILS_TABLE); writer.write(" WHERE "); writer.writeEqualsParameterAnd("branch_id", branch); writer.write("transaction_id < ?"); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithOperatorSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithOperatorSqlHandler.java index 40a562e8fba..5d21af70e49 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithOperatorSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithOperatorSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxIdWithOperator; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -35,7 +35,7 @@ public class TxIdWithOperatorSqlHandler extends SqlHandler<CriteriaTxIdWithOpera @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithTwoOperatorsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithTwoOperatorsSqlHandler.java index 45774947e09..5ae96b64747 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithTwoOperatorsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdWithTwoOperatorsSqlHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaTxIdWithTwoOperators; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; @@ -35,7 +35,7 @@ public class TxIdWithTwoOperatorsSqlHandler extends SqlHandler<CriteriaTxIdWithT @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.getMainTableAlias(TableEnum.TX_DETAILS_TABLE); + txdAlias = writer.getMainTableAlias(SqlTable.TX_DETAILS_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdsSqlHandler.java index bb3da8b4a36..89bdc3f539b 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxIdsSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class TxIdsSqlHandler extends MainTableFieldSqlHandler { public TxIdsSqlHandler() { - super(TableEnum.TX_DETAILS_TABLE, "transaction_id", SqlHandlerPriority.TX_ID); + super(SqlTable.TX_DETAILS_TABLE, "transaction_id", SqlHandlerPriority.TX_ID); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxTypesSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxTypesSqlHandler.java index 29ff2818de5..4c840b677ba 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxTypesSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/TxTypesSqlHandler.java @@ -13,13 +13,13 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar */ public final class TxTypesSqlHandler extends MainTableFieldSqlHandler { public TxTypesSqlHandler() { - super(TableEnum.TX_DETAILS_TABLE, "tx_type", SqlHandlerPriority.TX_TYPE); + super(SqlTable.TX_DETAILS_TABLE, "tx_type", SqlHandlerPriority.TX_TYPE); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraAttributeDataSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraAttributeDataSqlHandler.java index 881627ea02d..89162d855c3 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraAttributeDataSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraAttributeDataSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; /** @@ -28,9 +28,9 @@ public class XtraAttributeDataSqlHandler extends AbstractXtraTableSqlHandler { @Override public void addTables(AbstractSqlWriter writer) { - attAlias = writer.addTable(TableEnum.ATTRIBUTE_TABLE, ObjectType.ATTRIBUTE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.ATTRIBUTE); - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); + attAlias = writer.addTable(SqlTable.ATTRIBUTE_TABLE, ObjectType.ATTRIBUTE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.ATTRIBUTE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraBranchDataSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraBranchDataSqlHandler.java index 1834e9ff3de..332fb1ff3e8 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraBranchDataSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraBranchDataSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; /** @@ -36,8 +36,8 @@ public class XtraBranchDataSqlHandler extends AbstractXtraTableSqlHandler { @Override public void addTables(AbstractSqlWriter writer) { - branchAlias = writer.addTable(TableEnum.BRANCH_TABLE, objectType); - txsAlias = writer.getFirstAlias(getLevel(), TableEnum.TXS_TABLE, objectType); + branchAlias = writer.addTable(SqlTable.BRANCH_TABLE, objectType); + txsAlias = writer.getFirstAlias(getLevel(), SqlTable.TXS_TABLE, objectType); } @Override diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraRelationDataSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraRelationDataSqlHandler.java index e1ae8b98a1c..137e098c158 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraRelationDataSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraRelationDataSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; /** @@ -31,13 +31,13 @@ public class XtraRelationDataSqlHandler extends AbstractXtraTableSqlHandler { @Override public void addTables(AbstractSqlWriter writer) { - itemAlias = writer.addTable(TableEnum.RELATION_TABLE); - txsAlias = writer.addTable(TableEnum.TXS_TABLE, ObjectType.RELATION); + itemAlias = writer.addTable(SqlTable.RELATION_TABLE); + txsAlias = writer.addTable(SqlTable.TXS_TABLE, ObjectType.RELATION); } @Override public void addPredicates(AbstractSqlWriter writer) { - String artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); + String artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); writer.write("("); writer.write(artAlias); writer.write(".art_id = "); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraTxDataSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraTxDataSqlHandler.java index 88adcce9dcc..99bead1b32d 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraTxDataSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/XtraTxDataSqlHandler.java @@ -14,7 +14,7 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; /** @@ -36,8 +36,8 @@ public class XtraTxDataSqlHandler extends AbstractXtraTableSqlHandler { @Override public void addTables(AbstractSqlWriter writer) { - txdAlias = writer.addTable(TableEnum.TX_DETAILS_TABLE, objectType); - txsAlias = writer.getFirstAlias(getLevel(), TableEnum.TXS_TABLE, objectType); + txdAlias = writer.addTable(SqlTable.TX_DETAILS_TABLE, objectType); + txsAlias = writer.getFirstAlias(getLevel(), SqlTable.TXS_TABLE, objectType); } @Override 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 962503d0931..3482403eac8 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 @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreTupleTypes; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.core.enums.TxCurrent; import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException; @@ -292,8 +292,8 @@ public abstract class AbstractSqlWriter implements HasOptions { handler.addTables(this); } if (queryDataCursor.getView().isValid()) { - tupleAlias = addTable(TableEnum.TUPLE2); - tupleTxsAlias = addTable(TableEnum.TXS_TABLE); + tupleAlias = addTable(SqlTable.TUPLE2); + tupleTxsAlias = addTable(SqlTable.TXS_TABLE); } } @@ -317,12 +317,12 @@ public abstract class AbstractSqlWriter implements HasOptions { } } - if (mainTableAliasExists(TableEnum.ARTIFACT_TABLE)) { + if (mainTableAliasExists(SqlTable.ARTIFACT_TABLE)) { if (!first) { write(" AND "); } - String mainTableAlias = getMainTableAlias(TableEnum.ARTIFACT_TABLE); - String mainTxsAlias = getMainTableAlias(TableEnum.TXS_TABLE); + String mainTableAlias = getMainTableAlias(SqlTable.ARTIFACT_TABLE); + String mainTxsAlias = getMainTableAlias(SqlTable.TXS_TABLE); writeEqualsAnd(mainTableAlias, mainTxsAlias, "gamma_id"); writeTxBranchFilter(mainTxsAlias); @@ -331,13 +331,13 @@ public abstract class AbstractSqlWriter implements HasOptions { writeEqualsParameterAnd(tupleAlias, "tuple_type", CoreTupleTypes.ViewApplicability); writeEqualsParameterAnd(tupleAlias, "e1", queryDataCursor.getView()); writeEqualsAnd(tupleAlias, tupleTxsAlias, "gamma_id"); - writeEqualsAnd(tupleAlias, "e2", getMainTableAlias(TableEnum.TXS_TABLE), "app_id"); + writeEqualsAnd(tupleAlias, "e2", getMainTableAlias(SqlTable.TXS_TABLE), "app_id"); writeTxBranchFilter(tupleTxsAlias); } } } - protected boolean mainTableAliasExists(TableEnum table) { + protected boolean mainTableAliasExists(SqlTable table) { return queryDataCursor.mainTableAliasExists(table); } @@ -357,28 +357,28 @@ public abstract class AbstractSqlWriter implements HasOptions { } } - protected boolean hasAlias(TableEnum table) { + protected boolean hasAlias(SqlTable table) { return getAliasManager().hasAlias(level, table, table.getObjectType()); } - public List<String> getAliases(TableEnum table) { + public List<String> getAliases(SqlTable table) { return getAliasManager().getAliases(level, table, table.getObjectType()); } - public String getFirstAlias(TableEnum table) { + public String getFirstAlias(SqlTable table) { return getFirstAlias(level, table, table.getObjectType()); } - public String getFirstAlias(int level, TableEnum table, ObjectType type) { + public String getFirstAlias(int level, SqlTable table, ObjectType type) { return getAliasManager().getFirstAlias(level, table, type); } - public String getLastAlias(TableEnum table) { + public String getLastAlias(SqlTable table) { ObjectType type = table.getObjectType(); return getAliasManager().getLastAlias(table, type); } - public String getNextAlias(TableEnum table) { + public String getNextAlias(SqlTable table) { return getNextAlias(table.getPrefix(), table.getObjectType()); } @@ -394,7 +394,7 @@ public abstract class AbstractSqlWriter implements HasOptions { return aliasManager; } - public String addTable(TableEnum table) { + public String addTable(SqlTable table) { return addTable(table, table.getObjectType()); } @@ -402,21 +402,21 @@ public abstract class AbstractSqlWriter implements HasOptions { tableEntries.add(tableName); } - public String addTable(TableEnum table, ObjectType objectType) { + public String addTable(SqlTable table, ObjectType objectType) { String alias = getNextAlias(table.getPrefix(), objectType); tableEntries.add(String.format("%s %s", table.getName(), alias)); return alias; } - public String getMainTableAlias(TableEnum table) { + public String getMainTableAlias(SqlTable table) { return queryDataCursor.getMainTableAlias(table, this::addTable); } - public void writeTableNoAlias(TableEnum table) { + public void writeTableNoAlias(SqlTable table) { write(table.getName()); } - public String writeTable(TableEnum table) { + public String writeTable(SqlTable table) { String alias = getNextAlias(table); write("%s %s", table.getName(), alias); return alias; diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/ObjectField.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/ObjectField.java index f3173448dcd..652064f848e 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/ObjectField.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/ObjectField.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.jdbc.SQL3DataType; /** @@ -31,71 +31,71 @@ import org.eclipse.osee.jdbc.SQL3DataType; */ public enum ObjectField { - branch_type(SQL3DataType.SMALLINT, TableEnum.BRANCH_TABLE, "branch_type"), - branch_id(true, SQL3DataType.BIGINT, TableEnum.BRANCH_TABLE, "branch_id"), - branch_name(SQL3DataType.VARCHAR, TableEnum.BRANCH_TABLE, "branch_name"), - branch_state(SQL3DataType.SMALLINT, TableEnum.BRANCH_TABLE, "branch_state"), - branch_archive_state(SQL3DataType.SMALLINT, TableEnum.BRANCH_TABLE, "archived"), - branch_parent_id(SQL3DataType.BIGINT, TableEnum.BRANCH_TABLE, "parent_branch_id"), - branch_parent_tx_id(SQL3DataType.INTEGER, TableEnum.BRANCH_TABLE, "parent_transaction_id"), - branch_baseline_tx_id(SQL3DataType.INTEGER, TableEnum.BRANCH_TABLE, "baseline_transaction_id"), - branch_inherit_access_cntrl(SQL3DataType.SMALLINT, TableEnum.BRANCH_TABLE, "inherit_access_control"), - branch_associated_art_id(SQL3DataType.INTEGER, TableEnum.BRANCH_TABLE, "associated_art_id"), + branch_type(SQL3DataType.SMALLINT, SqlTable.BRANCH_TABLE, "branch_type"), + branch_id(true, SQL3DataType.BIGINT, SqlTable.BRANCH_TABLE, "branch_id"), + branch_name(SQL3DataType.VARCHAR, SqlTable.BRANCH_TABLE, "branch_name"), + branch_state(SQL3DataType.SMALLINT, SqlTable.BRANCH_TABLE, "branch_state"), + branch_archive_state(SQL3DataType.SMALLINT, SqlTable.BRANCH_TABLE, "archived"), + branch_parent_id(SQL3DataType.BIGINT, SqlTable.BRANCH_TABLE, "parent_branch_id"), + branch_parent_tx_id(SQL3DataType.INTEGER, SqlTable.BRANCH_TABLE, "parent_transaction_id"), + branch_baseline_tx_id(SQL3DataType.INTEGER, SqlTable.BRANCH_TABLE, "baseline_transaction_id"), + branch_inherit_access_cntrl(SQL3DataType.SMALLINT, SqlTable.BRANCH_TABLE, "inherit_access_control"), + branch_associated_art_id(SQL3DataType.INTEGER, SqlTable.BRANCH_TABLE, "associated_art_id"), - tx_type(SQL3DataType.SMALLINT, TableEnum.TX_DETAILS_TABLE, "tx_type"), - tx_id(true, SQL3DataType.INTEGER, TableEnum.TXS_TABLE, "transaction_id"), - tx_current(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "tx_current"), - tx_comment(SQL3DataType.VARCHAR, TableEnum.TX_DETAILS_TABLE, "osee_comment"), - tx_date(SQL3DataType.TIMESTAMP, TableEnum.TX_DETAILS_TABLE, "time"), - tx_branch_id(SQL3DataType.BIGINT, TableEnum.TX_DETAILS_TABLE, "branch_id"), - tx_author_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "author"), - tx_commit_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "commit_art_id"), + tx_type(SQL3DataType.SMALLINT, SqlTable.TX_DETAILS_TABLE, "tx_type"), + tx_id(true, SQL3DataType.INTEGER, SqlTable.TXS_TABLE, "transaction_id"), + tx_current(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "tx_current"), + tx_comment(SQL3DataType.VARCHAR, SqlTable.TX_DETAILS_TABLE, "osee_comment"), + tx_date(SQL3DataType.TIMESTAMP, SqlTable.TX_DETAILS_TABLE, "time"), + tx_branch_id(SQL3DataType.BIGINT, SqlTable.TX_DETAILS_TABLE, "branch_id"), + tx_author_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "author"), + tx_commit_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "commit_art_id"), - art_type(SQL3DataType.BIGINT, TableEnum.ARTIFACT_TABLE, "art_type_id"), - art_id(true, SQL3DataType.INTEGER, TableEnum.ARTIFACT_TABLE, "art_id"), - art_gamma_id(true, SQL3DataType.BIGINT, TableEnum.ARTIFACT_TABLE, "gamma_id"), - art_guid(SQL3DataType.VARCHAR, TableEnum.ARTIFACT_TABLE, "guid"), - art_mod_type(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "mod_type"), - art_tx_id(true, SQL3DataType.INTEGER, TableEnum.TXS_TABLE, "transaction_id"), - art_tx_current(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "tx_current"), - art_tx_branch_id(SQL3DataType.BIGINT, TableEnum.TXS_TABLE, "branch_id"), - art_tx_type(SQL3DataType.SMALLINT, TableEnum.TX_DETAILS_TABLE, "tx_type"), - art_tx_comment(SQL3DataType.VARCHAR, TableEnum.TX_DETAILS_TABLE, "osee_comment"), - art_tx_date(SQL3DataType.TIMESTAMP, TableEnum.TX_DETAILS_TABLE, "time"), - art_tx_author_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "author"), - art_tx_commit_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "commit_art_id"), + art_type(SQL3DataType.BIGINT, SqlTable.ARTIFACT_TABLE, "art_type_id"), + art_id(true, SQL3DataType.INTEGER, SqlTable.ARTIFACT_TABLE, "art_id"), + art_gamma_id(true, SQL3DataType.BIGINT, SqlTable.ARTIFACT_TABLE, "gamma_id"), + art_guid(SQL3DataType.VARCHAR, SqlTable.ARTIFACT_TABLE, "guid"), + art_mod_type(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "mod_type"), + art_tx_id(true, SQL3DataType.INTEGER, SqlTable.TXS_TABLE, "transaction_id"), + art_tx_current(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "tx_current"), + art_tx_branch_id(SQL3DataType.BIGINT, SqlTable.TXS_TABLE, "branch_id"), + art_tx_type(SQL3DataType.SMALLINT, SqlTable.TX_DETAILS_TABLE, "tx_type"), + art_tx_comment(SQL3DataType.VARCHAR, SqlTable.TX_DETAILS_TABLE, "osee_comment"), + art_tx_date(SQL3DataType.TIMESTAMP, SqlTable.TX_DETAILS_TABLE, "time"), + art_tx_author_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "author"), + art_tx_commit_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "commit_art_id"), - attr_type(SQL3DataType.BIGINT, TableEnum.ATTRIBUTE_TABLE, "attr_type_id"), - attr_id(true, SQL3DataType.INTEGER, TableEnum.ATTRIBUTE_TABLE, "attr_id"), - attr_gamma_id(true, SQL3DataType.BIGINT, TableEnum.ATTRIBUTE_TABLE, "gamma_id"), - attr_ds_value(SQL3DataType.VARCHAR, TableEnum.ATTRIBUTE_TABLE, "value"), - attr_ds_uri(SQL3DataType.VARCHAR, TableEnum.ATTRIBUTE_TABLE, "uri"), - attr_value(SQL3DataType.VARCHAR, TableEnum.ATTRIBUTE_TABLE, "attr_type_id", "uri", "value"), - attr_mod_type(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "mod_type"), - attr_tx_id(true, SQL3DataType.INTEGER, TableEnum.TXS_TABLE, "transaction_id"), - attr_tx_current(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "tx_current"), - attr_tx_branch_id(SQL3DataType.BIGINT, TableEnum.TXS_TABLE, "branch_id"), - attr_tx_type(SQL3DataType.SMALLINT, TableEnum.TX_DETAILS_TABLE, "tx_type"), - attr_tx_comment(SQL3DataType.VARCHAR, TableEnum.TX_DETAILS_TABLE, "osee_comment"), - attr_tx_date(SQL3DataType.TIMESTAMP, TableEnum.TX_DETAILS_TABLE, "time"), - attr_tx_author_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "author"), - attr_tx_commit_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "commit_art_id"), + attr_type(SQL3DataType.BIGINT, SqlTable.ATTRIBUTE_TABLE, "attr_type_id"), + attr_id(true, SQL3DataType.INTEGER, SqlTable.ATTRIBUTE_TABLE, "attr_id"), + attr_gamma_id(true, SQL3DataType.BIGINT, SqlTable.ATTRIBUTE_TABLE, "gamma_id"), + attr_ds_value(SQL3DataType.VARCHAR, SqlTable.ATTRIBUTE_TABLE, "value"), + attr_ds_uri(SQL3DataType.VARCHAR, SqlTable.ATTRIBUTE_TABLE, "uri"), + attr_value(SQL3DataType.VARCHAR, SqlTable.ATTRIBUTE_TABLE, "attr_type_id", "uri", "value"), + attr_mod_type(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "mod_type"), + attr_tx_id(true, SQL3DataType.INTEGER, SqlTable.TXS_TABLE, "transaction_id"), + attr_tx_current(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "tx_current"), + attr_tx_branch_id(SQL3DataType.BIGINT, SqlTable.TXS_TABLE, "branch_id"), + attr_tx_type(SQL3DataType.SMALLINT, SqlTable.TX_DETAILS_TABLE, "tx_type"), + attr_tx_comment(SQL3DataType.VARCHAR, SqlTable.TX_DETAILS_TABLE, "osee_comment"), + attr_tx_date(SQL3DataType.TIMESTAMP, SqlTable.TX_DETAILS_TABLE, "time"), + attr_tx_author_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "author"), + attr_tx_commit_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "commit_art_id"), - rel_type(SQL3DataType.BIGINT, TableEnum.RELATION_TABLE, "rel_link_type_id"), - rel_id(true, SQL3DataType.INTEGER, TableEnum.RELATION_TABLE, "rel_link_id"), - rel_gamma_id(true, SQL3DataType.BIGINT, TableEnum.RELATION_TABLE, "gamma_id"), - rel_rationale(SQL3DataType.VARCHAR, TableEnum.RELATION_TABLE, "rationale"), - rel_a_art_id(SQL3DataType.INTEGER, TableEnum.RELATION_TABLE, "a_art_id"), - rel_b_art_id(SQL3DataType.INTEGER, TableEnum.RELATION_TABLE, "b_art_id"), - rel_mod_type(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "mod_type"), - rel_tx_id(true, SQL3DataType.INTEGER, TableEnum.TXS_TABLE, "transaction_id"), - rel_tx_current(SQL3DataType.SMALLINT, TableEnum.TXS_TABLE, "tx_current"), - rel_tx_branch_id(SQL3DataType.BIGINT, TableEnum.TXS_TABLE, "branch_id"), - rel_tx_type(SQL3DataType.SMALLINT, TableEnum.TX_DETAILS_TABLE, "tx_type"), - rel_tx_comment(SQL3DataType.VARCHAR, TableEnum.TX_DETAILS_TABLE, "osee_comment"), - rel_tx_date(SQL3DataType.TIMESTAMP, TableEnum.TX_DETAILS_TABLE, "time"), - rel_tx_author_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "author"), - rel_tx_commit_id(SQL3DataType.INTEGER, TableEnum.TX_DETAILS_TABLE, "commit_art_id"); + rel_type(SQL3DataType.BIGINT, SqlTable.RELATION_TABLE, "rel_link_type_id"), + rel_id(true, SQL3DataType.INTEGER, SqlTable.RELATION_TABLE, "rel_link_id"), + rel_gamma_id(true, SQL3DataType.BIGINT, SqlTable.RELATION_TABLE, "gamma_id"), + rel_rationale(SQL3DataType.VARCHAR, SqlTable.RELATION_TABLE, "rationale"), + rel_a_art_id(SQL3DataType.INTEGER, SqlTable.RELATION_TABLE, "a_art_id"), + rel_b_art_id(SQL3DataType.INTEGER, SqlTable.RELATION_TABLE, "b_art_id"), + rel_mod_type(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "mod_type"), + rel_tx_id(true, SQL3DataType.INTEGER, SqlTable.TXS_TABLE, "transaction_id"), + rel_tx_current(SQL3DataType.SMALLINT, SqlTable.TXS_TABLE, "tx_current"), + rel_tx_branch_id(SQL3DataType.BIGINT, SqlTable.TXS_TABLE, "branch_id"), + rel_tx_type(SQL3DataType.SMALLINT, SqlTable.TX_DETAILS_TABLE, "tx_type"), + rel_tx_comment(SQL3DataType.VARCHAR, SqlTable.TX_DETAILS_TABLE, "osee_comment"), + rel_tx_date(SQL3DataType.TIMESTAMP, SqlTable.TX_DETAILS_TABLE, "time"), + rel_tx_author_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "author"), + rel_tx_commit_id(SQL3DataType.INTEGER, SqlTable.TX_DETAILS_TABLE, "commit_art_id"); public static enum Family { UNDEFINED, @@ -115,16 +115,16 @@ public enum ObjectField { private final ObjectType objectType; private final Family family; - private final TableEnum table; + private final SqlTable table; private final String[] columnName; private final boolean primaryKey; private final SQL3DataType dataType; - private ObjectField(SQL3DataType dataType, TableEnum table, String... columnName) { + private ObjectField(SQL3DataType dataType, SqlTable table, String... columnName) { this(false, dataType, table, columnName); } - private ObjectField(boolean primaryKey, SQL3DataType dataType, TableEnum table, String... columnName) { + private ObjectField(boolean primaryKey, SQL3DataType dataType, SqlTable table, String... columnName) { this.family = family(this); this.objectType = objectType(this); this.dataType = dataType; @@ -145,7 +145,7 @@ public enum ObjectField { return dataType; } - public TableEnum getTable() { + public SqlTable getTable() { return table; } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SelectiveArtifactSqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SelectiveArtifactSqlWriter.java index edc3a9730a9..3df9b1dd302 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SelectiveArtifactSqlWriter.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SelectiveArtifactSqlWriter.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; import org.eclipse.osee.framework.core.data.AttributeTypeId; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.type.Id; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.jdbc.JdbcClient; @@ -204,7 +204,7 @@ public class SelectiveArtifactSqlWriter extends AbstractSqlWriter { @Override public void addTables(AbstractSqlWriter writer) { writer.addTable(relsAlias); - artAlias = writer.getMainTableAlias(TableEnum.ARTIFACT_TABLE); + artAlias = writer.getMainTableAlias(SqlTable.ARTIFACT_TABLE); } @Override @@ -262,8 +262,8 @@ public class SelectiveArtifactSqlWriter extends AbstractSqlWriter { @Override protected void writeSelectFields() { - String artAlias = getMainTableAlias(TableEnum.ARTIFACT_TABLE); - String txAlias = getMainTableAlias(TableEnum.TXS_TABLE); + String artAlias = getMainTableAlias(SqlTable.ARTIFACT_TABLE); + String txAlias = getMainTableAlias(SqlTable.TXS_TABLE); if (relsAlias == null) { writeSelectFields(artAlias, "art_id", artAlias, "art_type_id", txAlias, "app_id", txAlias, "transaction_id", txAlias, "mod_type"); @@ -280,7 +280,7 @@ public class SelectiveArtifactSqlWriter extends AbstractSqlWriter { protected void writeSelect(Iterable<SqlHandler<?>> handlers) { writeSelectAndHint(); if (rootQueryData.isCountQueryType()) { - writeSelectFields(getMainTableAlias(TableEnum.ARTIFACT_TABLE), "art_id"); + writeSelectFields(getMainTableAlias(SqlTable.ARTIFACT_TABLE), "art_id"); } else { writeSelectFields(); for (SqlHandler<?> handler : handlers) { diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlAliasManager.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlAliasManager.java index 6e58dc0de67..7f2da71678d 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlAliasManager.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlAliasManager.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; /** * @author Roberto E. Escobar @@ -45,11 +45,11 @@ public class SqlAliasManager { return dataSet; } - public boolean hasAlias(int level, TableEnum table, ObjectType objectType) { + public boolean hasAlias(int level, SqlTable table, ObjectType objectType) { return !getAliases(level, table, objectType).isEmpty(); } - public List<String> getAliases(int level, TableEnum table, ObjectType objectType) { + public List<String> getAliases(int level, SqlTable table, ObjectType objectType) { List<String> toReturn; AliasSet dataSet = getAliasByLevel(level); if (dataSet != null) { @@ -64,12 +64,12 @@ public class SqlAliasManager { return toReturn; } - public String getFirstAlias(int level, TableEnum table, ObjectType objectType) { + public String getFirstAlias(int level, SqlTable table, ObjectType objectType) { Collection<String> aliases = getAliases(level, table, objectType); return Iterables.getFirst(aliases, null); } - public String getLastAlias(TableEnum table, ObjectType objectType) { + public String getLastAlias(SqlTable table, ObjectType objectType) { Collection<String> aliases = getAliases(level, table, objectType); return Iterables.getLast(aliases, null); } @@ -85,7 +85,7 @@ public class SqlAliasManager { return aliasValue; } - public void putAlias(TableEnum table, ObjectType type, String alias) { + public void putAlias(SqlTable table, ObjectType type, String alias) { String prefix = table.getPrefix(); putAlias(prefix, type, alias); } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlFieldResolver.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlFieldResolver.java index 72169c5fe11..2cf18122bc6 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlFieldResolver.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/SqlFieldResolver.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import org.eclipse.osee.framework.core.enums.ObjectType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.jdk.core.type.CountingMap; import org.eclipse.osee.orcs.core.ds.DynamicData; import org.eclipse.osee.orcs.core.ds.DynamicObject; @@ -200,7 +200,7 @@ public final class SqlFieldResolver { data.setPrimaryKey(field.isPrimaryKey()); data.setHidden(hidden); - TableEnum table = field.getTable(); + SqlTable table = field.getTable(); ObjectType type = field.getType(); String alias = aliasManager.getFirstAlias(level, table, type); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/ComodificationCheck.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/ComodificationCheck.java index 72e9f995628..e7f2efb737a 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/ComodificationCheck.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/ComodificationCheck.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.GammaId; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.core.executor.HasCancellation; import org.eclipse.osee.framework.jdk.core.type.OseeStateException; import org.eclipse.osee.orcs.OrcsSession; @@ -133,7 +133,7 @@ public class ComodificationCheck implements TransactionProcessor { } @Override - public void deleteTuple(BranchId branch, TableEnum tupleTable, GammaId gammaId) { + public void deleteTuple(BranchId branch, SqlTable tupleTable, GammaId gammaId) { // tuples do not support modification (only create and delete) } } diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java index b835982ffa2..cb5df6cd618 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderImpl.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.core.data.Tuple2Type; import org.eclipse.osee.framework.core.data.Tuple3Type; import org.eclipse.osee.framework.core.data.TupleTypeId; import org.eclipse.osee.framework.core.enums.ModificationType; -import org.eclipse.osee.framework.core.enums.TableEnum; +import org.eclipse.osee.framework.core.enums.SqlTable; import org.eclipse.osee.framework.core.enums.TxCurrent; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.jdk.core.type.ItemDoesNotExist; @@ -181,13 +181,13 @@ public class TxSqlBuilderImpl implements OrcsVisitor, TxSqlBuilder { } @Override - public void deleteTuple(BranchId branch, TableEnum tupleTable, GammaId gammaId) { + public void deleteTuple(BranchId branch, SqlTable tupleTable, GammaId gammaId) { SqlOrderEnum sqlEnum; - if (tupleTable.equals(TableEnum.TUPLE2)) { + if (tupleTable.equals(SqlTable.TUPLE2)) { sqlEnum = SqlOrderEnum.TUPLES2; - } else if (tupleTable.equals(TableEnum.TUPLE3)) { + } else if (tupleTable.equals(SqlTable.TUPLE3)) { sqlEnum = SqlOrderEnum.TUPLES3; - } else if (tupleTable.equals(TableEnum.TUPLE4)) { + } else if (tupleTable.equals(SqlTable.TUPLE4)) { sqlEnum = SqlOrderEnum.TUPLES4; } else { throw new OseeStateException("Unexpected table enum [%s]", tupleTable); |