Correctly reflect timestamp columns in postgres.

While both datetime and timestamp turn into `TIMESTAMP` in postgres, the reflection back from timestamp should be 'timestamp'. This makes fixture files using the timestamp type more accurate. Refs #3133
cakephp · Apr 2, 2014 · f006af5 · f006af5
1 parent 211371d
commit f006af5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Database/Schema/PostgresSchema.php b/src/Database/Schema/PostgresSchema.php
@@ -81,7 +81,7 @@ protected function _convertColumn($column) {
 			return ['type' => $col, 'length' => null];
 		}
 		if (strpos($col, 'timestamp') !== false) {
-			return ['type' => 'datetime', 'length' => null];
+			return ['type' => 'timestamp', 'length' => null];
 		}
 		if ($col === 'serial' || $col === 'integer') {
 			return ['type' => 'integer', 'length' => 10];

diff --git a/tests/TestCase/Database/Schema/PostgresSchemaTest.php b/tests/TestCase/Database/Schema/PostgresSchemaTest.php
@@ -33,7 +33,7 @@ class PostgresSchemaTest extends TestCase {
  */
 	protected function _needsConnection() {
 		$config = ConnectionManager::config('test');
-		$this->skipIf(strpos($config['className'], 'Postgres') === false, 'Not using Postgres for test config');
+		$this->skipIf(strpos($config['driver'], 'Postgres') === false, 'Not using Postgres for test config');
 	}
 
 /**
@@ -87,11 +87,11 @@ public static function convertColumnProvider() {
 			// Timestamp
 			[
 				'TIMESTAMP',
-				['type' => 'datetime', 'length' => null]
+				['type' => 'timestamp', 'length' => null]
 			],
 			[
 				'TIMESTAMP WITHOUT TIME ZONE',
-				['type' => 'datetime', 'length' => null]
+				['type' => 'timestamp', 'length' => null]
 			],
 			// Date & time
 			[
@@ -307,7 +307,7 @@ public function testDescribeTable() {
 				'autoIncrement' => null,
 			],
 			'created' => [
-				'type' => 'datetime',
+				'type' => 'timestamp',
 				'null' => true,
 				'default' => null,
 				'length' => null,