Merge branch 'fix/#2555-#2612-fix-date-and-datetimetz-type-mapping-on-oracledb' into 2.5

Backport #2555 to 2.5
Backport #2612 to 2.5

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -1123,7 +1123,7 @@ LEFT JOIN user_cons_columns r_cols
             'nvarchar2'         => 'string',
             'char'              => 'string',
             'nchar'             => 'string',
-            'date'              => 'datetime',
+            'date'              => 'date',
             'timestamp'         => 'datetime',
             'timestamptz'       => 'datetimetz',
             'float'             => 'float',

lib/Doctrine/DBAL/Schema/OracleSchemaManager.php

@@ -102,7 +102,7 @@ class OracleSchemaManager extends AbstractSchemaManager
 
         $dbType = strtolower($tableColumn['data_type']);
         if (strpos($dbType, "timestamp(") === 0) {
-            if (strpos($dbType, "WITH TIME ZONE")) {
+            if (strpos($dbType, "with time zone")) {
                 $dbType = "timestamptz";
             } else {
                 $dbType = "timestamp";

tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php

@@ -233,4 +233,23 @@ class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase
         $columns = $this->_sm->listTableColumns($table->getName(), $this->_conn->getUsername());
         $this->assertCount(7, $columns);
     }
+
+    /**
+     * @group DBAL-2555
+     */
+    public function testListTableDateTypeColumns()
+    {
+        $table = new Table('tbl_date');
+        $table->addColumn('col_date', 'date');
+        $table->addColumn('col_datetime', 'datetime');
+        $table->addColumn('col_datetimetz', 'datetimetz');
+
+        $this->_sm->dropAndCreateTable($table);
+
+        $columns = $this->_sm->listTableColumns('tbl_date');
+
+        $this->assertSame('date', $columns['col_date']->getType()->getName());
+        $this->assertSame('datetime', $columns['col_datetime']->getType()->getName());
+        $this->assertSame('datetimetz', $columns['col_datetimetz']->getType()->getName());
+    }
 }

tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php

@@ -414,6 +414,9 @@ class OraclePlatformTest extends AbstractPlatformTestCase
         $this->assertEquals($expectedSql, $this->_platform->getAlterTableSQL($tableDiff));
     }
 
+    /**
+     * @group DBAL-2555
+     */
     public function testInitializesDoctrineTypeMappings()
     {
         $this->assertTrue($this->_platform->hasDoctrineTypeMappingFor('long raw'));
@@ -421,6 +424,9 @@ class OraclePlatformTest extends AbstractPlatformTestCase
 
         $this->assertTrue($this->_platform->hasDoctrineTypeMappingFor('raw'));
         $this->assertSame('binary', $this->_platform->getDoctrineTypeMapping('raw'));
+
+        $this->assertTrue($this->_platform->hasDoctrineTypeMappingFor('date'));
+        $this->assertSame('date', $this->_platform->getDoctrineTypeMapping('date'));
     }
 
     protected function getBinaryMaxLength()