[CBRD-25352] Add a user schema to your stored procedures for consistency with other objects

src/executables/csql.c

@@ -1844,7 +1844,7 @@ csql_print_server_output (const CSQL_ARGUMENT * csql_arg)
 
   do
     {
-      errors = csql_execute_query ("CALL get_line (:pl_output_str, :pl_output_status);");
+      errors = csql_execute_query ("CALL dbms_output.get_line (:pl_output_str, :pl_output_status);");
       if (errors != 0)
 	{
 	  break;

src/executables/unload_schema.c

@@ -4323,13 +4323,15 @@ emit_stored_procedure (extract_context & ctxt, print_output & output_ctx)
 {
   MOP cls, obj, owner;
   DB_OBJLIST *sp_list = NULL, *cur_sp;
-  DB_VALUE sp_name_val, pkg_name_val, sp_type_val, arg_cnt_val, generated_val, args_val, rtn_type_val, method_val,
-    comment_val;
+  DB_VALUE unique_name_val, sp_name_val, pkg_name_val, sp_type_val, arg_cnt_val, generated_val, args_val, rtn_type_val,
+    method_val, comment_val;
   DB_VALUE owner_val, owner_name_val;
   int sp_type, rtn_type, arg_cnt, save;
   DB_SET *arg_set;
   int err;
   int err_count = 0;
+  char owner_name[DB_MAX_USER_LENGTH] = { '\0' };
+  char output_owner[DB_MAX_USER_LENGTH + 4] = { '\0' };
 
   AU_DISABLE (save);
 
@@ -4346,6 +4348,7 @@ emit_stored_procedure (extract_context & ctxt, print_output & output_ctx)
       obj = cur_sp->op;
 
       if ((err = db_get (obj, SP_ATTR_SP_TYPE, &sp_type_val)) != NO_ERROR
+	  || (err = db_get (obj, SP_ATTR_UNIQUE_NAME, &unique_name_val)) != NO_ERROR
 	  || (err = db_get (obj, SP_ATTR_NAME, &sp_name_val)) != NO_ERROR
 	  || (err = db_get (obj, SP_ATTR_PKG, &pkg_name_val)) != NO_ERROR
 	  || (err = db_get (obj, SP_ATTR_ARG_COUNT, &arg_cnt_val)) != NO_ERROR
@@ -4365,7 +4368,12 @@ emit_stored_procedure (extract_context & ctxt, print_output & output_ctx)
 	  continue;
 	}
 
+      const char *unique_name = db_get_string (&unique_name_val);
       const char *sp_name = db_get_string (&sp_name_val);
+      sm_qualifier_name (unique_name, owner_name, DB_MAX_USER_LENGTH);
+
+      PRINT_OWNER_NAME (owner_name, (ctxt.is_dba_user || ctxt.is_dba_group_member), output_owner,
+			sizeof (output_owner));
 
       if (ctxt.is_dba_user == false && ctxt.is_dba_group_member == false)
 	{
@@ -4393,7 +4401,7 @@ emit_stored_procedure (extract_context & ctxt, print_output & output_ctx)
 	}
       else
 	{
-	  output_ctx (" %s%s%s (", PRINT_IDENTIFIER (sp_name));
+	  output_ctx (" %s%s%s%s (", output_owner, PRINT_IDENTIFIER (sp_name));
 	}
 
       arg_cnt = db_get_int (&arg_cnt_val);
@@ -4440,7 +4448,7 @@ emit_stored_procedure (extract_context & ctxt, print_output & output_ctx)
 
       if (ctxt.is_dba_user || ctxt.is_dba_group_member)
 	{
-	  output_ctx ("call [change_sp_owner]('%s', '%s') on class [db_root];\n", db_get_string (&sp_name_val),
+	  output_ctx ("call [change_sp_owner]('%s', '%s') on class [db_root];\n", unique_name,
 		      db_get_string (&owner_name_val));
 	}
 

src/object/authenticate.c

@@ -5118,7 +5118,14 @@ au_change_sp_owner (MOP sp, MOP owner)
 {
   int error = NO_ERROR;
   int save;
-  DB_VALUE value;
+  const char *name_str = NULL, *owner_str = NULL;
+  char new_name_str[DB_MAX_IDENTIFIER_LENGTH] = { '\0' };
+  char downcase_owner_name[DB_MAX_USER_LENGTH] = { '\0' };
+  DB_VALUE value, name_value, owner_value;
+
+  db_make_null (&value);
+  db_make_null (&name_value);
+  db_make_null (&owner_value);
 
   AU_DISABLE (save);
   if (!au_is_dba_group_member (Au_user))
@@ -5128,6 +5135,35 @@ au_change_sp_owner (MOP sp, MOP owner)
     }
   else
     {
+      error = obj_get (sp, "sp_name", &name_value);
+      if (error != NO_ERROR)
+	{
+	  goto end;
+	}
+      error = obj_get (owner, "name", &owner_value);
+      if (error != NO_ERROR)
+	{
+	  goto end;
+	}
+
+      name_str = db_get_string (&name_value);
+      owner_str = db_get_string (&owner_value);
+
+      sm_downcase_name (owner_str, downcase_owner_name, DB_MAX_USER_LENGTH);
+      sprintf (new_name_str, "%s.%s", downcase_owner_name, name_str);
+
+      /* change the unique_name */
+      if (new_name_str != NULL)
+	{
+	  db_make_string (&value, new_name_str);
+	  error = obj_set (sp, SP_ATTR_UNIQUE_NAME, &value);
+	  if (error < 0)
+	    {
+	      goto end;
+	    }
+	  pr_clear_value (&value);
+	}
+
       db_make_object (&value, owner);
       error = obj_set (sp, SP_ATTR_OWNER, &value);
       if (error < 0)

src/object/schema_system_catalog_install.cpp

@@ -830,6 +830,7 @@ namespace cubschema
 		   CT_STORED_PROC_NAME,
 		   // columns
     {
+      {"unique_name", format_varchar (255)},
       {"sp_name", format_varchar (255)},
       {"sp_type", "integer"},
       {"return_type", "integer"},
@@ -845,7 +846,8 @@ namespace cubschema
     },
 // constraints
     {
-      {DB_CONSTRAINT_UNIQUE, "", {"sp_name", nullptr}, false},
+      {DB_CONSTRAINT_PRIMARY_KEY, "pk_db_stored_procedure_unique_name", {"unique_name", nullptr}, false},
+      {DB_CONSTRAINT_UNIQUE, "", {"sp_name", "owner", nullptr}, false}
     },
 // authorization
     {
@@ -866,7 +868,7 @@ namespace cubschema
 		   CT_STORED_PROC_ARGS_NAME,
 		   // columns
     {
-      {"sp_name", format_varchar (255)},
+      {"sp_of", CT_STORED_PROC_NAME},
       {"pkg_name", format_varchar (255)},
       {"index_of", "integer"},
       {"is_system_generated", "integer"},
@@ -879,7 +881,7 @@ namespace cubschema
     },
 // constraints
     {
-      {DB_CONSTRAINT_INDEX, "", {"sp_name", nullptr}, false},
+      {DB_CONSTRAINT_INDEX, "", {"sp_of", nullptr}, false},
     },
 // authorization
     {
@@ -1842,6 +1844,7 @@ namespace cubschema
 		   // columns
     {
       {"sp_name", "varchar(255)"},
+      {"sp_owner_name", "varchar(255)"},
       {"pkg_name", "varchar (255)"},
       {"index_of", "integer"},
       {"arg_name", "varchar(255)"},

src/object/schema_system_catalog_install_query_spec.cpp

@@ -1196,7 +1196,8 @@ sm_define_view_stored_procedure_arguments_spec (void)
   // *INDENT-OFF*
   sprintf (stmt,
 	"SELECT "
-	  "[sp].[sp_name] AS [sp_name], "
+	  "[sp].[sp_of].[sp_name] AS [sp_name], "
+	  "CAST ([sp].[sp_of].[owner].[name] AS VARCHAR(255)) AS [sp_owner_name], " /* string -> varchar(255) */
           "[sp].[pkg_name] AS [pkg_name], "
 	  "[sp].[index_of] AS [index_of], "
 	  "[sp].[arg_name] AS [arg_name], "
@@ -1212,7 +1213,7 @@ sm_define_view_stored_procedure_arguments_spec (void)
 	  "[%s] AS [sp] "
         "WHERE [sp].[is_system_generated] = 0 "
 	"ORDER BY " /* Is it possible to remove ORDER BY? */
-	  "[sp].[sp_name], "
+	  "[sp].[sp_of].[sp_name], "
 	  "[sp].[index_of]",
 	CT_DATATYPE_NAME,
 	CT_STORED_PROC_ARGS_NAME);

src/parser/csql_grammar.y

@@ -709,6 +709,12 @@ static char *g_plcsql_text;
 %type <node> serial_name
 %type <node> synonym_name_without_dot
 %type <node> synonym_name
+%type <node> procedure_name_without_dot
+%type <node> procedure_name
+%type <node> procedure_name_list
+%type <node> function_name_without_dot
+%type <node> function_name
+%type <node> function_name_list
 %type <node> opt_alter_synonym
 %type <node> opt_identifier
 %type <node> normal_or_class_attr_list_with_commas
@@ -3063,7 +3069,7 @@ create_stmt
 		  push_msg(MSGCAT_SYNTAX_INVALID_CREATE_PROCEDURE);
                   expecting_pl_lang_spec = 1;
 		}
-	  identifier opt_sp_param_list		        /* 5, 6 */
+	  procedure_name_without_dot opt_sp_param_list	/* 5, 6 */
           opt_authid                                    /* 7 */
 	  is_or_as pl_language_spec		        /* 8, 9 */
 	  opt_comment_spec				/* 10 */
@@ -3096,7 +3102,7 @@ create_stmt
 			push_msg(MSGCAT_SYNTAX_INVALID_CREATE_FUNCTION);
                         expecting_pl_lang_spec = 1;
 		}
-	  identifier opt_sp_param_list	                /* 5, 6 */
+	  function_name_without_dot opt_sp_param_list	/* 5, 6 */
 	  RETURN sp_return_type		                /* 7, 8 */
           opt_authid                                    /* 9 */
 	  is_or_as pl_language_spec		        /* 10, 11 */
@@ -4092,10 +4098,10 @@ alter_stmt
 		DBG_PRINT}}
 	| ALTER				/* 1 */
 	  procedure_or_function		/* 2 */
-	  identifier				/* 3 */
+	  procedure_name			/* 3 */
 	  opt_owner_clause			/* 4 */
 	  opt_comment_spec			/* 5 */
-		{{ DBG_TRACE_GRAMMAR(alter_stmt, | ALTER procedure_or_function identifier opt_owner_clause opt_comment_spec);
+		{{ DBG_TRACE_GRAMMAR(alter_stmt, | ALTER procedure_or_function procedure_name opt_owner_clause opt_comment_spec);
 
 			PT_NODE *node = parser_new_node (this_parser, PT_ALTER_STORED_PROCEDURE);
 
@@ -4671,8 +4677,8 @@ drop_stmt
 			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
 
 		DBG_PRINT}}
-	| DROP PROCEDURE identifier_list
-		{{ DBG_TRACE_GRAMMAR(drop_stmt, | DROP PROCEDURE identifier_list);
+	| DROP PROCEDURE procedure_name_list
+		{{ DBG_TRACE_GRAMMAR(drop_stmt, | DROP PROCEDURE procedure_name_list);
 
 			PT_NODE *node = parser_new_node (this_parser, PT_DROP_STORED_PROCEDURE);
 
@@ -4687,8 +4693,8 @@ drop_stmt
 			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
 
 		DBG_PRINT}}
-	| DROP FUNCTION identifier_list
-		{{ DBG_TRACE_GRAMMAR(drop_stmt, | DROP FUNCTION identifier_list);
+	| DROP FUNCTION function_name_list
+		{{ DBG_TRACE_GRAMMAR(drop_stmt, | DROP FUNCTION function_name_list);
 
 			PT_NODE *node = parser_new_node (this_parser, PT_DROP_STORED_PROCEDURE);
 
@@ -5882,6 +5888,68 @@ synonym_name
 		}
 	;
 
+procedure_name_without_dot
+	: user_specified_name_without_dot
+		{ DBG_TRACE_GRAMMAR(procedure_name_without_dot, : user_specified_name_without_dot);
+			$$ = $1;
+		}
+	;
+
+procedure_name
+	: user_specified_name
+		{ DBG_TRACE_GRAMMAR(procedure_name, : user_specified_name);
+			$$ = $1;
+		}
+	;
+
+procedure_name_list
+	: procedure_name_list ',' procedure_name
+		{{
+
+			$$ = parser_make_link($1, $3);
+			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
+
+		DBG_PRINT}}
+	| procedure_name
+		{{
+
+			$$ = $1;
+			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
+
+		DBG_PRINT}}
+	;
+
+function_name_without_dot
+	: user_specified_name_without_dot
+		{ DBG_TRACE_GRAMMAR(function_name_without_dot, : user_specified_name_without_dot);
+			$$ = $1;
+		}
+	;
+
+function_name
+	: user_specified_name
+		{ DBG_TRACE_GRAMMAR(function_name, : user_specified_name);
+			$$ = $1;
+		}
+	;
+
+function_name_list
+	: function_name_list ',' function_name
+		{{
+
+			$$ = parser_make_link($1, $3);
+			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
+
+		DBG_PRINT}}
+	| function_name
+		{{
+
+			$$ = $1;
+			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
+
+		DBG_PRINT}}
+	;
+
 opt_partition_spec
 	: /* empty */
 		{{ DBG_TRACE_GRAMMAR(opt_partition_spec, : );
@@ -12872,7 +12940,7 @@ sp_param_list
 sp_param_def
 	: identifier
 	  opt_sp_in_out
-	  data_type
+	  sp_param_type
           opt_sp_default_value
 	  opt_comment_spec
 		{{ DBG_TRACE_GRAMMAR(sp_param_def, : identifier opt_sp_in_out sp_param_type opt_comment_spec);
@@ -19351,7 +19419,7 @@ generic_function
 	;
 
 generic_function_for_call        
-	: identifier 
+	: procedure_name 
         {
             if(pwd_info.parser_call_check)
             {
@@ -19366,8 +19434,7 @@ generic_function_for_call
             }
         }
         '(' opt_expression_list_for_call ')' opt_on_target
-		{{ DBG_TRACE_GRAMMAR(generic_function_for_call, : identifier '(' opt_expression_list ')' opt_on_target );
-
+		{{ DBG_TRACE_GRAMMAR(generic_function_for_call, : procedure_name '(' opt_expression_list_for_call ')' opt_on_target );
 			PT_NODE *node = NULL;
 
 			if ($6 == NULL)
@@ -19384,6 +19451,17 @@ generic_function_for_call
 				node->info.method_call.method_name = $1;
 				node->info.method_call.arg_list = $4;
 				node->info.method_call.on_call_target = $6;
+                                if (node->info.method_call.on_call_target != NULL)
+				  {
+				    PT_NAME_INFO_CLEAR_FLAG (node->info.method_call.method_name, PT_NAME_INFO_USER_SPECIFIED);
+				  }
+				else
+				  {
+				    if (node->info.method_call.arg_list != NULL && node->info.method_call.arg_list->node_type == PT_NAME && node->info.method_call.arg_list->info.name.meta_class == PT_META_CLASS)
+				      {
+					PT_NAME_INFO_CLEAR_FLAG (node->info.method_call.method_name, PT_NAME_INFO_USER_SPECIFIED);
+				      }
+				  }
 				node->info.method_call.call_or_expr = PT_IS_MTHD_EXPR;
 			      }