2074,2077c2074,2079
< 			"select n.nspname, c.relname, a.attname, a.atttypid"
< 	   		", t.typname, a.attnum, a.attlen, a.atttypmod, a.attnotnull"
< 			", c.relhasrules, c.relkind, c.oid, d.adsrc from (((pg_catalog.pg_class c"
< 			" inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace",
---
> 			"select n.nspname, c.relname, a.attname"
> 			", case when t.typtype = 'd' then t.typbasetype else a.atttypid end as atttypid"
> 			", coalesce(bt.typname, t.typname ) AS typname, a.attnum, a.attlen"
> 			", case when t.typtype = 'd' then t.typtypmod else a.atttypmod end as atttypmod"
> 			", a.attnotnull, c.relhasrules, c.relkind, c.oid, d.adsrc"
> 			" from (((pg_catalog.pg_class c inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace",
2099,2101c2101,2104
< 			" and a.attrelid = c.oid) inner join pg_catalog.pg_type t"
< 			" on t.oid = a.atttypid) left outer join pg_attrdef d"
< 			" on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum");
---
> 			" and a.attrelid = c.oid)"
> 			" inner join pg_catalog.pg_type t on t.oid = a.atttypid)"
> 			" left outer join pg_attrdef d on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum"
> 			" left outer join pg_type bt on t.typtype = 'd' and t.typbasetype = bt.oid" );