← Back to branch summary

~ubuntu-branches/ubuntu/utopic/pgadmin3/utopic-proposed

« back to all changes in this revision

Viewing changes to pgadmin/schema/pgCollation.cpp

  • Committer: Package Import Robot
  • Author(s): Christoph Berg
  • Date: 2013-09-10 16:16:38 UTC
  • mfrom: (1.3.4)
  • Revision ID: package-import@ubuntu.com-20130910161638-wwup1q553ylww7dr
Tags: 1.18.0-1
* New upstream release.
* Don't install /usr/bin/png2c anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pgadmin/schema/pgCollation.cpp
2
2
//
3
3
// pgAdmin III - PostgreSQL Tools
4
4
//
5
 
// Copyright (C) 2002 - 2012, The pgAdmin Development Team
 
5
// Copyright (C) 2002 - 2013, The pgAdmin Development Team
6
6
// This software is released under the PostgreSQL Licence
7
7
//
8
8
// pgCollation.cpp - Collation class
169
169
                                wxT("       pg_get_userbyid(c.collowner) as cowner, description\n")
170
170
                                wxT("  FROM pg_collation c\n")
171
171
                                wxT("  JOIN pg_namespace n ON n.oid=c.collnamespace\n")
172
 
                                wxT("  LEFT OUTER JOIN pg_description des ON des.objoid=c.oid\n")
 
172
                                wxT("  LEFT OUTER JOIN pg_description des ON (des.objoid=c.oid AND des.classoid='pg_collation'::regclass)\n")
173
173
                                wxT(" WHERE c.collnamespace = ") + NumToStr(collection->GetSchema()->GetOid()) + wxT("::oid\n")
174
174
                                + restriction +
175
175
                                wxT(" ORDER BY c.collname"));