Ticket #125: ticket125_v1.patch

File ticket125_v1.patch, 1.6 KB (added by gleu, 2 years ago)

v1 patch

  • pgadmin/schema/pgColumn.cpp 

    diff --git a/pgadmin/schema/pgColumn.cpp b/pgadmin/schema/pgColumn.cpp
index f9264cf..00806f4 100644
    a b  
    375375        systemRestriction = wxT("\n   AND att.attnum > 0"); 
    376376         
    377377    wxString sql= 
    378         wxT("SELECT att.*, def.*, pg_catalog.pg_get_expr(def.adbin, def.adrelid) AS defval, CASE WHEN att.attndims > 0 THEN 1 ELSE 0 END AS isarray, format_type(ty.oid,NULL) AS typname, tn.nspname as typnspname, et.typname as elemtypname,\n") 
     378        wxT("SELECT att.*, def.*, pg_catalog.pg_get_expr(def.adbin, def.adrelid) AS defval, CASE WHEN att.attndims > 0 THEN 1 ELSE 0 END AS isarray, format_type(ty.oid,NULL) AS typname, format_type(ty.oid,att.atttypmod) AS displaytypname, tn.nspname as typnspname, et.typname as elemtypname,\n") 
    379379        wxT("  cl.relname, na.nspname, att.attstattarget, description, cs.relname AS sername, ns.nspname AS serschema,\n") 
    380380        wxT("  (SELECT count(1) FROM pg_type t2 WHERE t2.typname=ty.typname) > 1 AS isdup, indkey,\n") 
    381381        wxT("  CASE \n") 
    … …  
    453453            column->iSetRawTypename(dt.Name()); 
    454454 
    455455            column->iSetVarTypename(dt.FullName()); 
    456             column->iSetQuotedTypename(dt.FullName()); 
     456            column->iSetQuotedTypename(columns->GetVal(wxT("displaytypname"))); 
    457457 
    458458            column->iSetNotNull(columns->GetBool(wxT("attnotnull"))); 
    459459            column->iSetQuotedFullTable(database->GetQuotedSchemaPrefix(columns->GetVal(wxT("nspname")))