diff --git a/common/src/main/java/org/apache/sqoop/model/MConfigType.java b/common/src/main/java/org/apache/sqoop/model/MConfigType.java index de05332b..f2984e30 100644 --- a/common/src/main/java/org/apache/sqoop/model/MConfigType.java +++ b/common/src/main/java/org/apache/sqoop/model/MConfigType.java @@ -25,6 +25,10 @@ public enum MConfigType { /** Unknown config type */ OTHER, + @Deprecated + // exists for the connector upgrade path only + CONNECTION, + /** link config type */ LINK, diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java index dcdc7a2d..37766bf5 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java @@ -2609,6 +2609,10 @@ public void loadDriverConfigs(List driverConfig, } driverConfig.add(mDriverConfig); break; + //added for connector upgrade path + case CONNECTION: + // do nothing since we do not support it + break; default: throw new SqoopException(DerbyRepoError.DERBYREPO_0007, "connector-" + fromConnectorId + ":" + configType); @@ -2737,6 +2741,8 @@ public void loadConnectorConfigTypes(List linkConfig, List fro MConfigType mConfigType = MConfigType.valueOf(configType); switch (mConfigType) { + //added for connector upgrade path + case CONNECTION: case LINK: if (linkConfig.size() != configIndex) { throw new SqoopException(DerbyRepoError.DERBYREPO_0010,