From a825d8280f832292ac13fbedaa0c4bfe180ab21c Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Wed, 22 Jun 2011 10:24:45 -0700
Subject: [PATCH] Adding support for SQLServer's datetime2 column, as that is
 the preferred datetime format in SQLServer.

---
 .../Model/Datasource/Database/Sqlserver.php     |  1 -
 .../Model/Datasource/Database/SqlserverTest.php | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
index ba6c491c17e..dae0b45841a 100644
--- a/lib/Cake/Model/Datasource/Database/Sqlserver.php
+++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -238,7 +238,6 @@ public function describe($model) {
 				$fields[$field]['length'] = $fields[$field]['length'] . ',' . $column->Size;
 			}
 		}
-		debug($fields);
 		$this->__cacheDescription($table, $fields);
 		$cols->closeCursor();
 		return $fields;
diff --git a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
index f6a9a8bd44d..9c438123a94 100644
--- a/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
@@ -402,7 +402,16 @@ public function testDescribe() {
 				'Length' => -1,
 				'Null' => 'YES',
 				'Type' => 'nvarchar'
-			)
+			),
+			(object) array(
+				'Default' => '',
+				'Field' => 'published',
+				'Key' => 0,
+				'Type' => 'datetime2',
+				'Length' => 8,
+				'Null' => 'YES',
+				'Size' => ''
+			),
 		));
 		$this->db->executeResultsStack = array($SqlserverTableDescription);
 		$dummyModel = $this->model;
@@ -419,6 +428,12 @@ public function testDescribe() {
 				'null' => true,
 				'default' => null,
 				'length' => null
+			),
+			'published' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => '',
+				'length' => null
 			)
 		);
 		$this->assertEqual($expected, $result);