From 500783aa31e9f6000c3ba171cc74f087aba90aea Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 8 Jan 2008 21:22:37 +0000
Subject: [PATCH] fixes #718

---
 lib/Doctrine/DataDict/Pgsql.php  | 4 +++-
 tests/DataDict/PgsqlTestCase.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/DataDict/Pgsql.php b/lib/Doctrine/DataDict/Pgsql.php
index ca9520d08..35860d226 100644
--- a/lib/Doctrine/DataDict/Pgsql.php
+++ b/lib/Doctrine/DataDict/Pgsql.php
@@ -414,7 +414,7 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
                 return 'TIMESTAMP without time zone';
             case 'float':
             case 'double':
-                return 'FLOAT8';
+                return 'FLOAT';
             case 'decimal':
                 $length = !empty($field['length']) ? $field['length'] : 18;
                 $scale = !empty($field['scale']) ? $field['scale'] : $this->conn->getAttribute(Doctrine::ATTR_DECIMAL_PLACES);
@@ -511,6 +511,7 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
                 break;
             case 'datetime':
             case 'timestamp':
+            case 'timestamptz':
                 $type[] = 'timestamp';
                 $length = null;
                 break;
@@ -521,6 +522,7 @@ class Doctrine_DataDict_Pgsql extends Doctrine_DataDict
             case 'float':
             case 'float4':
             case 'double':
+            case 'double precision':
             case 'real':
                 $type[] = 'float';
                 break;
diff --git a/tests/DataDict/PgsqlTestCase.php b/tests/DataDict/PgsqlTestCase.php
index 99a97a197..333a634ef 100644
--- a/tests/DataDict/PgsqlTestCase.php
+++ b/tests/DataDict/PgsqlTestCase.php
@@ -86,7 +86,7 @@ class Doctrine_DataDict_Pgsql_TestCase extends Doctrine_UnitTestCase
 
         $this->assertEqual($type, array('type' => array('blob', 'clob'),
                                         'length' => null, 
-                                        'unsigned' => null, 
+                                        'unsigned' => null,
                                         'fixed' => null));
     }
     public function testGetPortableDeclarationSupportsNativeTimestampTypes()
@@ -281,7 +281,7 @@ class Doctrine_DataDict_Pgsql_TestCase extends Doctrine_UnitTestCase
     {
         $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
 
-        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'FLOAT8');
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'FLOAT');
     }
     public function testGetNativeDefinitionSupportsBooleanType()
     {