Repository: sqoop Updated Branches: refs/heads/sqoop2 236b9ef9c -> 938317c3d
SQOOP-1925: Sqoop2: Clean up duplicate constants in DerbySchemaConstants, use CommonRepoConstants (Veena Basavaraj via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/938317c3 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/938317c3 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/938317c3 Branch: refs/heads/sqoop2 Commit: 938317c3d0bf1ab911f0c7a741c563bedd19111d Parents: 236b9ef Author: Abraham Elmahrek <[email protected]> Authored: Thu Dec 18 16:20:40 2014 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Thu Dec 18 16:20:40 2014 -0800 ---------------------------------------------------------------------- .../common/CommonRepositorySchemaConstants.java | 8 +- .../repository/derby/DerbySchemaConstants.java | 442 +++++++------------ .../derby/DerbySchemaCreateQuery.java | 2 + ...erbySchemaInsertUpdateDeleteSelectQuery.java | 2 + .../derby/DerbySchemaUpgradeQuery.java | 2 +- 5 files changed, 177 insertions(+), 279 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/938317c3/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositorySchemaConstants.java ---------------------------------------------------------------------- diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositorySchemaConstants.java b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositorySchemaConstants.java index 173dcb8..4daf203 100644 --- a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositorySchemaConstants.java +++ b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositorySchemaConstants.java @@ -17,11 +17,15 @@ */ package org.apache.sqoop.repository.common; +// NOTE: This contains and should only contain common repo constants +// PLEASE DO NOT ADD SPECIFIC REPO CONSTANTS HERE public final class CommonRepositorySchemaConstants { public static final String SCHEMA_SQOOP = "SQOOP"; - private static final String SCHEMA_PREFIX = SCHEMA_SQOOP + "."; + public static final String SCHEMA_PREFIX = SCHEMA_SQOOP + "."; + + public static final String CONSTRAINT_PREFIX = "FK_"; // SQ_DIRECTION @@ -56,6 +60,8 @@ public final class CommonRepositorySchemaConstants { public static final String TABLE_SQ_CONNECTOR_DIRECTIONS = SCHEMA_PREFIX + TABLE_SQ_CONNECTOR_DIRECTIONS_NAME; + public static final String COLUMN_SQCD_ID = "SQCD_ID"; + public static final String COLUMN_SQCD_CONNECTOR = "SQCD_CONNECTOR"; public static final String COLUMN_SQCD_DIRECTION = "SQCD_DIRECTION"; http://git-wip-us.apache.org/repos/asf/sqoop/blob/938317c3/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaConstants.java ---------------------------------------------------------------------- diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaConstants.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaConstants.java index 3d15e47..cdb629d 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaConstants.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaConstants.java @@ -17,232 +17,187 @@ */ package org.apache.sqoop.repository.derby; +import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*; + import java.util.HashSet; import java.util.Set; +// NOTE: This contains and should only contain derby specific constants, such as the ones that existed before +// and are relevant to only derby before migrating to the newer names +// PLEASE DO NOT ADD COMMON CONSTANTS HERE public final class DerbySchemaConstants { - public static final String SCHEMA_SQOOP = "SQOOP"; - - private static final String SCHEMA_PREFIX = SCHEMA_SQOOP + "."; - - private static final String CONSTRAINT_PREFIX = "FK_"; - - // SQ_SYSTEM + // SQ_SYSTEM relevant only in derby public static final String TABLE_SQ_SYSTEM_NAME = "SQ_SYSTEM"; - public static final String TABLE_SQ_SYSTEM = SCHEMA_PREFIX + TABLE_SQ_SYSTEM_NAME; - public static final String COLUMN_SQM_ID = "SQM_ID"; - public static final String COLUMN_SQM_KEY = "SQM_KEY"; - public static final String COLUMN_SQM_VALUE = "SQM_VALUE"; - // SQ_DIRECTION - public static final String TABLE_SQ_DIRECTION_NAME = "SQ_DIRECTION"; - - public static final String TABLE_SQ_DIRECTION = SCHEMA_PREFIX + TABLE_SQ_DIRECTION_NAME; - - public static final String COLUMN_SQD_ID = "SQD_ID"; - - public static final String COLUMN_SQD_NAME = "SQD_NAME"; - // SQ_CONNECTOR - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String TABLE_SQ_CONNECTOR_NAME = "SQ_CONNECTOR"; - // SQ_CONFIGURABLE - public static final String TABLE_SQ_CONFIGURABLE_NAME = "SQ_CONFIGURABLE"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String TABLE_SQ_CONNECTOR = SCHEMA_PREFIX + TABLE_SQ_CONNECTOR_NAME; - public static final String TABLE_SQ_CONFIGURABLE = SCHEMA_PREFIX + TABLE_SQ_CONFIGURABLE_NAME; - - public static final String COLUMN_SQC_ID = "SQC_ID"; - - public static final String COLUMN_SQC_NAME = "SQC_NAME"; - - public static final String COLUMN_SQC_CLASS = "SQC_CLASS"; - - public static final String COLUMN_SQC_VERSION = "SQC_VERSION"; - - public static final String COLUMN_SQC_TYPE = "SQC_TYPE"; - - public static final String CONSTRAINT_SQ_CONFIGURABLE_UNIQUE_NAME = CONSTRAINT_PREFIX + "SQC_NAME_UNIQUE"; - public static final String CONSTRAINT_SQ_CONFIGURABLE_UNIQUE = SCHEMA_PREFIX + CONSTRAINT_SQ_CONFIGURABLE_UNIQUE_NAME; - - // SQ_CONNECTOR_DIRECTIONS - - public static final String TABLE_SQ_CONNECTOR_DIRECTIONS_NAME = "SQ_CONNECTOR_DIRECTIONS"; - - public static final String TABLE_SQ_CONNECTOR_DIRECTIONS = SCHEMA_PREFIX - + TABLE_SQ_CONNECTOR_DIRECTIONS_NAME; - - public static final String COLUMN_SQCD_ID = "SQCD_ID"; - - public static final String COLUMN_SQCD_CONNECTOR = "SQCD_CONNECTOR"; - - public static final String COLUMN_SQCD_DIRECTION = "SQCD_DIRECTION"; + // constraints relevant only in derby public static final String CONSTRAINT_SQCD_SQC_NAME = CONSTRAINT_PREFIX + "SQCD_SQC"; - // FK to the SQ_CONNECTOR table + // FK to the SQ_CONNECTOR table public static final String CONSTRAINT_SQCD_SQC = SCHEMA_PREFIX + CONSTRAINT_SQCD_SQC_NAME; - public static final String CONSTRAINT_SQCD_SQD_NAME = CONSTRAINT_PREFIX + "SQCD_SQD"; - // FK to the SQ_DIRECTION able + // FK to the SQ_DIRECTION table public static final String CONSTRAINT_SQCD_SQD = SCHEMA_PREFIX + CONSTRAINT_SQCD_SQD_NAME; + // SQ_CONFIGURABLE + //constraint only relevant in derby + public static final String CONSTRAINT_SQ_CONFIGURABLE_UNIQUE_NAME = CONSTRAINT_PREFIX + + "SQC_NAME_UNIQUE"; + public static final String CONSTRAINT_SQ_CONFIGURABLE_UNIQUE = SCHEMA_PREFIX + + CONSTRAINT_SQ_CONFIGURABLE_UNIQUE_NAME; + + // SQ_CONFIG_DIRECTION + // only relevant in derby + public static final String COLUMN_SQ_CFG_DIR_ID = "SQ_CFG_DIR_ID"; + // SQ_CONFIG - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String TABLE_SQ_FORM_NAME = "SQ_FORM"; - public static final String TABLE_SQ_CONFIG_NAME = "SQ_CONFIG"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String TABLE_SQ_FORM = SCHEMA_PREFIX + TABLE_SQ_FORM_NAME; - public static final String TABLE_SQ_CONFIG = SCHEMA_PREFIX + TABLE_SQ_CONFIG_NAME; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_ID = "SQF_ID"; - public static final String COLUMN_SQ_CFG_ID = "SQ_CFG_ID"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_CONNECTOR = "SQF_CONNECTOR"; - @Deprecated // used only for upgrade path + @Deprecated + // used only for upgrade path public static final String COLUMN_SQ_CFG_CONNECTOR = "SQ_CFG_CONNECTOR"; - // note this column was renamed again - public static final String COLUMN_SQ_CFG_CONFIGURABLE = "SQ_CFG_CONFIGURABLE"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_OPERATION = "SQF_OPERATION"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_DIRECTION = "SQF_DIRECTION"; - public static final String COLUMN_SQ_CFG_DIRECTION = "SQ_CFG_DIRECTION"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_NAME = "SQF_NAME"; - public static final String COLUMN_SQ_CFG_NAME = "SQ_CFG_NAME"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_TYPE = "SQF_TYPE"; - public static final String COLUMN_SQ_CFG_TYPE = "SQ_CFG_TYPE"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQF_INDEX = "SQF_INDEX"; - public static final String COLUMN_SQ_CFG_INDEX = "SQ_CFG_INDEX"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQF_SQC_NAME = CONSTRAINT_PREFIX + "SQF_SQC"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQF_SQC = SCHEMA_PREFIX + CONSTRAINT_SQF_SQC_NAME; - // FK constraint on configurable - public static final String CONSTRAINT_SQ_CFG_SQC_NAME = CONSTRAINT_PREFIX + "SQ_CFG_SQC"; - public static final String CONSTRAINT_SQ_CFG_SQC = SCHEMA_PREFIX + CONSTRAINT_SQ_CFG_SQC_NAME; - - // uniqueness constraint - public static final String CONSTRAINT_SQ_CONFIG_UNIQUE_NAME_TYPE_CONFIGURABLE = CONSTRAINT_PREFIX + "SQ_CFG_NAME_TYPE_CONFIGURABLE_UNIQUE"; - public static final String CONSTRAINT_SQ_CONFIG_UNIQUE = SCHEMA_PREFIX + CONSTRAINT_SQ_CONFIG_UNIQUE_NAME_TYPE_CONFIGURABLE; - - // SQ_CONFIG_DIRECTIONS - - public static final String TABLE_SQ_CONFIG_DIRECTIONS_NAME = "SQ_CONFIG_DIRECTIONS"; - - public static final String TABLE_SQ_CONFIG_DIRECTIONS = SCHEMA_PREFIX - + TABLE_SQ_CONFIG_DIRECTIONS_NAME; - - public static final String COLUMN_SQ_CFG_DIR_ID = "SQ_CFG_DIR_ID"; - - @Deprecated // used only for the upgrade code + @Deprecated + // used only for the upgrade code public static final String COLUMN_SQ_CFG_DIR_FORM = "SQ_CFG_DIR_FORM"; - public static final String COLUMN_SQ_CFG_DIR_CONFIG = "SQ_CFG_DIR_CONFIG"; - public static final String COLUMN_SQ_CFG_DIR_DIRECTION = "SQ_CFG_DIR_DIRECTION"; - - public static final String CONSTRAINT_SQ_CFG_DIR_CONFIG_NAME = CONSTRAINT_PREFIX + "SQ_CFG_DIR_CONFIG"; + // constraint relevant only in derby + public static final String CONSTRAINT_SQ_CFG_DIR_CONFIG_NAME = CONSTRAINT_PREFIX + + "SQ_CFG_DIR_CONFIG"; // this is a FK to the SQ_CONFIG table - public static final String CONSTRAINT_SQ_CFG_DIR_CONFIG = SCHEMA_PREFIX + CONSTRAINT_SQ_CFG_DIR_CONFIG_NAME; + public static final String CONSTRAINT_SQ_CFG_DIR_CONFIG = SCHEMA_PREFIX + + CONSTRAINT_SQ_CFG_DIR_CONFIG_NAME; - public static final String CONSTRAINT_SQ_CFG_DIR_DIRECTION_NAME = CONSTRAINT_PREFIX + "SQ_CFG_DIR_DIRECTION"; + public static final String CONSTRAINT_SQ_CFG_DIR_DIRECTION_NAME = CONSTRAINT_PREFIX + + "SQ_CFG_DIR_DIRECTION"; // this a FK to the SQ_DIRECTION table - public static final String CONSTRAINT_SQ_CFG_DIR_DIRECTION = SCHEMA_PREFIX + CONSTRAINT_SQ_CFG_DIR_DIRECTION_NAME; - - // SQ_INPUT + public static final String CONSTRAINT_SQ_CFG_DIR_DIRECTION = SCHEMA_PREFIX + + CONSTRAINT_SQ_CFG_DIR_DIRECTION_NAME; - public static final String TABLE_SQ_INPUT_NAME = "SQ_INPUT"; - - public static final String TABLE_SQ_INPUT = SCHEMA_PREFIX + TABLE_SQ_INPUT_NAME; - - public static final String COLUMN_SQI_ID = "SQI_ID"; + // FK constraint on configurable + public static final String CONSTRAINT_SQ_CFG_SQC_NAME = CONSTRAINT_PREFIX + "SQ_CFG_SQC"; + public static final String CONSTRAINT_SQ_CFG_SQC = SCHEMA_PREFIX + CONSTRAINT_SQ_CFG_SQC_NAME; - public static final String COLUMN_SQI_NAME = "SQI_NAME"; + // uniqueness constraint + public static final String CONSTRAINT_SQ_CONFIG_UNIQUE_NAME_TYPE_CONFIGURABLE = CONSTRAINT_PREFIX + + "SQ_CFG_NAME_TYPE_CONFIGURABLE_UNIQUE"; + public static final String CONSTRAINT_SQ_CONFIG_UNIQUE = SCHEMA_PREFIX + + CONSTRAINT_SQ_CONFIG_UNIQUE_NAME_TYPE_CONFIGURABLE; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQI_FORM = "SQI_FORM"; - public static final String COLUMN_SQI_CONFIG = "SQI_CONFIG"; - - public static final String COLUMN_SQI_INDEX = "SQI_INDEX"; - - public static final String COLUMN_SQI_TYPE = "SQI_TYPE"; - public static final String COLUMN_SQI_STRMASK = "SQI_STRMASK"; - - public static final String COLUMN_SQI_STRLENGTH = "SQI_STRLENGTH"; - - public static final String COLUMN_SQI_ENUMVALS = "SQI_ENUMVALS"; - - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQI_SQF_NAME = CONSTRAINT_PREFIX + "SQI_SQF"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQI_SQF = SCHEMA_PREFIX + CONSTRAINT_SQI_SQF_NAME; + // constraints relevant only in derby + public static final String CONSTRAINT_SQI_SQ_CFG_NAME = CONSTRAINT_PREFIX + "SQI_SQ_CFG"; public static final String CONSTRAINT_SQI_SQ_CFG = SCHEMA_PREFIX + CONSTRAINT_SQI_SQ_CFG_NAME; // uniqueness constraint - public static final String CONSTRAINT_SQ_INPUT_UNIQUE_NAME_TYPE_CONFIG = CONSTRAINT_PREFIX + "SQI_NAME_TYPE_CONFIG_UNIQUE"; - public static final String CONSTRAINT_SQ_INPUT_UNIQUE = SCHEMA_PREFIX + CONSTRAINT_SQ_INPUT_UNIQUE_NAME_TYPE_CONFIG; + public static final String CONSTRAINT_SQ_INPUT_UNIQUE_NAME_TYPE_CONFIG = CONSTRAINT_PREFIX + + "SQI_NAME_TYPE_CONFIG_UNIQUE"; + public static final String CONSTRAINT_SQ_INPUT_UNIQUE = SCHEMA_PREFIX + + CONSTRAINT_SQ_INPUT_UNIQUE_NAME_TYPE_CONFIG; // SQ_LINK - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String TABLE_SQ_CONNECTION_NAME = "SQ_CONNECTION"; - public static final String TABLE_SQ_LINK_NAME = "SQ_LINK"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String TABLE_SQ_CONNECTION = SCHEMA_PREFIX + TABLE_SQ_CONNECTION_NAME; - public static final String TABLE_SQ_LINK = SCHEMA_PREFIX + TABLE_SQ_LINK_NAME; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_ID = "SQN_ID"; - public static final String COLUMN_SQ_LNK_ID = "SQ_LNK_ID"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_NAME = "SQN_NAME"; - public static final String COLUMN_SQ_LNK_NAME = "SQ_LNK_NAME"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_CONNECTOR = "SQN_CONNECTOR"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQ_LNK_CONNECTOR = "SQ_LNK_CONNECTOR"; - // Note this column has been renamed twice - public static final String COLUMN_SQ_LNK_CONFIGURABLE = "SQ_LNK_CONFIGURABLE"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_CREATION_USER = "SQN_CREATION_USER"; - public static final String COLUMN_SQ_LNK_CREATION_USER = "SQ_LNK_CREATION_USER"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_CREATION_DATE = "SQN_CREATION_DATE"; - public static final String COLUMN_SQ_LNK_CREATION_DATE = "SQ_LNK_CREATION_DATE"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_UPDATE_USER = "SQN_UPDATE_USER"; - public static final String COLUMN_SQ_LNK_UPDATE_USER = "SQ_LNK_UPDATE_USER"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_UPDATE_DATE = "SQN_UPDATE_DATE"; - public static final String COLUMN_SQ_LNK_UPDATE_DATE = "SQ_LNK_UPDATE_DATE"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String COLUMN_SQN_ENABLED = "SQN_ENABLED"; - public static final String COLUMN_SQ_LNK_ENABLED = "SQ_LNK_ENABLED"; - + // constraints relevant only in derby @Deprecated public static final String CONSTRAINT_SQN_SQC_NAME = CONSTRAINT_PREFIX + "SQN_SQC"; public static final String CONSTRAINT_SQ_LNK_SQC_NAME = CONSTRAINT_PREFIX + "SQ_LNK_SQC"; @@ -252,120 +207,113 @@ public final class DerbySchemaConstants { // FK constraint on the connector configurable public static final String CONSTRAINT_SQ_LNK_SQC = SCHEMA_PREFIX + CONSTRAINT_SQ_LNK_SQC_NAME; - public static final String CONSTRAINT_SQ_LNK_NAME_UNIQUE_NAME = CONSTRAINT_PREFIX + "SQ_LNK_NAME_UNIQUE"; - public static final String CONSTRAINT_SQ_LNK_NAME_UNIQUE = SCHEMA_PREFIX + CONSTRAINT_SQ_LNK_NAME_UNIQUE_NAME; - - // SQ_JOB - - public static final String TABLE_SQ_JOB_NAME = "SQ_JOB"; - - public static final String TABLE_SQ_JOB = SCHEMA_PREFIX + TABLE_SQ_JOB_NAME; - - public static final String COLUMN_SQB_ID = "SQB_ID"; - - public static final String COLUMN_SQB_NAME = "SQB_NAME"; + public static final String CONSTRAINT_SQ_LNK_NAME_UNIQUE_NAME = CONSTRAINT_PREFIX + + "SQ_LNK_NAME_UNIQUE"; + public static final String CONSTRAINT_SQ_LNK_NAME_UNIQUE = SCHEMA_PREFIX + + CONSTRAINT_SQ_LNK_NAME_UNIQUE_NAME; + // SQ_CONNECTION @Deprecated public static final String COLUMN_SQB_CONNECTION = "SQB_CONNECTION"; - public static final String COLUMN_SQB_LINK = "SQB_LINK"; + @Deprecated public static final String COLUMN_SQB_TYPE = "SQB_TYPE"; - @Deprecated // used only for upgrade since the table CONNECTION changed to LINK + @Deprecated + // used only for upgrade since the table CONNECTION changed to LINK public static final String COLUMN_SQB_FROM_CONNECTION = "SQB_FROM_CONNECTION"; - public static final String COLUMN_SQB_FROM_LINK = "SQB_FROM_LINK"; - - @Deprecated // used only for upgrade since the table CONNECTION changed to LINK - public static final String COLUMN_SQB_TO_CONNECTION = "SQB_TO_CONNECTION"; - public static final String COLUMN_SQB_TO_LINK = "SQB_TO_LINK"; - - public static final String COLUMN_SQB_CREATION_USER = "SQB_CREATION_USER"; - - public static final String COLUMN_SQB_CREATION_DATE = "SQB_CREATION_DATE"; - public static final String COLUMN_SQB_UPDATE_USER = "SQB_UPDATE_USER"; - - public static final String COLUMN_SQB_UPDATE_DATE = "SQB_UPDATE_DATE"; - - public static final String COLUMN_SQB_ENABLED = "SQB_ENABLED"; + @Deprecated + // used only for upgrade since the table CONNECTION changed to LINK + public static final String COLUMN_SQB_TO_CONNECTION = "SQB_TO_CONNECTION"; - @Deprecated // used only for upgrade + // constraints relevant only in derby + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQB_SQN_NAME = CONSTRAINT_PREFIX + "SQB_SQN"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQB_SQN = SCHEMA_PREFIX + CONSTRAINT_SQB_SQN_NAME; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQB_SQN_FROM_NAME = CONSTRAINT_PREFIX + "SQB_SQN_FROM"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQB_SQN_FROM = SCHEMA_PREFIX + CONSTRAINT_SQB_SQN_FROM_NAME; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQB_SQN_TO_NAME = CONSTRAINT_PREFIX + "SQB_SQN_TO"; - @Deprecated // used only for upgrade + @Deprecated + // used only for upgrade public static final String CONSTRAINT_SQB_SQN_TO = SCHEMA_PREFIX + CONSTRAINT_SQB_SQN_TO_NAME; public static final String CONSTRAINT_SQB_SQ_LNK_NAME = CONSTRAINT_PREFIX + "SQB_SQ_LNK"; public static final String CONSTRAINT_SQB_SQ_LNK = SCHEMA_PREFIX + CONSTRAINT_SQB_SQ_LNK_NAME; - public static final String CONSTRAINT_SQB_SQ_LNK_FROM_NAME = CONSTRAINT_PREFIX + "SQB_SQ_LNK_FROM"; + public static final String CONSTRAINT_SQB_SQ_LNK_FROM_NAME = CONSTRAINT_PREFIX + + "SQB_SQ_LNK_FROM"; - public static final String CONSTRAINT_SQB_SQ_LNK_FROM = SCHEMA_PREFIX + CONSTRAINT_SQB_SQ_LNK_FROM_NAME; + public static final String CONSTRAINT_SQB_SQ_LNK_FROM = SCHEMA_PREFIX + + CONSTRAINT_SQB_SQ_LNK_FROM_NAME; public static final String CONSTRAINT_SQB_SQ_LNK_TO_NAME = CONSTRAINT_PREFIX + "SQB_SQ_LNK_TO"; - public static final String CONSTRAINT_SQB_SQ_LNK_TO = SCHEMA_PREFIX + CONSTRAINT_SQB_SQ_LNK_TO_NAME; + public static final String CONSTRAINT_SQB_SQ_LNK_TO = SCHEMA_PREFIX + + CONSTRAINT_SQB_SQ_LNK_TO_NAME; - public static final String CONSTRAINT_SQB_NAME_UNIQUE_NAME = CONSTRAINT_PREFIX + "SQB_NAME_UNIQUE"; + public static final String CONSTRAINT_SQB_NAME_UNIQUE_NAME = CONSTRAINT_PREFIX + + "SQB_NAME_UNIQUE"; - public static final String CONSTRAINT_SQB_NAME_UNIQUE = SCHEMA_PREFIX + CONSTRAINT_SQB_NAME_UNIQUE_NAME; + // relevant constraints relevant only in derby + public static final String CONSTRAINT_SQB_NAME_UNIQUE = SCHEMA_PREFIX + + CONSTRAINT_SQB_NAME_UNIQUE_NAME; // SQ_LINK_INPUT - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String TABLE_SQ_CONNECTION_INPUT_NAME = "SQ_CONNECTION_INPUT"; - public static final String TABLE_SQ_LINK_INPUT_NAME = "SQ_LINK_INPUT"; - @Deprecated // only used for upgrade - public static final String TABLE_SQ_CONNECTION_INPUT = SCHEMA_PREFIX + TABLE_SQ_CONNECTION_INPUT_NAME; - public static final String TABLE_SQ_LINK_INPUT = SCHEMA_PREFIX + TABLE_SQ_LINK_INPUT_NAME; + @Deprecated + // only used for upgrade + public static final String TABLE_SQ_CONNECTION_INPUT = SCHEMA_PREFIX + + TABLE_SQ_CONNECTION_INPUT_NAME; - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String COLUMN_SQNI_CONNECTION = "SQNI_CONNECTION"; - public static final String COLUMN_SQ_LNKI_LINK = "SQ_LNKI_LINK"; - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String COLUMN_SQNI_INPUT = "SQNI_INPUT"; - public static final String COLUMN_SQ_LNKI_INPUT = "SQ_LNKI_INPUT"; - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String COLUMN_SQNI_VALUE = "SQNI_VALUE"; - public static final String COLUMN_SQ_LNKI_VALUE = "SQ_LNKI_VALUE"; - @Deprecated // only used for upgrade + // constraints relevant only in derby + @Deprecated + // only used for upgrade public static final String CONSTRAINT_SQNI_SQN_NAME = CONSTRAINT_PREFIX + "SQNI_SQN"; public static final String CONSTRAINT_SQ_LNKI_SQ_LNK_NAME = CONSTRAINT_PREFIX + "SQ_LNKI_SQ_LNK"; - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String CONSTRAINT_SQNI_SQN = SCHEMA_PREFIX + CONSTRAINT_SQNI_SQN_NAME; - public static final String CONSTRAINT_SQ_LNKI_SQ_LNK = SCHEMA_PREFIX + CONSTRAINT_SQ_LNKI_SQ_LNK_NAME; + public static final String CONSTRAINT_SQ_LNKI_SQ_LNK = SCHEMA_PREFIX + + CONSTRAINT_SQ_LNKI_SQ_LNK_NAME; - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String CONSTRAINT_SQNI_SQI_NAME = CONSTRAINT_PREFIX + "SQNI_SQI"; public static final String CONSTRAINT_SQ_LNKI_SQI_NAME = CONSTRAINT_PREFIX + "SQ_LNKI_SQI"; - @Deprecated // only used for upgrade + @Deprecated + // only used for upgrade public static final String CONSTRAINT_SQNI_SQI = SCHEMA_PREFIX + CONSTRAINT_SQNI_SQI_NAME; public static final String CONSTRAINT_SQ_LNKI_SQI = SCHEMA_PREFIX + CONSTRAINT_SQ_LNKI_SQI_NAME; // SQ_JOB_INPUT - - public static final String TABLE_SQ_JOB_INPUT_NAME = "SQ_JOB_INPUT"; - - public static final String TABLE_SQ_JOB_INPUT = SCHEMA_PREFIX + TABLE_SQ_JOB_INPUT_NAME; - - public static final String COLUMN_SQBI_JOB = "SQBI_JOB"; - - public static final String COLUMN_SQBI_INPUT = "SQBI_INPUT"; - - public static final String COLUMN_SQBI_VALUE = "SQBI_VALUE"; - + // constraints relevant only in derby public static final String CONSTRAINT_SQBI_SQB_NAME = CONSTRAINT_PREFIX + "SQBI_SQB"; public static final String CONSTRAINT_SQBI_SQB = SCHEMA_PREFIX + CONSTRAINT_SQBI_SQB_NAME; @@ -375,72 +323,12 @@ public final class DerbySchemaConstants { public static final String CONSTRAINT_SQBI_SQI = SCHEMA_PREFIX + CONSTRAINT_SQBI_SQI_NAME; // SQ_SUBMISSION - - public static final String TABLE_SQ_SUBMISSION_NAME = "SQ_SUBMISSION"; - - public static final String TABLE_SQ_SUBMISSION = SCHEMA_PREFIX + TABLE_SQ_SUBMISSION_NAME; - - public static final String COLUMN_SQS_ID = "SQS_ID"; - - public static final String COLUMN_SQS_JOB = "SQS_JOB"; - - public static final String COLUMN_SQS_STATUS = "SQS_STATUS"; - - public static final String COLUMN_SQS_CREATION_USER = "SQS_CREATION_USER"; - - public static final String COLUMN_SQS_CREATION_DATE = "SQS_CREATION_DATE"; - - public static final String COLUMN_SQS_UPDATE_USER = "SQS_UPDATE_USER"; - - public static final String COLUMN_SQS_UPDATE_DATE = "SQS_UPDATE_DATE"; - - public static final String COLUMN_SQS_EXTERNAL_ID = "SQS_EXTERNAL_ID"; - - public static final String COLUMN_SQS_EXTERNAL_LINK = "SQS_EXTERNAL_LINK"; - - public static final String COLUMN_SQS_EXCEPTION = "SQS_EXCEPTION"; - - public static final String COLUMN_SQS_EXCEPTION_TRACE = "SQS_EXCEPTION_TRACE"; - public static final String CONSTRAINT_SQS_SQB_NAME = CONSTRAINT_PREFIX + "SQS_SQB"; public static final String CONSTRAINT_SQS_SQB = SCHEMA_PREFIX + CONSTRAINT_SQS_SQB_NAME; - // SQ_COUNTER_GROUP - - public static final String TABLE_SQ_COUNTER_GROUP_NAME = "SQ_COUNTER_GROUP"; - - public static final String TABLE_SQ_COUNTER_GROUP = SCHEMA_PREFIX + TABLE_SQ_COUNTER_GROUP_NAME; - - public static final String COLUMN_SQG_ID = "SQG_ID"; - - public static final String COLUMN_SQG_NAME = "SQG_NAME"; - - // SQ_COUNTER_GROUP - - public static final String TABLE_SQ_COUNTER_NAME = "SQ_COUNTER"; - - public static final String TABLE_SQ_COUNTER = SCHEMA_PREFIX + TABLE_SQ_COUNTER_NAME; - - public static final String COLUMN_SQR_ID = "SQR_ID"; - - public static final String COLUMN_SQR_NAME = "SQR_NAME"; - // SQ_COUNTER_SUBMISSION - - public static final String TABLE_SQ_COUNTER_SUBMISSION_NAME = "SQ_COUNTER_SUBMISSION"; - - public static final String TABLE_SQ_COUNTER_SUBMISSION = SCHEMA_PREFIX - + TABLE_SQ_COUNTER_SUBMISSION_NAME; - - public static final String COLUMN_SQRS_GROUP = "SQRS_GROUP"; - - public static final String COLUMN_SQRS_COUNTER = "SQRS_COUNTER"; - - public static final String COLUMN_SQRS_SUBMISSION = "SQRS_SUBMISSION"; - - public static final String COLUMN_SQRS_VALUE = "SQRS_VALUE"; - + // constraints relevant only in derby public static final String CONSTRAINT_SQRS_SQG_NAME = CONSTRAINT_PREFIX + "SQRS_SQG"; public static final String CONSTRAINT_SQRS_SQG = SCHEMA_PREFIX + CONSTRAINT_SQRS_SQG_NAME; @@ -454,8 +342,8 @@ public final class DerbySchemaConstants { public static final String CONSTRAINT_SQRS_SQS = SCHEMA_PREFIX + CONSTRAINT_SQRS_SQS_NAME; /** - * List of expected tables for first version; - * This list here is for backward compatibility. + * List of expected tables for first version; This list here is for backward + * compatibility. */ public static final Set<String> tablesV1; static { @@ -476,4 +364,4 @@ public final class DerbySchemaConstants { private DerbySchemaConstants() { // Disable explicit object creation } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/sqoop/blob/938317c3/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java ---------------------------------------------------------------------- diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java index 65528b8..4a7afcf 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java @@ -17,6 +17,8 @@ */ package org.apache.sqoop.repository.derby; + +import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*; import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*; /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/938317c3/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java ---------------------------------------------------------------------- diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java index ceb6c05..af76a17 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java @@ -17,8 +17,10 @@ */ package org.apache.sqoop.repository.derby; +import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*; import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*; + /** * Derby Repository Insert/ Update/ Delete / Select queries * http://git-wip-us.apache.org/repos/asf/sqoop/blob/938317c3/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java ---------------------------------------------------------------------- diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java index fb48daf..1cdda1b 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java @@ -17,9 +17,9 @@ */ package org.apache.sqoop.repository.derby; +import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*; import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*; - // NOTE: If you have signed yourself to modify the schema for the repository // such as a rename, change in table relationships or constraints, embrace yourself! // The following code is supposed to be a chronological order of how the
