88 * Portions Copyright (c) 1994, Regents of the University of California
99 *
1010 * IDENTIFICATION
11- * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.74 2008/06/08 22:41:04 tgl Exp $
11+ * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.75 2008/06/11 21:53:48 tgl Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
6262#include "storage/lmgr.h"
6363#include "utils/builtins.h"
6464#include "utils/fmgroids.h"
65+ #include "utils/guc.h"
6566#include "utils/lsyscache.h"
6667#include "utils/syscache.h"
6768#include "utils/tqual.h"
@@ -752,7 +753,7 @@ findDependentObjects(const ObjectAddress *object,
752753 *
753754 * targetObjects: list of objects that are scheduled to be deleted
754755 * behavior: RESTRICT or CASCADE
755- * msglevel: elog level for non-debug notice messages
756+ * msglevel: elog level for non-error report messages
756757 * origObject: base object of deletion, or NULL if not available
757758 * (the latter case occurs in DROP OWNED)
758759 */
@@ -763,8 +764,36 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
763764 const ObjectAddress * origObject )
764765{
765766 bool ok = true;
767+ StringInfoData clientdetail ;
768+ StringInfoData logdetail ;
769+ int numReportedClient = 0 ;
770+ int numNotReportedClient = 0 ;
766771 int i ;
767772
773+ /*
774+ * If no error is to be thrown, and the msglevel is too low to be shown
775+ * to either client or server log, there's no need to do any of the work.
776+ *
777+ * Note: this code doesn't know all there is to be known about elog
778+ * levels, but it works for NOTICE and DEBUG2, which are the only values
779+ * msglevel can currently have. We also assume we are running in a normal
780+ * operating environment.
781+ */
782+ if (behavior == DROP_CASCADE &&
783+ msglevel < client_min_messages &&
784+ (msglevel < log_min_messages || log_min_messages == LOG ))
785+ return ;
786+
787+ /*
788+ * We limit the number of dependencies reported to the client to
789+ * MAX_REPORTED_DEPS, since client software may not deal well with
790+ * enormous error strings. The server log always gets a full report.
791+ */
792+ #define MAX_REPORTED_DEPS 100
793+
794+ initStringInfo (& clientdetail );
795+ initStringInfo (& logdetail );
796+
768797 /*
769798 * We process the list back to front (ie, in dependency order not deletion
770799 * order), since this makes for a more understandable display.
@@ -773,48 +802,118 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
773802 {
774803 const ObjectAddress * obj = & targetObjects -> refs [i ];
775804 const ObjectAddressExtra * extra = & targetObjects -> extras [i ];
805+ char * objDesc ;
776806
777807 /* Ignore the original deletion target(s) */
778808 if (extra -> flags & DEPFLAG_ORIGINAL )
779809 continue ;
780810
811+ objDesc = getObjectDescription (obj );
812+
781813 /*
782814 * If, at any stage of the recursive search, we reached the object
783815 * via an AUTO or INTERNAL dependency, then it's okay to delete it
784816 * even in RESTRICT mode.
785817 */
786818 if (extra -> flags & (DEPFLAG_AUTO | DEPFLAG_INTERNAL ))
819+ {
820+ /*
821+ * auto-cascades are reported at DEBUG2, not msglevel. We
822+ * don't try to combine them with the regular message because
823+ * the results are too confusing when client_min_messages and
824+ * log_min_messages are different.
825+ */
787826 ereport (DEBUG2 ,
788827 (errmsg ("drop auto-cascades to %s" ,
789- getObjectDescription (obj ))));
828+ objDesc )));
829+ }
790830 else if (behavior == DROP_RESTRICT )
791831 {
792- ereport (msglevel ,
793- (errmsg ("%s depends on %s" ,
794- getObjectDescription (obj ),
795- getObjectDescription (& extra -> dependee ))));
832+ char * otherDesc = getObjectDescription (& extra -> dependee );
833+
834+ if (numReportedClient < MAX_REPORTED_DEPS )
835+ {
836+ /* separate entries with a newline */
837+ if (clientdetail .len != 0 )
838+ appendStringInfoChar (& clientdetail , '\n' );
839+ appendStringInfo (& clientdetail , _ ("%s depends on %s" ),
840+ objDesc , otherDesc );
841+ numReportedClient ++ ;
842+ }
843+ else
844+ numNotReportedClient ++ ;
845+ /* separate entries with a newline */
846+ if (logdetail .len != 0 )
847+ appendStringInfoChar (& logdetail , '\n' );
848+ appendStringInfo (& logdetail , _ ("%s depends on %s" ),
849+ objDesc , otherDesc );
850+ pfree (otherDesc );
796851 ok = false;
797852 }
798853 else
799- ereport (msglevel ,
800- (errmsg ("drop cascades to %s" ,
801- getObjectDescription (obj ))));
854+ {
855+ if (numReportedClient < MAX_REPORTED_DEPS )
856+ {
857+ /* separate entries with a newline */
858+ if (clientdetail .len != 0 )
859+ appendStringInfoChar (& clientdetail , '\n' );
860+ appendStringInfo (& clientdetail , _ ("drop cascades to %s" ),
861+ objDesc );
862+ numReportedClient ++ ;
863+ }
864+ else
865+ numNotReportedClient ++ ;
866+ /* separate entries with a newline */
867+ if (logdetail .len != 0 )
868+ appendStringInfoChar (& logdetail , '\n' );
869+ appendStringInfo (& logdetail , _ ("drop cascades to %s" ),
870+ objDesc );
871+ }
872+
873+ pfree (objDesc );
802874 }
803875
876+ if (numNotReportedClient > 0 )
877+ appendStringInfo (& clientdetail , _ ("\nand %d other objects "
878+ "(see server log for list)" ),
879+ numNotReportedClient );
880+
804881 if (!ok )
805882 {
806883 if (origObject )
807884 ereport (ERROR ,
808885 (errcode (ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST ),
809886 errmsg ("cannot drop %s because other objects depend on it" ,
810887 getObjectDescription (origObject )),
888+ errdetail ("%s" , clientdetail .data ),
889+ errdetail_log ("%s" , logdetail .data ),
811890 errhint ("Use DROP ... CASCADE to drop the dependent objects too." )));
812891 else
813892 ereport (ERROR ,
814893 (errcode (ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST ),
815894 errmsg ("cannot drop desired object(s) because other objects depend on them" ),
895+ errdetail ("%s" , clientdetail .data ),
896+ errdetail_log ("%s" , logdetail .data ),
816897 errhint ("Use DROP ... CASCADE to drop the dependent objects too." )));
817898 }
899+ else if (numReportedClient > 1 )
900+ {
901+ ereport (msglevel ,
902+ /* translator: %d always has a value larger than 1 */
903+ (errmsg ("drop cascades to %d other objects" ,
904+ numReportedClient + numNotReportedClient ),
905+ errdetail ("%s" , clientdetail .data ),
906+ errdetail_log ("%s" , logdetail .data )));
907+ }
908+ else if (numReportedClient == 1 )
909+ {
910+ /* we just use the single item as-is */
911+ ereport (msglevel ,
912+ (errmsg_internal ("%s" , clientdetail .data )));
913+ }
914+
915+ pfree (clientdetail .data );
916+ pfree (logdetail .data );
818917}
819918
820919/*
0 commit comments