From fbdd940eb38b2401119abc5426c8c5f6cc0f63f7 Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Thu, 13 Nov 2014 12:21:47 -0800
Subject: [PATCH] SQOOP-1724: Sqoop2: Support old config types for backward
 compatibility in connector data upgrade

(Veena Basavaraj via Jarek Jarcec Cecho)
---
 .../src/main/java/org/apache/sqoop/model/MConfigType.java   | 4 ++++
 .../sqoop/repository/derby/DerbyRepositoryHandler.java      | 6 ++++++
 2 files changed, 10 insertions(+)

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<MConfig> 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<MConfig> linkConfig, List<MConfig> 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,