--- src/ui/dlgProperty.cpp.orig	Fri Aug 22 02:43:18 2003
+++ src/ui/dlgProperty.cpp	Fri Aug 22 02:45:12 2003
@@ -212,7 +212,16 @@
         sql += wxT("COMMENT ON ") + objType + wxT(" ");
         if (schema)
            sql += schema->GetQuotedIdentifier() + wxT(".");
-        sql += qtIdent(GetName()) + wxT(" IS ") + qtString(comment) + wxT(";\n");
+        switch (obj->GetType())  
+        {
+        case PG_AGGREGATE:
+           sql += obj->GetFullName();
+           break;
+        default:
+           sql += qtIdent(GetName());
+           break;
+        }
+        sql += wxT(" IS ") + qtString(comment) + wxT(";\n");
     }
 }
 
--- src/ui/dlgAggregate.cpp.orig	Fri Aug 22 02:49:54 2003
+++ src/ui/dlgAggregate.cpp	Fri Aug 22 02:50:22 2003
@@ -81,6 +81,7 @@
         cbFinalFunc->SetSelection(0);
 
         txtInitial->SetValue(aggregate->GetInitialCondition());
+        txtComment->SetValue(aggregate->GetComment());
 
         txtName->Disable();
         cbBaseType->Disable();
--- src/schema/pgObject.cpp.orig	Fri Aug 22 04:03:36 2003
+++ src/schema/pgObject.cpp	Fri Aug 22 04:18:57 2003
@@ -176,8 +176,17 @@
     wxString cmt;
     if (!comment.IsNull())
     {
-        cmt = wxT("COMMENT ON ") + GetTypeName().Upper() + wxT(" ") + GetQuotedFullIdentifier() 
-            + wxT(" IS ") + qtString(comment) + wxT(";\n");
+        cmt = wxT("COMMENT ON ") + GetTypeName().Upper() + wxT(" ");
+        switch (type)
+        {
+             case PG_AGGREGATE:
+                  cmt += ((pgSchemaObject*)this)->GetSchema()->GetName() +  wxT(".") + GetFullName();
+                  break;
+             default:
+                  cmt += GetQuotedFullIdentifier();
+                  break;
+        }
+        cmt += wxT(" IS ") + qtString(comment) + wxT(";\n");
     }
     return cmt;
 }