From 3169c5a1e78f4ab272fa8f51ae73655fa538d2d6 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 23 Jun 2011 16:13:35 -0700
Subject: [PATCH] Fixing issues with unicode quoting.

---
 lib/Cake/Model/Datasource/Database/Sqlserver.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
index 134aaca94..fa81b3576 100644
--- a/lib/Cake/Model/Datasource/Database/Sqlserver.php
+++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -558,6 +558,8 @@ class Sqlserver extends DboSource {
 	public function value($data, $column = null) {
 		if (is_array($data) || is_object($data)) {
 			return parent::value($data, $column);
+		} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
+			return $data;
 		}
 
 		if (empty($column)) {
@@ -658,8 +660,10 @@ class Sqlserver extends DboSource {
 			} else {
 				$result = str_replace('DEFAULT NULL', 'NULL', $result);
 			}
-		} else if (array_keys($column) == array('type', 'name')) {
+		} elseif (array_keys($column) == array('type', 'name')) {
 			$result .= ' NULL';
+		} elseif (strpos($result, "DEFAULT N'")) {
+			$result = str_replace("DEFAULT N'", "DEFAULT '", $result);
 		}
 		return $result;
 	}