From 9ab23a7e270c492c087f3667f912a2d14000405d Mon Sep 17 00:00:00 2001
From: Michael Hsu <Michael_L_Hsu@umc.com>
Date: Tue, 12 Nov 2019 11:16:45 +0800
Subject: [PATCH 1/2] Fix SQOOP-1946: This issue occurred when using --query,
 the ConnManager and InputFormat of ImportJobContext not set to Oracle ones.

---
 src/java/org/apache/sqoop/manager/OracleManager.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/java/org/apache/sqoop/manager/OracleManager.java b/src/java/org/apache/sqoop/manager/OracleManager.java
index cdc6c54c..235ed88e 100644
--- a/src/java/org/apache/sqoop/manager/OracleManager.java
+++ b/src/java/org/apache/sqoop/manager/OracleManager.java
@@ -455,6 +455,15 @@ public void importTable(
     super.importTable(context);
   }
 
+  @Override
+  public void importQuery(com.cloudera.sqoop.manager.ImportJobContext context)
+      throws IOException, ImportException {
+    context.setConnManager(this);
+    // Specify the Oracle-specific DBInputFormat for import.
+    context.setInputFormat(OracleDataDrivenDBInputFormat.class);
+    super.importQuery(context);
+  }
+
   /**
    * Export data stored in HDFS into a table in a database.
    */

From bd8076ab022a2d3cae1f47dbf643f34429a1e961 Mon Sep 17 00:00:00 2001
From: Michael Hsu <michael_l_hsu@umc.com>
Date: Thu, 20 Aug 2020 20:51:33 +0800
Subject: [PATCH 2/2] Fix: Use org.apache.sqoop.manager.ImportJobContext
 instead of com.cloudera.sqoop.*

---
 src/java/org/apache/sqoop/manager/OracleManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/org/apache/sqoop/manager/OracleManager.java b/src/java/org/apache/sqoop/manager/OracleManager.java
index 235ed88e..ee62b1e3 100644
--- a/src/java/org/apache/sqoop/manager/OracleManager.java
+++ b/src/java/org/apache/sqoop/manager/OracleManager.java
@@ -456,7 +456,7 @@ public void importTable(
   }
 
   @Override
-  public void importQuery(com.cloudera.sqoop.manager.ImportJobContext context)
+  public void importQuery(org.apache.sqoop.manager.ImportJobContext context)
       throws IOException, ImportException {
     context.setConnManager(this);
     // Specify the Oracle-specific DBInputFormat for import.