[CBRD-25707] With the addition of [user_schema] to SP, the --no-user-specified-name option of the loaddb utility has been fixed to function correctly, even when SPs are included in unload files from the past.

src/parser/name_resolution.c

@@ -3499,9 +3499,8 @@ pt_bind_names (PARSER_CONTEXT * parser, PT_NODE * node, void *arg, int *continue
     case PT_FUNCTION:
       if (node->info.function.function_type == PT_GENERIC)
 	{
-	  const char *dot = NULL;
-	  const char *current_schema_name = NULL;
-	  char buffer[SM_MAX_IDENTIFIER_LENGTH];
+	  MOP sp_mop = NULL;
+	  char sp_unique_name[SM_MAX_IDENTIFIER_LENGTH + 1];
 	  node->info.function.function_type = pt_find_function_type (node->info.function.generic_name);
 
 	  if (node->info.function.function_type == PT_GENERIC)
@@ -3522,14 +3521,14 @@ pt_bind_names (PARSER_CONTEXT * parser, PT_NODE * node, void *arg, int *continue
 	       * nodes PT_FUNCTION.  If so, pt_make_stored_procedure() and pt_make_method_call() will
 	       * translate it into a method_call.
 	       */
-	      if (jsp_is_exist_stored_procedure (node->info.function.generic_name))
+	      sp_mop = jsp_find_stored_procedure (node->info.function.generic_name, DB_AUTH_NONE);
+	      if (sp_mop != NULL)
 		{
-		  dot = strchr (node->info.function.generic_name, '.');
-		  if (dot == NULL)
+		  sp_unique_name[0] = '\0';
+		  jsp_get_unique_name (sp_mop, sp_unique_name, DB_MAX_IDENTIFIER_LENGTH + 1);
+		  if (sp_unique_name[0] != '\0')
 		    {
-		      current_schema_name = sc_current_schema_name ();
-		      sprintf (buffer, "%s.%s", current_schema_name, node->info.function.generic_name);
-		      node->info.function.generic_name = pt_append_string (parser, NULL, buffer);
+		      node->info.function.generic_name = pt_append_string (parser, NULL, sp_unique_name);
 		    }
 
 		  node1 = pt_resolve_stored_procedure (parser, node, bind_arg);

src/query/execute_statement.c

@@ -20250,6 +20250,98 @@ do_find_synonym_by_query (const char *name, char *buf, int buf_size)
 #undef QUERY_BUF_SIZE
 }
 
+int
+do_find_stored_procedure_by_query (const char *name, char *buf, int buf_size)
+{
+#define QUERY_BUF_SIZE 2048
+  DB_QUERY_RESULT *query_result = NULL;
+  DB_QUERY_ERROR query_error;
+  DB_VALUE value;
+  const char *query = NULL;
+  char query_buf[QUERY_BUF_SIZE] = { '\0' };
+  const char *current_schema_name = NULL;
+  const char *sp_name = NULL;
+  int error = NO_ERROR;
+
+  db_make_null (&value);
+  query_error.err_lineno = 0;
+  query_error.err_posno = 0;
+
+  if (name == NULL || name[0] == '\0')
+    {
+      ERROR_SET_WARNING (error, ER_OBJ_INVALID_ARGUMENTS);
+      return error;
+    }
+
+  assert (buf != NULL);
+
+  current_schema_name = sc_current_schema_name ();
+
+  sp_name = sm_remove_qualifier_name (name);
+  query = "SELECT [unique_name] FROM [%s] WHERE [sp_name] = '%s' AND [owner].[name] != UPPER ('%s')";
+  assert (QUERY_BUF_SIZE > snprintf (NULL, 0, query, CT_STORED_PROC_NAME, sp_name, current_schema_name));
+  snprintf (query_buf, QUERY_BUF_SIZE, query, CT_STORED_PROC_NAME, sp_name, current_schema_name);
+  assert (query_buf[0] != '\0');
+
+  error = db_compile_and_execute_local (query_buf, &query_result, &query_error);
+  if (error < NO_ERROR)
+    {
+      ASSERT_ERROR ();
+      goto end;
+    }
+
+  error = db_query_first_tuple (query_result);
+  if (error != DB_CURSOR_SUCCESS)
+    {
+      if (error == DB_CURSOR_END)
+	{
+	  ERROR_SET_WARNING_1ARG (error, ER_SP_NOT_EXIST, name);
+	}
+      else
+	{
+	  ASSERT_ERROR ();
+	}
+
+      goto end;
+    }
+
+  error = db_query_get_tuple_value (query_result, 0, &value);
+  if (error != NO_ERROR)
+    {
+      ASSERT_ERROR ();
+      goto end;
+    }
+
+  if (!DB_IS_NULL (&value))
+    {
+      assert (strlen (db_get_string (&value)) < buf_size);
+      strcpy (buf, db_get_string (&value));
+    }
+  else
+    {
+      /* unique_name must not be null. */
+      ASSERT_ERROR_AND_SET (error);
+      goto end;
+    }
+
+  error = db_query_next_tuple (query_result);
+  if (error != DB_CURSOR_END)
+    {
+      /* No result can be returned because unique_name is not unique. */
+      buf[0] = '\0';
+    }
+
+end:
+  if (query_result)
+    {
+      db_query_end (query_result);
+      query_result = NULL;
+    }
+
+  return error;
+#undef QUERY_BUF_SIZE
+}
+
 /*
  * do_set_trace_to_query_flag() -
  *   return: void

src/query/execute_statement.h

@@ -207,4 +207,5 @@ extern int do_find_class_by_query (const char *name, char *buf, int buf_size);
 extern int do_find_serial_by_query (const char *name, char *buf, int buf_size);
 extern int do_find_trigger_by_query (const char *name, char *buf, int buf_size);
 extern int do_find_synonym_by_query (const char *name, char *buf, int buf_size);
+extern int do_find_stored_procedure_by_query (const char *name, char *buf, int buf_size);
 #endif /* _EXECUTE_STATEMENT_H_ */

src/sp/jsp_cl.cpp

@@ -67,6 +67,7 @@
 #include "oid.h"
 #include "string_buffer.hpp"
 #include "db_value_printer.hpp"
+#include "execute_statement.h"
 
 #define PT_NODE_SP_NAME(node) \
   (((node)->info.sp.name == NULL) ? "" : \
@@ -154,6 +155,7 @@ jsp_find_stored_procedure (const char *name, DB_AUTH purpose)
   DB_VALUE value;
   int save, err = NO_ERROR;
   char *checked_name;
+  char other_class_name[DB_MAX_IDENTIFIER_LENGTH];
 
   if (!name)
     {
@@ -169,8 +171,29 @@ jsp_find_stored_procedure (const char *name, DB_AUTH purpose)
   if (er_errid () == ER_OBJ_OBJECT_NOT_FOUND)
     {
       er_clear ();
-      err = ER_SP_NOT_EXIST;
-      er_set (ER_WARNING_SEVERITY, ARG_FILE_LINE, err, 1, checked_name);
+
+      /* This is the case when the loaddb utility is executed with the --no-user-specified-name option as the dba user. */
+      if (db_get_client_type () == DB_CLIENT_TYPE_ADMIN_LOADDB_COMPAT)
+	{
+	  other_class_name[0] = '\0';
+
+	  err = do_find_stored_procedure_by_query (name, other_class_name, DB_MAX_IDENTIFIER_LENGTH);
+	  if (other_class_name[0] != '\0')
+	    {
+	      db_make_string (&value, other_class_name);
+	      mop = db_find_unique (db_find_class (SP_CLASS_NAME), SP_ATTR_UNIQUE_NAME, &value);
+	      if (er_errid () == ER_OBJ_OBJECT_NOT_FOUND)
+		{
+		  err = ER_SP_NOT_EXIST;
+		  er_set (ER_WARNING_SEVERITY, ARG_FILE_LINE, err, 1, other_class_name);
+		}
+	    }
+	}
+      else
+	{
+	  err = ER_SP_NOT_EXIST;
+	  er_set (ER_WARNING_SEVERITY, ARG_FILE_LINE, err, 1, checked_name);
+	}
     }
 
   if (mop)
@@ -1435,8 +1458,6 @@ jsp_check_stored_procedure_name (const char *str)
   char tmp[SM_MAX_IDENTIFIER_LENGTH + 2];
   char *name = NULL;
   static int dbms_output_len = strlen ("dbms_output.");
-  char owner_name[DB_MAX_USER_LENGTH];
-  owner_name[0] = '\0';
 
 
   if (strncasecmp (str, "dbms_output.", dbms_output_len) == 0)
@@ -1449,8 +1470,6 @@ jsp_check_stored_procedure_name (const char *str)
       sm_user_specified_name (str, buffer, SM_MAX_IDENTIFIER_LENGTH);
     }
 
-  // sm_downcase_name (str, buffer, SM_MAX_IDENTIFIER_LENGTH);
-
   name = strdup (buffer);
 
   return name;