diff --git a/src/pl/ob_pl_resolver.cpp b/src/pl/ob_pl_resolver.cpp
index e215e432ea..ba028ed835 100644
--- a/src/pl/ob_pl_resolver.cpp
+++ b/src/pl/ob_pl_resolver.cpp
@@ -10196,7 +10196,7 @@ int ObPLResolver::resolve_raw_expr(const ParseNode &node,
                             NULL,/*parent ns*/
                             params.is_prepare_protocol_,
                             false, /*check mode*/
-                            true, /*sql mode*/
+                            false, /*sql mode*/
                             params.param_list_);
       OZ (package_guard.init());
       OZ (resolver.init(func_ast));
@@ -11928,12 +11928,8 @@ int ObPLResolver::resolve_udf_info(
                                             object_database_id, synonym_id, object_name, exist,
                                             true, // need search public synonym
                                             &is_public));
-      if (OB_FAIL(ret) || !exist || (routine_info->get_package_id() != synonym_id && routine_info->get_routine_id() != synonym_id)) {
+      if (OB_FAIL(ret) || !exist) {
         ret = OB_SUCCESS; // some case may not be synonym.
-      } else if (!is_public) {
-        if (routine_info->get_database_id() != resolve_ctx_.session_info_.get_database_id()) {
-          db_name = resolve_ctx_.session_info_.get_database_name();
-        }
       } else {
         db_name = OB_SYS_DATABASE_NAME;
       }
diff --git a/src/sql/printer/ob_raw_expr_printer.cpp b/src/sql/printer/ob_raw_expr_printer.cpp
index 8a6b845425..158c5ef084 100644
--- a/src/sql/printer/ob_raw_expr_printer.cpp
+++ b/src/sql/printer/ob_raw_expr_printer.cpp
@@ -1104,7 +1104,7 @@ int ObRawExprPrinter::print(ObAggFunRawExpr *expr)
         }
       }
       if (OB_SUCC(ret)) {
-        if (!database_name.empty()) {
+        if (!database_name.empty() && database_name.case_compare(OB_SYS_DATABASE_NAME) != 0) {
           DATA_PRINTF("%.*s.", LEN_AND_PTR(database_name));
         }
         if (!package_name.empty()) {
@@ -3514,7 +3514,7 @@ int ObRawExprPrinter::print(ObWinFunRawExpr *expr)
           }
         }
         if (OB_SUCC(ret)) {
-          if(!database.empty()){
+          if(!database.empty() && database.case_compare(OB_SYS_DATABASE_NAME) != 0) {
             PRINT_IDENT_WITH_QUOT(database);
             DATA_PRINTF(".");
           }