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

src/executables/csql.c

@@ -1541,11 +1541,11 @@ csql_set_server_output (CSQL_ARGUMENT * csql_arg, bool server_output)
   csql_arg->pl_server_output = server_output;
   if (server_output)
     {
-      csql_execute_query ("CALL enable (50000);");
+      csql_execute_query ("CALL dbms_output.enable (50000);");
     }
   else
     {
-      csql_execute_query ("CALL disable ();");
+      csql_execute_query ("CALL dbms_output.disable ();");
     }
 }
 
@@ -1845,7 +1845,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/object/authenticate_owner.cpp

@@ -478,7 +478,16 @@ 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];
+  new_name_str[0]= '\0';
+  char downcase_owner_name[DB_MAX_USER_LENGTH];
+  downcase_owner_name[0] = '\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))
@@ -488,6 +497,31 @@ 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 */
+      db_make_string (&value, new_name_str);
+      error = obj_set (sp, SP_ATTR_UNIQUE_NAME, &value);
+      if (error < 0)
+	{
+	  goto end;
+	}
+
       db_make_object (&value, owner);
       error = obj_set (sp, SP_ATTR_OWNER, &value);
       if (error < 0)

src/object/schema_system_catalog_install.cpp

@@ -832,6 +832,7 @@ namespace cubschema
 		   CT_STORED_PROC_NAME,
 		   // columns
     {
+      {"unique_name", format_varchar (255)},
       {"sp_name", format_varchar (255)},
       {"sp_type", "integer"},
       {"return_type", "integer"},
@@ -847,7 +848,7 @@ namespace cubschema
     },
 // constraints
     {
-      {DB_CONSTRAINT_UNIQUE, "", {"sp_name", nullptr}, false},
+      {DB_CONSTRAINT_PRIMARY_KEY, "pk_db_stored_procedure_unique_name", {"unique_name", nullptr}, false}
     },
 // authorization
     {
@@ -868,7 +869,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"},
@@ -881,7 +882,7 @@ namespace cubschema
     },
 // constraints
     {
-      {DB_CONSTRAINT_INDEX, "", {"sp_name", nullptr}, false},
+      {DB_CONSTRAINT_INDEX, "", {"sp_of", nullptr}, false},
     },
 // authorization
     {
@@ -1844,6 +1845,7 @@ namespace cubschema
 		   // columns
     {
       {"sp_name", "varchar(255)"},
+      {"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,9 @@ static char *g_plcsql_text;
 %type <node> serial_name
 %type <node> synonym_name_without_dot
 %type <node> synonym_name
+%type <node> procedure_or_function_name_without_dot
+%type <node> procedure_or_function_name
+%type <node> procedure_or_function_name_list
 %type <node> opt_alter_synonym
 %type <node> opt_identifier
 %type <node> normal_or_class_attr_list_with_commas
@@ -3063,7 +3066,8 @@ create_stmt
 		  push_msg(MSGCAT_SYNTAX_INVALID_CREATE_PROCEDURE);
                   expecting_pl_lang_spec = 1;
 		}
-	  identifier opt_sp_param_list		        /* 5, 6 */
+	  procedure_or_function_name_without_dot        /* 5 */
+	  opt_sp_param_list	                        /* 6 */
           opt_authid                                    /* 7 */
 	  is_or_as pl_language_spec		        /* 8, 9 */
 	  opt_comment_spec				/* 10 */
@@ -3096,7 +3100,8 @@ create_stmt
 			push_msg(MSGCAT_SYNTAX_INVALID_CREATE_FUNCTION);
                         expecting_pl_lang_spec = 1;
 		}
-	  identifier opt_sp_param_list	                /* 5, 6 */
+	  procedure_or_function_name_without_dot        /* 5 */
+	  opt_sp_param_list	                        /* 6 */
 	  RETURN sp_return_type		                /* 7, 8 */
           opt_authid                                    /* 9 */
 	  is_or_as pl_language_spec		        /* 10, 11 */
@@ -4092,10 +4097,10 @@ alter_stmt
 		DBG_PRINT}}
 	| ALTER				/* 1 */
 	  procedure_or_function		/* 2 */
-	  identifier				/* 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);
+	  procedure_or_function_name    /* 3 */
+	  opt_owner_clause		/* 4 */
+	  opt_comment_spec		/* 5 */
+		{{ DBG_TRACE_GRAMMAR(alter_stmt, | ALTER procedure_or_function procedure_or_function_name opt_owner_clause opt_comment_spec);
 
 			PT_NODE *node = parser_new_node (this_parser, PT_ALTER_STORED_PROCEDURE);
 
@@ -4671,8 +4676,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_or_function_name_list
+		{{ DBG_TRACE_GRAMMAR(drop_stmt, | DROP PROCEDURE procedure_or_function_name_list);
 
 			PT_NODE *node = parser_new_node (this_parser, PT_DROP_STORED_PROCEDURE);
 
@@ -4687,8 +4692,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 procedure_or_function_name_list
+		{{ DBG_TRACE_GRAMMAR(drop_stmt, | DROP FUNCTION procedure_or_function_name_list);
 
 			PT_NODE *node = parser_new_node (this_parser, PT_DROP_STORED_PROCEDURE);
 
@@ -5882,6 +5887,37 @@ synonym_name
 		}
 	;
 
+procedure_or_function_name_without_dot
+	: user_specified_name_without_dot
+		{ DBG_TRACE_GRAMMAR(procedure_or_function_name_without_dot, : user_specified_name_without_dot);
+			$$ = $1;
+		}
+	;
+
+procedure_or_function_name
+	: user_specified_name
+		{ DBG_TRACE_GRAMMAR(procedure_or_function_name, : user_specified_name);
+			$$ = $1;
+		}
+	;
+
+procedure_or_function_name_list
+	: procedure_or_function_name_list ',' procedure_or_function_name
+		{{ DBG_TRACE_GRAMMAR(procedure_or_function_name_list, : procedure_or_function_name_list ',' procedure_or_function_name);
+
+			$$ = parser_make_link($1, $3);
+			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
+
+		DBG_PRINT}}
+	| procedure_or_function_name
+		{{ DBG_TRACE_GRAMMAR(procedure_or_function_name_list, : procedure_or_function_name);
+
+			$$ = $1;
+			PARSER_SAVE_ERR_CONTEXT ($$, @$.buffer_pos)
+
+		DBG_PRINT}}
+	;
+
 opt_partition_spec
 	: /* empty */
 		{{ DBG_TRACE_GRAMMAR(opt_partition_spec, : );
@@ -19351,7 +19387,7 @@ generic_function
 	;
 
 generic_function_for_call        
-	: identifier 
+	: procedure_or_function_name 
         {
             if(pwd_info.parser_call_check)
             {
@@ -19366,8 +19402,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_or_function_name '(' opt_expression_list_for_call ')' opt_on_target );
 			PT_NODE *node = NULL;
 
 			if ($6 == NULL)
@@ -19384,6 +19419,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;
 			      }
 

src/parser/name_resolution.c

@@ -3245,6 +3245,19 @@ pt_bind_names (PARSER_CONTEXT * parser, PT_NODE * node, void *arg, int *continue
 	      node->info.method_call.on_call_target = node->info.method_call.arg_list;
 	      node->info.method_call.arg_list = node->info.method_call.arg_list->next;
 	      node->info.method_call.on_call_target->next = NULL;
+
+	      /*
+	       * When using a session variable in the first arg_list,
+	       * It is unknown whether the session variable contains a class, object, or constant value.
+	       * So, if it's not a Java stored procedure and there is an on_call_target, then it's considered a method and [user_schema] is removed.
+	       * 
+	       * ex) create class x (xint int, xstr string, class cint int) method add_int(int, int) int function add_int file '$METHOD_FILE';
+	       *     insert into x values (4, 'string 4');
+	       *     select x into p1 from x where xint = 4;
+	       *     call add_int(p1, 1, 2);
+	       */
+	      node->info.method_call.method_name->info.name.original =
+		sm_remove_qualifier_name (node->info.method_call.method_name->info.name.original);
 	    }
 
 	  /* make method name look resolved */
@@ -3286,9 +3299,7 @@ pt_bind_names (PARSER_CONTEXT * parser, PT_NODE * node, void *arg, int *continue
 		  node->info.method_call.method_name->info.name.spec_id = entity->info.spec.id;
 		}
 	    }
-
 	}
-
       break;
 
     case PT_DATA_TYPE:
@@ -3345,6 +3356,49 @@ pt_bind_names (PARSER_CONTEXT * parser, PT_NODE * node, void *arg, int *continue
 	  {
 	    node = temp;
 	  }
+	else if (PT_CHECK_USER_SCHEMA_PROCEDURE_OR_FUNCTION (node))
+	  {
+	    /*
+	     * jsp_is_exist_stored_procedure() could not be checked in pt_set_user_specified_name(), so it was checked in pt_bind_names().
+	     * Created a temporary node in name.original to join user_schema(dot.arg1) and sp_name(dot.arg2).
+	     */
+	    char downcase_owner_name[DB_MAX_USER_LENGTH];
+	    downcase_owner_name[0] = '\0';
+	    char *generic_name = NULL;
+
+	    sm_downcase_name (node->info.dot.arg1->info.name.original, downcase_owner_name, DB_MAX_USER_LENGTH);
+	    generic_name = pt_append_string (parser, downcase_owner_name, ".");
+	    generic_name = pt_append_string (parser, generic_name, node->info.dot.arg2->info.function.generic_name);
+	    node->info.dot.arg2->info.function.generic_name = generic_name;
+
+	    if (jsp_is_exist_stored_procedure (node->info.dot.arg2->info.function.generic_name))
+	      {
+		/*
+		 * If (dot.arg1->node_type == PT_NAME) & (dot.arg2->node_type == PT_FUNCTION), pt_bind_name_or_path_in_scope() always returns NULL and has an er_errid() value.
+		 */
+		if (er_errid () == NO_ERROR)
+		  {
+		    pt_reset_error (parser);
+		  }
+
+		node1 = pt_resolve_stored_procedure (parser, node->info.dot.arg2, bind_arg);
+		if (node1 == NULL)
+		  {
+		    break;	// FIXME: something wrong
+		  }
+		PT_NODE_COPY_NUMBER_OUTERLINK (node1, node);
+
+		PT_NODE_INIT_OUTERLINK (node);
+		parser_free_tree (parser, node);
+		node = node1;	/* return the new node */
+		/* don't revisit leaves */
+		*continue_walk = PT_LIST_WALK;
+	      }
+	    else if (pt_has_error (parser))
+	      {
+		return NULL;
+	      }
+	  }
 	else if (pt_has_error (parser))
 	  {
 	    return NULL;
@@ -3379,7 +3433,9 @@ 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 *generic_name = node->info.function.generic_name;
+	  const char *dot = NULL;
+	  const char *current_schema_name = NULL;
+	  char buffer[SM_MAX_IDENTIFIER_LENGTH];
 	  node->info.function.function_type = pt_find_function_type (node->info.function.generic_name);
 
 	  if (node->info.function.function_type == PT_GENERIC)
@@ -3389,8 +3445,16 @@ 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 (generic_name))
+	      if (jsp_is_exist_stored_procedure (node->info.function.generic_name))
 		{
+		  dot = strchr (node->info.function.generic_name, '.');
+		  if (dot == NULL)
+		    {
+		      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);
+		    }
+
 		  node1 = pt_resolve_stored_procedure (parser, node, bind_arg);
 		}
 	      else

src/parser/parse_tree.h

@@ -540,6 +540,12 @@ struct json_t;
         || (n->node_type == PT_UPDATE && n->info.update.spec->info.spec.remote_server_name) \
         || (n->node_type == PT_MERGE && n->info.merge.into->info.spec.remote_server_name))
 
+#define PT_CHECK_USER_SCHEMA_PROCEDURE_OR_FUNCTION(n) \
+	((n->info.dot.arg1->node_type == PT_NAME) \
+	&& (n->info.dot.arg2->node_type == PT_FUNCTION) \
+	&& (n->info.dot.arg2->info.function.function_type == PT_GENERIC) \
+        && (strchr (n->info.dot.arg2->info.function.generic_name, '.') == NULL))
+
 #if !defined (SERVER_MODE)
 /* the following defines support host variable binding for internal statements.
    internal statements can be generated on TEXT handling, and these statements