[hop] branch master updated: Improve the way we get the list of DB procedures for oracle #3202

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new b2b1c68cf2 Improve the way we get the list of DB procedures for oracle 
#3202
     new 018a3af5f8 Merge pull request #3204 from nadment/3202
b2b1c68cf2 is described below

commit b2b1c68cf223b01d3437ae2a7950915eb109a39f
Author: Nicolas Adment <39568358+nadm...@users.noreply.github.com>
AuthorDate: Tue Sep 5 13:33:11 2023 +0200

    Improve the way we get the list of DB procedures for oracle #3202
---
 .../java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java     | 4 +---
 .../java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
 
b/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
index af525570d3..09af400237 100644
--- 
a/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
+++ 
b/plugins/databases/oracle/src/main/java/org/apache/hop/databases/oracle/OracleDatabaseMeta.java
@@ -536,9 +536,7 @@ public class OracleDatabaseMeta extends BaseDatabaseMeta 
implements IDatabase {
   /** @return The SQL on this database to get a list of stored procedures. */
   @Override
   public String getSqlListOfProcedures() {
-    return "SELECT DISTINCT DECODE(package_name, NULL, '', package_name||'.') 
|| object_name "
-        + "FROM user_arguments "
-        + "ORDER BY 1";
+    return "SELECT 
OWNER||'.'||OBJECT_NAME||NVL2(PROCEDURE_NAME,'.'||PROCEDURE_NAME,NULL) FROM 
ALL_PROCEDURES ORDER BY 1";
   }
 
   @Override
diff --git 
a/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
 
b/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
index 9cf6876f03..1e9c7a4ef2 100644
--- 
a/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
+++ 
b/plugins/databases/oracle/src/test/java/org/apache/hop/databases/oracle/OracleDatabaseMetaTest.java
@@ -370,10 +370,7 @@ public class OracleDatabaseMetaTest {
             "",
             false));
 
-    String expectedProcSql =
-        "SELECT DISTINCT DECODE(package_name, NULL, '', package_name||'.') || 
object_name "
-            + "FROM user_arguments "
-            + "ORDER BY 1";
+    String expectedProcSql = "SELECT 
OWNER||'.'||OBJECT_NAME||NVL2(PROCEDURE_NAME,'.'||PROCEDURE_NAME,NULL) FROM 
ALL_PROCEDURES ORDER BY 1";
 
     assertEquals(expectedProcSql, nativeMeta.getSqlListOfProcedures());