From f67ddb17f67cc03fd778663746ec92e073e1bde0 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 19 Nov 2013 17:25:05 -0500
Subject: [PATCH] Fixes #1242: Gii Model generation added dropped table fields
 in Postgresql

---
 framework/yii/db/pgsql/Schema.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/framework/yii/db/pgsql/Schema.php b/framework/yii/db/pgsql/Schema.php
index 302843bafd..aa3cdc9bd3 100644
--- a/framework/yii/db/pgsql/Schema.php
+++ b/framework/yii/db/pgsql/Schema.php
@@ -242,18 +242,17 @@ SQL;
 		$schemaName = $this->db->quoteValue($table->schemaName);
 		$sql = <<<SQL
 SELECT 
-	current_database() as table_catalog,
-	d.nspname AS table_schema,        
-        c.relname AS table_name,
-        a.attname AS column_name,
-        t.typname AS data_type,
-        a.attlen AS character_maximum_length,
-        pg_catalog.col_description(c.oid, a.attnum) AS column_comment,
-        a.atttypmod AS modifier,
-        a.attnotnull = false AS is_nullable,	
-        CAST(pg_get_expr(ad.adbin, ad.adrelid) AS varchar) AS column_default,
-        coalesce(pg_get_expr(ad.adbin, ad.adrelid) ~ 'nextval',false) AS is_autoinc,
-        array_to_string((select array_agg(enumlabel) from pg_enum where enumtypid=a.atttypid)::varchar[],',') as enum_values,
+	d.nspname AS table_schema,
+	c.relname AS table_name,
+	a.attname AS column_name,
+	t.typname AS data_type,
+	a.attlen AS character_maximum_length,
+	pg_catalog.col_description(c.oid, a.attnum) AS column_comment,
+	a.atttypmod AS modifier,
+	a.attnotnull = false AS is_nullable,
+	CAST(pg_get_expr(ad.adbin, ad.adrelid) AS varchar) AS column_default,
+	coalesce(pg_get_expr(ad.adbin, ad.adrelid) ~ 'nextval',false) AS is_autoinc,
+	array_to_string((select array_agg(enumlabel) from pg_enum where enumtypid=a.atttypid)::varchar[],',') as enum_values,
 	CASE atttypid
 		 WHEN 21 /*int2*/ THEN 16
 		 WHEN 23 /*int4*/ THEN 32
@@ -289,7 +288,7 @@ FROM
 	LEFT JOIN pg_namespace d ON d.oid = c.relnamespace
 	LEFT join pg_constraint ct on ct.conrelid=c.oid and ct.contype='p'
 WHERE
-	a.attnum > 0
+	a.attnum > 0 and t.typename != ''
 	and c.relname = {$tableName}
 	and d.nspname = {$schemaName}
 ORDER BY