diff --git a/cake/basics.php b/cake/basics.php index 93bb05f24..d82fa49d0 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -362,8 +362,8 @@ if (!function_exists('array_combine')) { */ function env($key) { if ($key == 'HTTPS') { - if (isset($_SERVER) && !empty($_SERVER)) { - return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on'); + if (isset($_SERVER['HTTPS'])) { + return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off'); } return (strpos(env('SCRIPT_URI'), 'https://') === 0); } @@ -624,9 +624,9 @@ if (!function_exists('file_put_contents')) { } if ($return === false) { - echo I18n::translate($singular, $plural, null, 5, $count); + echo I18n::translate($singular, $plural, null, 6, $count); } else { - return I18n::translate($singular, $plural, null, 5, $count); + return I18n::translate($singular, $plural, null, 6, $count); } } /** @@ -672,9 +672,9 @@ if (!function_exists('file_put_contents')) { } if ($return === false) { - echo I18n::translate($singular, $plural, $domain, 5, $count); + echo I18n::translate($singular, $plural, $domain, 6, $count); } else { - return I18n::translate($singular, $plural, $domain, 5, $count); + return I18n::translate($singular, $plural, $domain, 6, $count); } } /** @@ -723,13 +723,13 @@ if (!function_exists('file_put_contents')) { * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL. * * Note that the category must be specified with a numeric value, instead of the constant name. The values are: - * LC_CTYPE 0 - * LC_NUMERIC 1 - * LC_TIME 2 - * LC_COLLATE 3 - * LC_MONETARY 4 - * LC_MESSAGES 5 - * LC_ALL 6 + * LC_ALL 0 + * LC_COLLATE 1 + * LC_CTYPE 2 + * LC_MONETARY 3 + * LC_NUMERIC 4 + * LC_TIME 5 + * LC_MESSAGES 6 * * @param string $domain Domain * @param string $singular Singular string to translate @@ -810,7 +810,7 @@ if (!function_exists('file_put_contents')) { foreach ($args[0] as $valueKey => $valueData) { for ($i = 1; $i < $argc; $i++) { - if (isset($args[$i][$valueKey])) { + if (array_key_exists($valueKey, $args[$i])) { continue 2; } } @@ -830,7 +830,7 @@ if (!function_exists('file_put_contents')) { function array_intersect_key($arr1, $arr2) { $res = array(); foreach ($arr1 as $key => $value) { - if (isset($arr2[$key])) { + if (array_key_exists($key, $arr2)) { $res[$key] = $arr1[$key]; } } diff --git a/cake/console/cake.php b/cake/console/cake.php index 823e6fc00..2e114a343 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -446,13 +446,15 @@ class ShellDispatcher { */ function parseParams($params) { $this->__parseParams($params); - $defaults = array('app' => 'app', 'root' => dirname(dirname(dirname(__FILE__))), 'working' => null, 'webroot' => 'webroot'); - $params = array_merge($defaults, array_intersect_key($this->params, $defaults)); - - $isWin = array_filter(array_map('strpos', $params, array('\\'))); - + $isWin = false; + foreach ($defaults as $default => $value) { + if (strpos($params[$default], '\\') !== false) { + $isWin = true; + break; + } + } $params = str_replace('\\', '/', $params); if (!empty($params['working']) && (!isset($this->args[0]) || isset($this->args[0]) && $this->args[0]{0} !== '.')) { @@ -464,7 +466,7 @@ class ShellDispatcher { } } - if ($params['app'][0] == '/' || preg_match('/([a-zA-Z])(:)/i', $params['app'], $matches)) { + if ($params['app'][0] == '/' || preg_match('/([a-z])(:)/i', $params['app'], $matches)) { $params['root'] = dirname($params['app']); } elseif (strpos($params['app'], '/')) { $params['root'] .= '/' . dirname($params['app']); diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php index 741f2f66f..fb529e439 100644 --- a/cake/console/libs/api.php +++ b/cake/console/libs/api.php @@ -66,7 +66,7 @@ class ApiShell extends Shell { return $this->help(); } - $type = low($this->args[0]); + $type = strtolower($this->args[0]); if (isset($this->paths[$type])) { $path = $this->paths[$type]; @@ -151,17 +151,17 @@ class ApiShell extends Shell { $commands = array( 'path' => "\t\n" . - "\t\tEither a full path or type of class (model, behavior, controller, component, view, helper).\n". - "\t\tAvailable values:\n\n". - "\t\tbehavior\tLook for class in CakePHP behavior path\n". - "\t\tcache\tLook for class in CakePHP cache path\n". - "\t\tcontroller\tLook for class in CakePHP controller path\n". - "\t\tcomponent\tLook for class in CakePHP component path\n". - "\t\thelper\tLook for class in CakePHP helper path\n". - "\t\tmodel\tLook for class in CakePHP model path\n". - "\t\tview\tLook for class in CakePHP view path\n", + "\t\tEither a full path or type of class (model, behavior, controller, component, view, helper).\n". + "\t\tAvailable values:\n\n". + "\t\tbehavior\tLook for class in CakePHP behavior path\n". + "\t\tcache\tLook for class in CakePHP cache path\n". + "\t\tcontroller\tLook for class in CakePHP controller path\n". + "\t\tcomponent\tLook for class in CakePHP component path\n". + "\t\thelper\tLook for class in CakePHP helper path\n". + "\t\tmodel\tLook for class in CakePHP model path\n". + "\t\tview\tLook for class in CakePHP view path\n", 'className' => "\t\n" . - "\t\tA CakePHP core class name (e.g: Component, HtmlHelper).\n" + "\t\tA CakePHP core class name (e.g: Component, HtmlHelper).\n" ); $this->out($head); @@ -196,16 +196,16 @@ class ApiShell extends Shell { $contents = $File->read(); - if (preg_match_all('%(/\\*\\*[\\s\\S]*?\\*/)(\\s+function\\s+\\w+)(\\(.+\\))%', $contents, $result, PREG_PATTERN_ORDER)) { + if (preg_match_all('%(/\\*\\*[\\s\\S]*?\\*/)(\\s+function\\s+\\w+)(\\(.*\\))%', $contents, $result, PREG_PATTERN_ORDER)) { foreach ($result[2] as $key => $method) { $method = str_replace('function ', '', trim($method)); if (strpos($method, '__') === false && $method[0] != '_') { $parsed[$method] = array( - 'comment' => r(array('/*', '*/', '*'), '', trim($result[1][$key])), - 'method' => $method, - 'parameters' => trim($result[3][$key]), - ); + 'comment' => str_replace(array('/*', '*/', '*'), '', trim($result[1][$key])), + 'method' => $method, + 'parameters' => trim($result[3][$key]) + ); } } } diff --git a/cake/console/libs/console.php b/cake/console/libs/console.php index 9d7f9aa49..19b075092 100644 --- a/cake/console/libs/console.php +++ b/cake/console/libs/console.php @@ -252,8 +252,7 @@ class ConsoleShell extends Shell { if ($this->__isValidModel($modelToSave)) { // Extract the array of data we are trying to build list($foo, $data) = explode("->save", $command); - $badChars = array("(", ")"); - $data = str_replace($badChars, "", $data); + $data = preg_replace('/^\(*(array)?\(*(.+?)\)*$/i', '\\2', $data); $saveCommand = "\$this->{$modelToSave}->save(array('{$modelToSave}' => array({$data})));"; @eval($saveCommand); $this->out('Saved record for ' . $modelToSave); @@ -336,4 +335,4 @@ class ConsoleShell extends Shell { return true; } } -?> \ No newline at end of file +?> diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php index 799bb0083..c04a399cb 100644 --- a/cake/console/libs/schema.php +++ b/cake/console/libs/schema.php @@ -199,7 +199,7 @@ class SchemaShell extends Shell { } } $db =& ConnectionManager::getDataSource($this->Schema->connection); - $contents = "#". $Schema->name ." sql generated on: " . date('Y-m-d H:m:s') . " : ". time()."\n\n"; + $contents = "#" . $Schema->name . " sql generated on: " . date('Y-m-d H:i:s') . " : " . time() . "\n\n"; $contents .= $db->dropSchema($Schema) . "\n\n". $db->createSchema($Schema); if ($write) { if (strpos($write, '.sql') === false) { diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php index bac6c347b..eed6bff8e 100644 --- a/cake/console/libs/shell.php +++ b/cake/console/libs/shell.php @@ -149,10 +149,10 @@ class Shell extends Object { ClassRegistry::map($this->name, $this->alias); if (!PHP5 && isset($this->args[0])) { - if (strpos($this->name, low(Inflector::camelize($this->args[0]))) !== false) { + if (strpos($this->name, strtolower(Inflector::camelize($this->args[0]))) !== false) { $dispatch->shiftArgs(); } - if (low($this->command) == low(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) { + if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) { $dispatch->shiftArgs(); } } @@ -297,7 +297,7 @@ class Shell extends Object { } if (!isset($this->{$taskName})) { - $this->err("Task '".$taskName."' could not be loaded"); + $this->err("Task '" . $taskName . "' could not be loaded"); $this->_stop(); } } @@ -329,7 +329,7 @@ class Shell extends Object { } } if (is_array($options)) { - while ($in == '' || ($in && (!in_array(low($in), $options) && !in_array(up($in), $options)) && !in_array($in, $options))) { + while ($in == '' || ($in && (!in_array(strtolower($in), $options) && !in_array(strtoupper($in), $options)) && !in_array($in, $options))) { $in = $this->Dispatch->getInput($prompt, $options, $default); } } @@ -427,10 +427,10 @@ class Shell extends Object { $this->out("\n" . sprintf(__("Creating file %s", true), $path)); if (is_file($path) && $this->interactive === true) { $key = $this->in(__("File exists, overwrite?", true). " {$path}", array('y', 'n', 'q'), 'n'); - if (low($key) == 'q') { + if (strtolower($key) == 'q') { $this->out(__("Quitting.", true) ."\n"); exit; - } elseif (low($key) != 'y') { + } elseif (strtolower($key) != 'y') { $this->out(__("Skip", true) ." {$path}\n"); return false; } @@ -472,7 +472,7 @@ class Shell extends Object { return true; } $unitTest = $this->in('SimpleTest is not installed. Do you want to bake unit test files anyway?', array('y','n'), 'y'); - $result = low($unitTest) == 'y' || low($unitTest) == 'yes'; + $result = strtolower($unitTest) == 'y' || strtolower($unitTest) == 'yes'; if ($result) { $this->out("\nYou can download SimpleTest from http://simpletest.org", true); @@ -488,8 +488,8 @@ class Shell extends Object { */ function shortPath($file) { $shortPath = str_replace(ROOT, null, $file); - $shortPath = str_replace('..'.DS, '', $shortPath); - return r(DS.DS, DS, $shortPath); + $shortPath = str_replace('..' . DS, '', $shortPath); + return str_replace(DS . DS, DS, $shortPath); } /** * Checks for Configure::read('Routing.admin') and forces user to input it if not enabled @@ -528,7 +528,7 @@ class Shell extends Object { * @access protected */ function _controllerPath($name) { - return low(Inflector::underscore($name)); + return strtolower(Inflector::underscore($name)); } /** * Creates the proper controller plural name for the specified controller class name diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php index aefe126ea..736522a84 100644 --- a/cake/console/libs/tasks/controller.php +++ b/cake/console/libs/tasks/controller.php @@ -120,7 +120,7 @@ class ControllerTask extends Shell { $this->out("Baking {$controllerName}Controller"); $this->hr(); - $controllerFile = low(Inflector::underscore($controllerName)); + $controllerFile = strtolower(Inflector::underscore($controllerName)); $question[] = __("Would you like to build your controller interactively?", true); if (file_exists($this->path . $controllerFile .'_controller.php')) { @@ -128,29 +128,29 @@ class ControllerTask extends Shell { } $doItInteractive = $this->in(join("\n", $question), array('y','n'), 'y'); - if (low($doItInteractive) == 'y' || low($doItInteractive) == 'yes') { + if (strtolower($doItInteractive) == 'y' || strtolower($doItInteractive) == 'yes') { $this->interactive = true; $wannaUseScaffold = $this->in(__("Would you like to use scaffolding?", true), array('y','n'), 'n'); - if (low($wannaUseScaffold) == 'n' || low($wannaUseScaffold) == 'no') { + if (strtolower($wannaUseScaffold) == 'n' || strtolower($wannaUseScaffold) == 'no') { $wannaDoScaffolding = $this->in(__("Would you like to include some basic class methods (index(), add(), view(), edit())?", true), array('y','n'), 'n'); - if (low($wannaDoScaffolding) == 'y' || low($wannaDoScaffolding) == 'yes') { + if (strtolower($wannaDoScaffolding) == 'y' || strtolower($wannaDoScaffolding) == 'yes') { $wannaDoAdmin = $this->in(__("Would you like to create the methods for admin routing?", true), array('y','n'), 'n'); } $wannaDoHelpers = $this->in(__("Would you like this controller to use other helpers besides HtmlHelper and FormHelper?", true), array('y','n'), 'n'); - if (low($wannaDoHelpers) == 'y' || low($wannaDoHelpers) == 'yes') { + if (strtolower($wannaDoHelpers) == 'y' || strtolower($wannaDoHelpers) == 'yes') { $helpersList = $this->in(__("Please provide a comma separated list of the other helper names you'd like to use.\nExample: 'Ajax, Javascript, Time'", true)); $helpersListTrimmed = str_replace(' ', '', $helpersList); $helpers = explode(',', $helpersListTrimmed); } $wannaDoComponents = $this->in(__("Would you like this controller to use any components?", true), array('y','n'), 'n'); - if (low($wannaDoComponents) == 'y' || low($wannaDoComponents) == 'yes') { + if (strtolower($wannaDoComponents) == 'y' || strtolower($wannaDoComponents) == 'yes') { $componentsList = $this->in(__("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'", true)); $componentsListTrimmed = str_replace(' ', '', $componentsList); $components = explode(',', $componentsListTrimmed); @@ -163,20 +163,20 @@ class ControllerTask extends Shell { } else { $wannaDoScaffolding = $this->in(__("Would you like to include some basic class methods (index(), add(), view(), edit())?", true), array('y','n'), 'y'); - if (low($wannaDoScaffolding) == 'y' || low($wannaDoScaffolding) == 'yes') { + if (strtolower($wannaDoScaffolding) == 'y' || strtolower($wannaDoScaffolding) == 'yes') { $wannaDoAdmin = $this->in(__("Would you like to create the methods for admin routing?", true), array('y','n'), 'y'); } } $admin = false; - if ((low($wannaDoAdmin) == 'y' || low($wannaDoAdmin) == 'yes')) { + if ((strtolower($wannaDoAdmin) == 'y' || strtolower($wannaDoAdmin) == 'yes')) { $admin = $this->getAdmin(); } - if (low($wannaDoScaffolding) == 'y' || low($wannaDoScaffolding) == 'yes') { - $actions = $this->bakeActions($controllerName, null, in_array(low($wannaUseSession), array('y', 'yes'))); + if (strtolower($wannaDoScaffolding) == 'y' || strtolower($wannaDoScaffolding) == 'yes') { + $actions = $this->bakeActions($controllerName, null, in_array(strtolower($wannaUseSession), array('y', 'yes'))); if ($admin) { - $actions .= $this->bakeActions($controllerName, $admin, in_array(low($wannaUseSession), array('y', 'yes'))); + $actions .= $this->bakeActions($controllerName, $admin, in_array(strtolower($wannaUseSession), array('y', 'yes'))); } } @@ -187,7 +187,7 @@ class ControllerTask extends Shell { $this->hr(); $this->out("Controller Name: $controllerName"); - if (low($wannaUseScaffold) == 'y' || low($wannaUseScaffold) == 'yes') { + if (strtolower($wannaUseScaffold) == 'y' || strtolower($wannaUseScaffold) == 'yes') { $this->out(" var \$scaffold;"); $actions = 'scaffold'; } @@ -218,7 +218,7 @@ class ControllerTask extends Shell { $this->hr(); $looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y'); - if (low($looksGood) == 'y' || low($looksGood) == 'yes') { + if (strtolower($looksGood) == 'y' || strtolower($looksGood) == 'yes') { $baked = $this->bake($controllerName, $actions, $helpers, $components, $uses); if ($baked && $this->_checkUnitTest()) { $this->bakeTest($controllerName); @@ -243,8 +243,11 @@ class ControllerTask extends Shell { * @access private */ function bakeActions($controllerName, $admin = null, $wannaUseSession = true) { - $currentModelName = $this->_modelName($controllerName); - if (!App::import('Model', $currentModelName)) { + $currentModelName = $modelImport = $this->_modelName($controllerName); + if ($this->plugin) { + $modelImport = $this->plugin . '.' . $modelImport; + } + if (!App::import('Model', $modelImport)) { $this->err(__('You must have a model for this class to build scaffold methods. Please try again.', true)); exit; } @@ -270,7 +273,7 @@ class ControllerTask extends Shell { $actions .= "\t\t\t\$this->flash(__('Invalid {$singularHumanName}', true), array('action'=>'index'));\n"; } $actions .= "\t\t}\n"; - $actions .= "\t\t\$this->set('".$singularName."', \$this->{$currentModelName}->read(null, \$id));\n"; + $actions .= "\t\t\$this->set('" . $singularName . "', \$this->{$currentModelName}->read(null, \$id));\n"; $actions .= "\t}\n"; $actions .= "\n"; @@ -281,7 +284,7 @@ class ControllerTask extends Shell { $actions .= "\t\t\t\$this->{$currentModelName}->create();\n"; $actions .= "\t\t\tif (\$this->{$currentModelName}->save(\$this->data)) {\n"; if ($wannaUseSession) { - $actions .= "\t\t\t\t\$this->Session->setFlash(__('The ".$singularHumanName." has been saved', true));\n"; + $actions .= "\t\t\t\t\$this->Session->setFlash(__('The " . $singularHumanName . " has been saved', true));\n"; $actions .= "\t\t\t\t\$this->redirect(array('action'=>'index'));\n"; } else { $actions .= "\t\t\t\t\$this->flash(__('{$currentModelName} saved.', true), array('action'=>'index'));\n"; @@ -310,7 +313,7 @@ class ControllerTask extends Shell { } } if (!empty($compact)) { - $actions .= "\t\t\$this->set(compact(".join(', ', $compact)."));\n"; + $actions .= "\t\t\$this->set(compact(" . join(', ', $compact) . "));\n"; } $actions .= "\t}\n"; $actions .= "\n"; @@ -329,10 +332,10 @@ class ControllerTask extends Shell { $actions .= "\t\tif (!empty(\$this->data)) {\n"; $actions .= "\t\t\tif (\$this->{$currentModelName}->save(\$this->data)) {\n"; if ($wannaUseSession) { - $actions .= "\t\t\t\t\$this->Session->setFlash(__('The ".$singularHumanName." has been saved', true));\n"; + $actions .= "\t\t\t\t\$this->Session->setFlash(__('The " . $singularHumanName . " has been saved', true));\n"; $actions .= "\t\t\t\t\$this->redirect(array('action'=>'index'));\n"; } else { - $actions .= "\t\t\t\t\$this->flash(__('The ".$singularHumanName." has been saved.', true), array('action'=>'index'));\n"; + $actions .= "\t\t\t\t\$this->flash(__('The " . $singularHumanName . " has been saved.', true), array('action'=>'index'));\n"; } $actions .= "\t\t\t} else {\n"; if ($wannaUseSession) { @@ -362,7 +365,7 @@ class ControllerTask extends Shell { } } if (!empty($compact)) { - $actions .= "\t\t\$this->set(compact(".join(',', $compact)."));\n"; + $actions .= "\t\t\$this->set(compact(" . join(',', $compact) . "));\n"; } $actions .= "\t}\n"; $actions .= "\n"; @@ -405,7 +408,7 @@ class ControllerTask extends Shell { $out .= "class $controllerName" . "Controller extends {$this->plugin}AppController {\n\n"; $out .= "\tvar \$name = '$controllerName';\n"; - if (low($actions) == 'scaffold') { + if (strtolower($actions) == 'scaffold') { $out .= "\tvar \$scaffold;\n"; } else { if (count($uses)) { @@ -481,7 +484,7 @@ class ControllerTask extends Shell { $this->out("\nBaking unit test for $className..."); $header = '$Id'; - $content = ""; + $content = ""; return $this->createFile($path . $filename, $content); } /** diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php index fcd71052e..d2f05393b 100644 --- a/cake/console/libs/tasks/db_config.php +++ b/cake/console/libs/tasks/db_config.php @@ -240,7 +240,7 @@ class DbConfigTask extends Shell { $this->hr(); $looksGood = $this->in('Look okay?', array('y', 'n'), 'y'); - if (low($looksGood) == 'y' || low($looksGood) == 'yes') { + if (strtolower($looksGood) == 'y' || strtolower($looksGood) == 'yes') { return $config; } return false; diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php index 464d5bae5..779d088f8 100644 --- a/cake/console/libs/tasks/model.php +++ b/cake/console/libs/tasks/model.php @@ -112,11 +112,11 @@ class ModelTask extends Shell { $tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y'); } - if (low($tableIsGood) == 'n' || low($tableIsGood) == 'no') { + if (strtolower($tableIsGood) == 'n' || strtolower($tableIsGood) == 'no') { $useTable = $this->in(__('What is the name of the table (enter "null" to use NO table)?', true)); } - while ($tableIsGood == false && low($useTable) != 'null') { + while ($tableIsGood == false && strtolower($useTable) != 'null') { if (is_array($this->__tables) && !in_array($useTable, $this->__tables)) { $fullTableName = $db->fullTableName($useTable, false); $this->out($fullTableName . ' does not exist.'); @@ -144,12 +144,12 @@ class ModelTask extends Shell { } } - if (array_search($useTable, $this->__tables) !== false && (low($wannaDoValidation) == 'y' || low($wannaDoValidation) == 'yes')) { + if (array_search($useTable, $this->__tables) !== false && (strtolower($wannaDoValidation) == 'y' || strtolower($wannaDoValidation) == 'yes')) { $validate = $this->doValidation($tempModel); } $wannaDoAssoc = $this->in(__('Would you like to define model associations (hasMany, hasOne, belongsTo, etc.)?', true), array('y','n'), 'y'); - if ((low($wannaDoAssoc) == 'y' || low($wannaDoAssoc) == 'yes')) { + if ((strtolower($wannaDoAssoc) == 'y' || strtolower($wannaDoAssoc) == 'yes')) { $associations = $this->doAssociations($tempModel); } @@ -201,7 +201,7 @@ class ModelTask extends Shell { $this->hr(); $looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y'); - if (low($looksGood) == 'y' || low($looksGood) == 'yes') { + if (strtolower($looksGood) == 'y' || strtolower($looksGood) == 'yes') { if ($this->bake($currentModelName, $associations, $validate, $primaryKey, $useTable, $useDbConfig)) { if ($this->_checkUnitTest()) { $this->bakeTest($currentModelName, $useTable, $associations); @@ -401,7 +401,7 @@ class ModelTask extends Shell { $prompt = "{$model->name} {$type} {$associations[$type][$i]['alias']}"; $response = $this->in("{$prompt}?", array('y','n'), 'y'); - if ('n' == low($response) || 'no' == low($response)) { + if ('n' == strtolower($response) || 'no' == strtolower($response)) { unset($associations[$type][$i]); } else { if ($model->name === $associations[$type][$i]['alias']) { @@ -414,7 +414,7 @@ class ModelTask extends Shell { $alternateAlias = $this->in(sprintf(__('This is a self join. Use %s as the alias', true), $alias), array('y', 'n'), 'y'); - if ('n' == low($alternateAlias) || 'no' == low($alternateAlias)) { + if ('n' == strtolower($alternateAlias) || 'no' == strtolower($alternateAlias)) { $associations[$type][$i]['alias'] = $this->in(__('Specify an alternate alias.', true)); } else { $associations[$type][$i]['alias'] = $alias; @@ -429,7 +429,7 @@ class ModelTask extends Shell { $wannaDoMoreAssoc = $this->in(__('Would you like to define some additional model associations?', true), array('y','n'), 'n'); - while ((low($wannaDoMoreAssoc) == 'y' || low($wannaDoMoreAssoc) == 'yes')) { + while ((strtolower($wannaDoMoreAssoc) == 'y' || strtolower($wannaDoMoreAssoc) == 'yes')) { $assocs = array(1 => 'belongsTo', 2 => 'hasOne', 3 => 'hasMany', 4 => 'hasAndBelongsToMany'); $bad = true; while ($bad) { @@ -733,7 +733,7 @@ class ModelTask extends Shell { $this->out("\nBaking unit test for $className..."); $header = '$Id'; - $content = ""; + $content = ""; return $this->createFile($path . $filename, $content); } return false; @@ -905,7 +905,7 @@ class ModelTask extends Shell { $col = "\t\t'indexes' => array("; $props = array(); foreach ((array)$value as $key => $index) { - $props[] = "'{$key}' => array(".join(', ', $schema->__values($index)).")"; + $props[] = "'{$key}' => array(" . join(', ', $schema->__values($index)) . ")"; } $col .= join(', ', $props); } @@ -925,9 +925,9 @@ class ModelTask extends Shell { $pluginPath = 'plugins' . DS . Inflector::underscore($this->plugin) . DS; $path = APP . $pluginPath . 'tests' . DS . 'fixtures' . DS; } - $filename = Inflector::underscore($model).'_fixture.php'; + $filename = Inflector::underscore($model) . '_fixture.php'; $header = '$Id'; - $content = ""; + $content = ""; $this->out("\nBaking test fixture for $model..."); if ($this->createFile($path . $filename, $content)) { return str_replace("\t\t", "\t\t\t", $records); diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php index 1fc81374b..a23181322 100644 --- a/cake/console/libs/tasks/plugin.php +++ b/cake/console/libs/tasks/plugin.php @@ -136,7 +136,7 @@ class PluginTask extends Shell { $looksGood = $this->in('Look okay?', array('y', 'n', 'q'), 'y'); - if (low($looksGood) == 'y' || low($looksGood) == 'yes') { + if (strtolower($looksGood) == 'y' || strtolower($looksGood) == 'yes') { $verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n'); $Folder = new Folder($this->path . $pluginPath); @@ -146,7 +146,7 @@ class PluginTask extends Shell { $Folder->create($this->path . $pluginPath . DS . $directory); } - if (low($verbose) == 'y' || low($verbose) == 'yes') { + if (strtolower($verbose) == 'y' || strtolower($verbose) == 'yes') { foreach ($Folder->messages() as $message) { $this->out($message); } diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php index 0502f8429..f7a0c3021 100644 --- a/cake/console/libs/tasks/project.php +++ b/cake/console/libs/tasks/project.php @@ -144,7 +144,7 @@ class ProjectTask extends Shell { $looksGood = $this->in('Look okay?', array('y', 'n', 'q'), 'y'); - if (low($looksGood) == 'y' || low($looksGood) == 'yes') { + if (strtolower($looksGood) == 'y' || strtolower($looksGood) == 'yes') { $verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n'); $Folder = new Folder($skel); @@ -153,18 +153,18 @@ class ProjectTask extends Shell { $this->out(sprintf(__("Created: %s in %s", true), $app, $path)); $this->hr(); } else { - $this->err(" '".$app."' could not be created properly"); + $this->err(" '" . $app . "' could not be created properly"); return false; } - if (low($verbose) == 'y' || low($verbose) == 'yes') { + if (strtolower($verbose) == 'y' || strtolower($verbose) == 'yes') { foreach ($Folder->messages() as $message) { $this->out($message); } } return true; - } elseif (low($looksGood) == 'q' || low($looksGood) == 'quit') { + } elseif (strtolower($looksGood) == 'q' || strtolower($looksGood) == 'quit') { $this->out('Bake Aborted.'); } else { $this->execute(false); @@ -219,7 +219,7 @@ class ProjectTask extends Shell { $File =& new File($path . 'webroot' . DS . 'index.php'); $contents = $File->read(); if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) { - $result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '".CAKE_CORE_INCLUDE_PATH."');", $contents); + $result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '" . CAKE_CORE_INCLUDE_PATH . "');", $contents); if (!$File->write($result)) { return false; } @@ -230,7 +230,7 @@ class ProjectTask extends Shell { $File =& new File($path . 'webroot' . DS . 'test.php'); $contents = $File->read(); if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) { - $result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '".CAKE_CORE_INCLUDE_PATH."');", $contents); + $result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', '" . CAKE_CORE_INCLUDE_PATH . "');", $contents); if (!$File->write($result)) { return false; } diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index 45b853448..416d3bd22 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -181,7 +181,7 @@ class TestTask extends Shell { } $header = '$Id'; - $content = ""; + $content = ""; return $this->createFile($this->filePath . Inflector::underscore($name) . '.test.php', $content); } /** diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php index 4dfdc5089..cd60df611 100644 --- a/cake/console/libs/tasks/view.php +++ b/cake/console/libs/tasks/view.php @@ -161,25 +161,25 @@ class ViewTask extends Shell { $this->controllerName = $this->Controller->getName(); - $this->controllerPath = low(Inflector::underscore($this->controllerName)); + $this->controllerPath = strtolower(Inflector::underscore($this->controllerName)); $interactive = $this->in("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite {$this->controllerName} views if it exist.", array('y','n'), 'y'); - if (low($interactive) == 'y' || low($interactive) == 'yes') { + if (strtolower($interactive) == 'y' || strtolower($interactive) == 'yes') { $this->interactive = true; $wannaDoScaffold = $this->in("Would you like to create some scaffolded views (index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller and model classes (including associated models).", array('y','n'), 'n'); } - if (low($wannaDoScaffold) == 'y' || low($wannaDoScaffold) == 'yes') { + if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoScaffold) == 'yes') { $wannaDoAdmin = $this->in("Would you like to create the views for admin routing?", array('y','n'), 'y'); } $admin = false; - if ((low($wannaDoAdmin) == 'y' || low($wannaDoAdmin) == 'yes')) { + if ((strtolower($wannaDoAdmin) == 'y' || strtolower($wannaDoAdmin) == 'yes')) { $admin = $this->getAdmin(); } - if (low($wannaDoScaffold) == 'y' || low($wannaDoScaffold) == 'yes') { + if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoScaffold) == 'yes') { $actions = $this->scaffoldActions; if ($admin) { foreach ($actions as $action) { @@ -213,7 +213,7 @@ class ViewTask extends Shell { $this->out("Path: ".$this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp"); $this->hr(); $looksGood = $this->in('Look okay?', array('y','n'), 'y'); - if (low($looksGood) == 'y' || low($looksGood) == 'yes') { + if (strtolower($looksGood) == 'y' || strtolower($looksGood) == 'yes') { $this->bake($action); $this->_stop(); } else { diff --git a/cake/console/libs/templates/views/form.ctp b/cake/console/libs/templates/views/form.ctp index 78ebdda7b..fda3eddc9 100644 --- a/cake/console/libs/templates/views/form.ctp +++ b/cake/console/libs/templates/views/form.ctp @@ -25,7 +25,7 @@
create('{$modelClass}');?>\n";?>
- ";?> + ";?> $data) { foreach ($data as $alias => $details) { if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) { - echo "\t\t
  • link(__('List ".Inflector::humanize($details['controller'])."', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; - echo "\t\t
  • link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; + echo "\t\t
  • link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; + echo "\t\t
  • link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; $done[] = $details['controller']; } } diff --git a/cake/console/libs/templates/views/home.ctp b/cake/console/libs/templates/views/home.ctp index 39020d488..5b3dc316f 100644 --- a/cake/console/libs/templates/views/home.ctp +++ b/cake/console/libs/templates/views/home.ctp @@ -1,5 +1,5 @@ Sweet, \"".Inflector::humanize($app)."\" got Baked by CakePHP!\n"; +$output = "

    Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!

    \n"; $output .=" 0): diff --git a/cake/console/libs/templates/views/index.ctp b/cake/console/libs/templates/views/index.ctp index af2c5acb5..49c69dbab 100644 --- a/cake/console/libs/templates/views/index.ctp +++ b/cake/console/libs/templates/views/index.ctp @@ -88,8 +88,8 @@ echo "\n"; foreach ($associations as $type => $data) { foreach ($data as $alias => $details) { if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) { - echo "\t\t
  • link(__('List ".Inflector::humanize($details['controller'])."', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; - echo "\t\t
  • link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; + echo "\t\t
  • link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; + echo "\t\t
  • link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; $done[] = $details['controller']; } } diff --git a/cake/console/libs/templates/views/view.ctp b/cake/console/libs/templates/views/view.ctp index a25b7574c..e390bb02e 100644 --- a/cake/console/libs/templates/views/view.ctp +++ b/cake/console/libs/templates/views/view.ctp @@ -32,14 +32,14 @@ foreach ($fields as $field) { foreach ($associations['belongsTo'] as $alias => $details) { if ($field === $details['foreignKey']) { $isKey = true; - echo "\t\t>\n"; + echo "\t\t>\n"; echo "\t\t>\n\t\t\tlink(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t\t \n\t\t\n"; break; } } } if ($isKey !== true) { - echo "\t\t>\n"; + echo "\t\t>\n"; echo "\t\t>\n\t\t\t\n\t\t\t \n\t\t\n"; } } @@ -58,8 +58,8 @@ foreach ($fields as $field) { foreach ($associations as $type => $data) { foreach ($data as $alias => $details) { if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) { - echo "\t\t
  • link(__('List ".Inflector::humanize($details['controller'])."', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; - echo "\t\t
  • link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; + echo "\t\t
  • link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; + echo "\t\t
  • link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; $done[] = $details['controller']; } } @@ -71,12 +71,12 @@ foreach ($fields as $field) { if (!empty($associations['hasOne'])) : foreach ($associations['hasOne'] as $alias => $details): ?>
    -

    ";?>

    +

    ";?>

    \n";?>
    \n";?> >\n"; + echo "\t\t>\n"; echo "\t\t>\n\t\n \n"; } ?> @@ -84,7 +84,7 @@ if (!empty($associations['hasOne'])) : \n";?>
      -
    • link(__('Edit ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>
      • \n";?> +
    • link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>
      • \n";?>
    @@ -110,7 +110,7 @@ foreach ($relations as $alias => $details): \n"; + echo "\t\t\n"; } ?> ";?> @@ -143,7 +143,7 @@ echo "\t\n"; \n\n";?>
      -
    • link(__('New ".Inflector::humanize(Inflector::underscore($alias))."', true), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?>
      • +
    • link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?>
    diff --git a/cake/dispatcher.php b/cake/dispatcher.php index 9756c841a..36a139eaf 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -515,10 +515,10 @@ class Dispatcher extends Object { parse_str($uri[1], $_GET); } $uri = $uri[0]; - } elseif (empty($uri) && is_string(env('QUERY_STRING'))) { + } else { $uri = env('QUERY_STRING'); } - if (strpos($uri, 'index.php') !== false) { + if (is_string($uri) && strpos($uri, 'index.php') !== false) { list(, $uri) = explode('index.php', $uri, 2); } if (empty($uri) || $uri == '/' || $uri == '//') { diff --git a/cake/libs/cache/file.php b/cake/libs/cache/file.php index 29dde9249..abbd5a0e6 100644 --- a/cake/libs/cache/file.php +++ b/cake/libs/cache/file.php @@ -168,7 +168,6 @@ class FileEngine extends CacheEngine { if ($cachetime !== false && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) { $this->__File->close(); - $this->__File->delete(); return false; } $data = $this->__File->read(true); diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php index a638fd567..a68e5b6f2 100644 --- a/cake/libs/controller/components/auth.php +++ b/cake/libs/controller/components/auth.php @@ -263,6 +263,9 @@ class AuthComponent extends Object { */ function startup(&$controller) { $methods = array_flip($controller->methods); + $action = strtolower($controller->params['action']); + $allowedActions = array_map('strtolower', $this->allowedActions); + $isErrorOrTests = ( strtolower($controller->name) == 'cakeerror' || (strtolower($controller->name) == 'tests' && Configure::read() > 0) @@ -273,7 +276,7 @@ class AuthComponent extends Object { $isMissingAction = ( $controller->scaffold === false && - !isset($methods[strtolower($controller->params['action'])]) + !isset($methods[$action]) ); if ($isMissingAction) { @@ -295,7 +298,7 @@ class AuthComponent extends Object { $isAllowed = ( $this->allowedActions == array('*') || - in_array($controller->params['action'], $this->allowedActions) + in_array($action, $allowedActions) ); if ($loginAction != $url && $isAllowed) { diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php index 524453c96..56713f5c4 100644 --- a/cake/libs/controller/components/cookie.php +++ b/cake/libs/controller/components/cookie.php @@ -203,10 +203,10 @@ class CookieComponent extends Object { if (count($name) > 1) { $this->__values[$name[0]][$name[1]] = $value; - $this->__write("[".$name[0]."][".$name[1]."]", $value); + $this->__write("[" . $name[0] . "][" . $name[1] . "]", $value); } else { $this->__values[$name[0]] = $value; - $this->__write("[".$name[0]."]", $value); + $this->__write("[" . $name[0] . "]", $value); } } else { foreach ($key as $names => $value) { @@ -214,10 +214,10 @@ class CookieComponent extends Object { if (count($name) > 1) { $this->__values[$name[0]][$name[1]] = $value; - $this->__write("[".$name[0]."][".$name[1]."]", $value); + $this->__write("[" . $name[0] . "][" . $name[1] . "]", $value); } else { $this->__values[$name[0]] = $value; - $this->__write("[".$name[0]."]", $value); + $this->__write("[" . $name[0] . "]", $value); } } } @@ -278,17 +278,17 @@ class CookieComponent extends Object { $name = $this->__cookieVarNames($key); if (count($name) > 1) { if (isset($this->__values[$name[0]])) { - $this->__delete("[".$name[0]."][".$name[1]."]"); + $this->__delete("[" . $name[0] . "][" . $name[1] . "]"); unset($this->__values[$name[0]][$name[1]]); } } else { if (isset($this->__values[$name[0]])) { if (is_array($this->__values[$name[0]])) { foreach ($this->__values[$name[0]] as $key => $value) { - $this->__delete("[".$name[0]."][".$key."]"); + $this->__delete("[" . $name[0] . "][" . $key . "]"); } } - $this->__delete("[".$name[0]."]"); + $this->__delete("[" . $name[0] . "]"); unset($this->__values[$name[0]]); } } diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 90dc72055..e4b250deb 100644 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -346,6 +346,7 @@ class EmailComponent extends Object{ $this->subject = null; $this->additionalParams = null; $this->smtpError = null; + $this->attachments = array(); $this->__header = array(); $this->__boundary = null; $this->__message = array(); @@ -490,7 +491,6 @@ class EmailComponent extends Object{ $this->__header[] = 'Content-Type: text/html; charset=' . $this->charset; } elseif ($this->sendAs === 'both') { $this->__header[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->__boundary . '"'; - $this->__header[] = ''; } $this->__header[] = 'Content-Transfer-Encoding: 7bit'; @@ -503,12 +503,16 @@ class EmailComponent extends Object{ */ function __formatMessage($message) { if (!empty($this->attachments)) { - $prefix = array( - '--' . $this->__boundary, - 'Content-Type: text/plain; charset=' . $this->charset, - 'Content-Transfer-Encoding: 7bit', - '' - ); + $prefix = array('--' . $this->__boundary); + if ($this->sendAs === 'text') { + $prefix[] = 'Content-Type: text/plain; charset=' . $this->charset; + } elseif ($this->sendAs === 'html') { + $prefix[] = 'Content-Type: text/html; charset=' . $this->charset; + } elseif ($this->sendAs === 'both') { + $prefix[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->__boundary . '"'; + } + $prefix[] = 'Content-Transfer-Encoding: 7bit'; + $prefix[] = ''; $message = array_merge($prefix, $message); } return $message; @@ -632,7 +636,9 @@ class EmailComponent extends Object{ * @access private */ function __strip($value, $message = false) { - $search = '%0a|%0d|Content-(?:Type|Transfer-Encoding)\:|charset\=|mime-version\:|multipart/mixed|(?:to|b?cc)\:.*'; + $search = '%0a|%0d|Content-(?:Type|Transfer-Encoding)\:'; + $search .= '|charset\=|mime-version\:|multipart/mixed|(?:[^a-z]to|b?cc)\:.*'; + if ($message !== true) { $search .= '|\r|\n'; } @@ -674,8 +680,8 @@ class EmailComponent extends Object{ return false; } - if (isset($this->smtpOptions['host'])) { - $host = $this->smtpOptions['host']; + if (isset($this->smtpOptions['client'])) { + $host = $this->smtpOptions['client']; } else { $host = env('HTTP_HOST'); } diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php index 8887ff443..efca6b2c5 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/cake/libs/controller/components/request_handler.php @@ -585,7 +585,7 @@ class RequestHandlerComponent extends Object { if (empty($this->__renderType)) { $controller->viewPath .= '/' . $type; } else { - $remove = preg_replace("/(?:\/{$type})$/", '/' . $type, $controller->viewPath); + $remove = preg_replace("/(?:\/{$this->__renderType})$/", '/' . $type, $controller->viewPath); $controller->viewPath = $remove; } $this->__renderType = $type; diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php index 077883c3b..96d140256 100644 --- a/cake/libs/controller/components/security.php +++ b/cake/libs/controller/components/security.php @@ -323,7 +323,7 @@ class SecurityComponent extends Object { if (strtolower($options['type']) == 'digest') { $out[] = 'qop="auth"'; - $out[] = 'nonce="' . uniqid() . '"'; + $out[] = 'nonce="' . uniqid("") . '"'; $out[] = 'opaque="' . md5($options['realm']).'"'; } diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php index 5c33e1a49..6a582bfce 100644 --- a/cake/libs/controller/controller.php +++ b/cake/libs/controller/controller.php @@ -393,7 +393,9 @@ class Controller extends Object { if ($var === 'components') { $normal = Set::normalize($this->{$var}); $app = Set::normalize($appVars[$var]); - $this->{$var} = Set::merge($app, $normal); + if ($app !== $normal) { + $this->{$var} = Set::merge($app, $normal); + } } else { $this->{$var} = Set::merge($this->{$var}, array_diff($appVars[$var], $this->{$var})); } @@ -415,7 +417,9 @@ class Controller extends Object { if ($var === 'components') { $normal = Set::normalize($this->{$var}); $app = Set::normalize($appVars[$var]); - $this->{$var} = Set::merge($normal, array_diff_assoc($app, $normal)); + if ($app !== $normal) { + $this->{$var} = Set::merge($app, $normal); + } } else { $this->{$var} = Set::merge($this->{$var}, array_diff($appVars[$var], $this->{$var})); } @@ -943,17 +947,17 @@ class Controller extends Object { } if ($assoc && isset($this->{$object}->{$assoc})) { - $object = $this->{$object}->{$assoc}; + $object =& $this->{$object}->{$assoc}; } elseif ($assoc && isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$assoc})) { - $object = $this->{$this->modelClass}->{$assoc}; + $object =& $this->{$this->modelClass}->{$assoc}; } elseif (isset($this->{$object})) { - $object = $this->{$object}; + $object =& $this->{$object}; } elseif (isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object})) { - $object = $this->{$this->modelClass}->{$object}; + $object =& $this->{$this->modelClass}->{$object}; } } elseif (empty($object) || $object === null) { if (isset($this->{$this->modelClass})) { - $object = $this->{$this->modelClass}; + $object =& $this->{$this->modelClass}; } else { $className = null; $name = $this->uses[0]; @@ -961,9 +965,9 @@ class Controller extends Object { list($name, $className) = explode('.', $this->uses[0]); } if ($className) { - $object = $this->{$className}; + $object =& $this->{$className}; } else { - $object = $this->{$name}; + $object =& $this->{$name}; } } } diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php index 1dce13e34..84549c938 100644 --- a/cake/libs/controller/scaffold.php +++ b/cake/libs/controller/scaffold.php @@ -167,7 +167,7 @@ class Scaffold extends Object { $associations = $this->__associations(); $this->controller->set(compact('modelClass', 'primaryKey', 'displayField', 'singularVar', 'pluralVar', - 'singularHumanName', 'pluralHumanName', 'scaffoldFields', 'associations')); + 'singularHumanName', 'pluralHumanName', 'scaffoldFields', 'associations')); if ($this->controller->view && $this->controller->view !== 'Theme') { $this->controller->view = 'scaffold'; @@ -378,7 +378,7 @@ class Scaffold extends Object { * @access private */ function __scaffold($params) { - $db = &ConnectionManager::getDataSource($this->ScaffoldModel->useDbConfig); + $db =& ConnectionManager::getDataSource($this->ScaffoldModel->useDbConfig); $admin = Configure::read('Routing.admin'); if (isset($db)) { diff --git a/cake/libs/file.php b/cake/libs/file.php index e22031749..b57cb4c72 100644 --- a/cake/libs/file.php +++ b/cake/libs/file.php @@ -366,12 +366,13 @@ class File extends Object { function md5($maxsize = 5) { if ($maxsize === true) { return md5_file($this->path); - } else { - $size = $this->size(); - if ($size && $size < ($maxsize * 1024) * 1024) { - return md5_file($this->path); - } } + + $size = $this->size(); + if ($size && $size < ($maxsize * 1024) * 1024) { + return md5_file($this->path); + } + return false; } /** diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php index 25105fd55..76d12d710 100644 --- a/cake/libs/http_socket.php +++ b/cake/libs/http_socket.php @@ -202,10 +202,10 @@ class HttpSocket extends CakeSocket { } if (isset($this->request['auth']['user']) && isset($this->request['auth']['pass'])) { - $this->request['header']['Authorization'] = $this->request['auth']['method'] ." ". base64_encode($this->request['auth']['user'] .":".$this->request['auth']['pass']); + $this->request['header']['Authorization'] = $this->request['auth']['method'] . " " . base64_encode($this->request['auth']['user'] . ":" . $this->request['auth']['pass']); } if (isset($this->request['uri']['user']) && isset($this->request['uri']['pass'])) { - $this->request['header']['Authorization'] = $this->request['auth']['method'] ." ". base64_encode($this->request['uri']['user'] .":".$this->request['uri']['pass']); + $this->request['header']['Authorization'] = $this->request['auth']['method'] . " " . base64_encode($this->request['uri']['user'] . ":" . $this->request['uri']['pass']); } if (is_array($this->request['body'])) { @@ -220,7 +220,10 @@ class HttpSocket extends CakeSocket { $this->request['header']['Content-Length'] = strlen($this->request['body']); } - $connectionType = @$this->request['header']['Connection']; + $connectionType = null; + if (isset($this->request['header']['Connection'])) { + $connectionType = $this->request['header']['Connection']; + } $this->request['header'] = $this->buildHeader($this->request['header']).$cookies; if (empty($this->request['line'])) { @@ -395,7 +398,11 @@ class HttpSocket extends CakeSocket { } $response['header'] = $this->parseHeader($response['raw']['header']); - $decoded = $this->decodeBody($response['raw']['body'], @$response['header']['Transfer-Encoding']); + $transferEncoding = null; + if (isset($response['header']['Transfer-Encoding'])) { + $transferEncoding = $response['header']['Transfer-Encoding']; + } + $decoded = $this->decodeBody($response['raw']['body'], $transferEncoding); $response['body'] = $decoded['body']; if (!empty($decoded['header'])) { @@ -805,7 +812,7 @@ class HttpSocket extends CakeSocket { return false; } - preg_match_all("/(.+):(.+)(?:(?lineBreak."|\$)/Uis", $header, $matches, PREG_SET_ORDER); + preg_match_all("/(.+):(.+)(?:(?lineBreak . "|\$)/Uis", $header, $matches, PREG_SET_ORDER); $header = array(); foreach ($matches as $match) { @@ -845,9 +852,16 @@ class HttpSocket extends CakeSocket { $cookies = array(); foreach ((array)$header['Set-Cookie'] as $cookie) { - $parts = preg_split('/(? 'sz', /* Serbian */ 'scc' => 'sr', /* Serbian */ 'srp' => 'sr', - /* Slovack */ 'slo' => 'sk', - /* Slovack */ 'slk' => 'sk', + /* Slovak */ 'slo' => 'sk', + /* Slovak */ 'slk' => 'sk', /* Slovenian */ 'slv' => 'sl', /* Sorbian */ 'wen' => 'sb', /* Spanish (Spain - Traditional) */ 'spa' => 'es', @@ -290,7 +290,7 @@ class L10n extends Object { 'ro-mo' => array('language' => 'Romanian (Moldavia)', 'locale' => 'ro_mo', 'localeFallback' => 'rum', 'charset' => 'utf-8'), 'ru-mo' => array('language' => 'Russian (Moldavia)', 'locale' => 'ru_mo', 'localeFallback' => 'rus', 'charset' => 'utf-8'), 'sb' => array('language' => 'Sorbian', 'locale' => 'wen', 'localeFallback' => 'wen', 'charset' => 'utf-8'), - 'sk' => array('language' => 'Slovack', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8'), + 'sk' => array('language' => 'Slovak', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8'), 'sl' => array('language' => 'Slovenian', 'locale' => 'slv', 'localeFallback' => 'slv', 'charset' => 'utf-8'), 'sq' => array('language' => 'Albanian', 'locale' => 'alb', 'localeFallback' => 'alb', 'charset' => 'utf-8'), 'sr' => array('language' => 'Serbian', 'locale' => 'scc', 'localeFallback' => 'scc', 'charset' => 'utf-8'), diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php index edcadd51b..a602efff3 100644 --- a/cake/libs/model/behaviors/containable.php +++ b/cake/libs/model/behaviors/containable.php @@ -48,7 +48,7 @@ class ContainableBehavior extends ModelBehavior { var $runtime = array(); /** * Initiate behavior for the model using specified settings. - * + * * Available settings: * * - recursive: (boolean, optional) set to true to allow containable to automatically @@ -313,7 +313,7 @@ class ContainableBehavior extends ModelBehavior { $option = 'conditions'; $val = $Model->{$name}->alias.'.'.$key; } - $children[$option] = isset($children[$option]) ? array_merge((array) $children[$option], (array) $val) : $val; + $children[$option] = is_array($val) ? $val : array($val); $newChildren = null; if (!empty($name) && !empty($children[$key])) { $newChildren = $children[$key]; diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php index 4fa8fba2e..b1b2baefb 100644 --- a/cake/libs/model/datasources/datasource.php +++ b/cake/libs/model/datasources/datasource.php @@ -91,28 +91,28 @@ class DataSource extends Object { * Enter description here... * * @var array - * @access private + * @access protected */ var $_result = null; /** * Queries count. * * @var int - * @access private + * @access protected */ var $_queriesCnt = 0; /** * Total duration of all queries. * * @var unknown_type - * @access private + * @access protected */ var $_queriesTime = null; /** * Log of queries executed by this DataSource * * @var unknown_type - * @access private + * @access protected */ var $_queriesLog = array(); /** @@ -121,21 +121,21 @@ class DataSource extends Object { * >6000 queries on one system. * * @var int Maximum number of queries in the queries log. - * @access private + * @access protected */ var $_queriesLogMax = 200; /** * Caches serialzed results of executed queries * * @var array Maximum number of queries in the queries log. - * @access private + * @access protected */ var $_queryCache = array(); /** * The default configuration of a specific DataSource * * @var array - * @access public + * @access protected */ var $_baseConfig = array(); /** diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php index 766b70be1..7bd0d5179 100644 --- a/cake/libs/model/datasources/dbo/dbo_mssql.php +++ b/cake/libs/model/datasources/dbo/dbo_mssql.php @@ -211,9 +211,10 @@ class DboMssql extends DboSource { return $cache; } - $fields = false; - $cols = $this->fetchAll("SELECT COLUMN_NAME as Field, DATA_TYPE as Type, COL_LENGTH('" . $this->fullTableName($model, false) . "', COLUMN_NAME) as Length, IS_NULLABLE As [Null], COLUMN_DEFAULT as [Default], COLUMNPROPERTY(OBJECT_ID('" . $this->fullTableName($model, false) . "'), COLUMN_NAME, 'IsIdentity') as [Key], NUMERIC_SCALE as Size FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" . $this->fullTableName($model, false) . "'", false); + $table = $this->fullTableName($model, false); + $cols = $this->fetchAll("SELECT COLUMN_NAME as Field, DATA_TYPE as Type, COL_LENGTH('" . $table . "', COLUMN_NAME) as Length, IS_NULLABLE As [Null], COLUMN_DEFAULT as [Default], COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key], NUMERIC_SCALE as Size FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" . $table . "'", false); + $fields = false; foreach ($cols as $column) { $field = $column[0]['Field']; $fields[$field] = array( @@ -295,7 +296,8 @@ class DboMssql extends DboSource { $fields = parent::fields($model, $alias, $fields, false); $count = count($fields); - if ($count >= 1 && $fields[0] != '*' && strpos($fields[0], 'COUNT(*)') === false) { + if ($count >= 1 && strpos($fields[0], 'COUNT(*)') === false) { + $result = array(); for ($i = 0; $i < $count; $i++) { $prepend = ''; @@ -306,6 +308,19 @@ class DboMssql extends DboSource { $fieldAlias = count($this->__fieldMappings); if (!preg_match('/\s+AS\s+/i', $fields[$i])) { + if (substr($fields[$i], -1) == '*') { + if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') { + $build = explode('.', $fields[$i]); + $AssociatedModel = $model->{$build[0]}; + } else { + $AssociatedModel = $model; + } + + $_fields = $this->fields($AssociatedModel, $AssociatedModel->alias, array_keys($AssociatedModel->schema())); + $result = array_merge($result, $_fields); + continue; + } + if (strpos($fields[$i], '.') === false) { $this->__fieldMappings[$alias . '__' . $fieldAlias] = $alias . '.' . $fields[$i]; $fieldName = $this->name($alias . '.' . $fields[$i]); @@ -321,10 +336,12 @@ class DboMssql extends DboSource { } $fields[$i] = "{$fieldName} AS {$fieldAlias}"; } - $fields[$i] = $prepend . $fields[$i]; + $result[] = $prepend . $fields[$i]; } + return $result; + } else { + return $fields; } - return $fields; } /** * Generates and executes an SQL INSERT statement for given model, fields, and values. @@ -373,6 +390,9 @@ class DboMssql extends DboSource { if (isset($fields[$model->primaryKey])) { unset($fields[$model->primaryKey]); } + if (empty($fields)) { + return true; + } return parent::update($model, array_keys($fields), array_values($fields), $conditions); } /** @@ -460,8 +480,8 @@ class DboMssql extends DboSource { } return $col; } - $col = str_replace(')', '', $real); - $limit = null; + $col = str_replace(')', '', $real); + $limit = null; if (strpos($col, '(') !== false) { list($col, $limit) = explode('(', $col); } @@ -659,21 +679,15 @@ class DboMssql extends DboSource { * Generate a database-native column schema string * * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]), - * where options can be 'default', 'length', or 'key'. + * where options can be 'default', 'length', or 'key'. * @return string */ function buildColumn($column) { $result = preg_replace('/(int|integer)\([0-9]+\)/i', '$1', parent::buildColumn($column)); - $null = ( - (isset($column['null']) && $column['null'] == true) || - (array_key_exists('default', $column) && $column['default'] === null) || - (array_keys($column) == array('type', 'name')) - ); - $primaryKey = (isset($column['key']) && $column['key'] == 'primary'); - $stringKey = ($primaryKey && $column['type'] != 'integer'); - - if ($null && !$primaryKey) { - $result .= " NULL"; + if (strpos($result, 'DEFAULT NULL') !== false) { + $result = str_replace('DEFAULT NULL', 'NULL', $result); + } else if (array_keys($column) == array('type', 'name')) { + $result .= ' NULL'; } return $result; } @@ -723,7 +737,6 @@ class DboMssql extends DboSource { return $field; } } - return null; } } diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php index 2dee3f504..2d97e141c 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/cake/libs/model/datasources/dbo/dbo_mysql.php @@ -481,9 +481,11 @@ class DboMysql extends DboMysqlBase { if ($parent != null) { return $parent; - } elseif ($data === null || (is_array($data) && empty($data))) { + } + if ($data === null || (is_array($data) && empty($data))) { return 'NULL'; - } elseif ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') { + } + if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') { return "''"; } if (empty($column)) { diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php index 12121a711..b0adf8d2e 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysqli.php +++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php @@ -105,9 +105,8 @@ class DboMysqli extends DboMysqlBase { function _execute($sql) { if (preg_match('/^\s*call/i', $sql)) { return $this->_executeProcedure($sql); - } else { - return mysqli_query($this->connection, $sql); } + return mysqli_query($this->connection, $sql); } /** * Executes given SQL statement (procedure call). @@ -140,15 +139,15 @@ class DboMysqli extends DboMysqlBase { if (!$result) { return array(); - } else { - $tables = array(); - - while ($line = mysqli_fetch_array($result)) { - $tables[] = $line[0]; - } - parent::listSources($tables); - return $tables; } + + $tables = array(); + + while ($line = mysqli_fetch_array($result)) { + $tables[] = $line[0]; + } + parent::listSources($tables); + return $tables; } /** * Returns an array of the fields in given table name. @@ -201,18 +200,19 @@ class DboMysqli extends DboMysqlBase { if ($parent != null) { return $parent; } - - if ($data === null) { + if ($data === null || (is_array($data) && empty($data))) { return 'NULL'; } - if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') { - return "''"; + return "''"; + } + if (empty($column)) { + $column = $this->introspectType($data); } switch ($column) { case 'boolean': - $data = $this->boolean((bool)$data); + return $this->boolean((bool)$data); break; case 'integer' : case 'float' : @@ -232,20 +232,6 @@ class DboMysqli extends DboMysqlBase { return $data; } -/** - * Begin a transaction - * - * @param unknown_type $model - * @return boolean True on success, false on fail - * (i.e. if the database/model does not support transactions). - */ - function begin(&$model) { - if (parent::begin($model) && $this->execute('START TRANSACTION')) { - $this->_transactionStarted = true; - return true; - } - return false; - } /** * Returns a formatted error message from previous database operation. * @@ -292,7 +278,6 @@ class DboMysqli extends DboMysqlBase { if ($id !== false && !empty($id) && !empty($id[0]) && isset($id[0]['insertID'])) { return $id[0]['insertID']; } - return null; } /** @@ -351,11 +336,11 @@ class DboMysqli extends DboMysqlBase { function length($real) { $col = str_replace(array(')', 'unsigned'), '', $real); $limit = null; - + if (strpos($col, '(') !== false) { list($col, $limit) = explode('(', $col); } - + if ($limit != null) { return intval($limit); } @@ -403,9 +388,8 @@ class DboMysqli extends DboMysqlBase { $i++; } return $resultRow; - } else { - return false; } + return false; } /** * Gets the database encoding diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php index f7ec6f06e..1b87ec1a5 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/cake/libs/model/datasources/dbo/dbo_oracle.php @@ -465,11 +465,12 @@ class DboOracle extends DboSource { * @access public */ function describe(&$model) { + $table = $model->fullTableName($model, false); if (!empty($model->sequence)) { - $this->_sequenceMap[$model->table] = $model->sequence; + $this->_sequenceMap[$table] = $model->sequence; } elseif (!empty($model->table)) { - $this->_sequenceMap[$model->table] = $model->table . '_seq'; + $this->_sequenceMap[$table] = $model->table . '_seq'; } $cache = parent::describe($model); @@ -477,12 +478,14 @@ class DboOracle extends DboSource { if ($cache != null) { return $cache; } + $sql = 'SELECT COLUMN_NAME, DATA_TYPE, DATA_LENGTH FROM all_tab_columns WHERE table_name = \''; $sql .= strtoupper($this->fullTableName($model)) . '\''; if (!$this->execute($sql)) { return false; } + $fields = array(); for ($i = 0; $row = $this->fetchRow(); $i++) { @@ -952,11 +955,11 @@ class DboOracle extends DboSource { if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) { if (!isset($resultSet) || !is_array($resultSet)) { if (Configure::read() > 0) { - e('
    ' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '); + echo '
    ' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '; if (isset($this->error) && $this->error != null) { - e($this->error); + echo $this->error; } - e('
    '); + echo '
    '; } return null; } diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php index bd6e984bb..2298fc019 100644 --- a/cake/libs/model/datasources/dbo/dbo_postgres.php +++ b/cake/libs/model/datasources/dbo/dbo_postgres.php @@ -275,6 +275,9 @@ class DboPostgres extends DboSource { case 'inet': case 'float': case 'integer': + case 'date': + case 'datetime': + case 'timestamp': if ($data === '') { return $read ? 'NULL' : 'DEFAULT'; } diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php index f2aa64ebc..8a4d9b2bc 100644 --- a/cake/libs/model/datasources/dbo_source.php +++ b/cake/libs/model/datasources/dbo_source.php @@ -200,9 +200,8 @@ class DboSource extends DataSource { if ($this->error) { $this->showQuery($sql); return false; - } else { - return $this->_result; } + return $this->_result; } /** * DataSource Query abstraction @@ -627,16 +626,22 @@ class DboSource extends DataSource { $queryData['fields'] = $this->fields($model); } - foreach ($model->__associations as $type) { - foreach ($model->{$type} as $assoc => $assocData) { - if ($model->recursive > -1) { - $linkModel =& $model->{$assoc}; - $external = isset($assocData['external']); + $_associations = $model->__associations; - if ($model->useDbConfig == $linkModel->useDbConfig) { - if (true === $this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null)) { - $linkedModels[] = $type . '/' . $assoc; - } + if ($model->recursive == -1) { + $_associations = array(); + } else if ($model->recursive == 0) { + unset($_associations[2], $_associations[3]); + } + + foreach ($_associations as $type) { + foreach ($model->{$type} as $assoc => $assocData) { + $linkModel =& $model->{$assoc}; + $external = isset($assocData['external']); + + if ($model->useDbConfig == $linkModel->useDbConfig) { + if (true === $this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null)) { + $linkedModels[$type . '/' . $assoc] = true; } } } @@ -653,12 +658,12 @@ class DboSource extends DataSource { $filtered = $this->__filterResults($resultSet, $model); - if ($model->recursive > 0) { - foreach ($model->__associations as $type) { + if ($model->recursive > -1) { + foreach ($_associations as $type) { foreach ($model->{$type} as $assoc => $assocData) { $linkModel =& $model->{$assoc}; - if (!in_array($type . '/' . $assoc, $linkedModels)) { + if (empty($linkedModels[$type . '/' . $assoc])) { if ($model->useDbConfig == $linkModel->useDbConfig) { $db =& $this; } else { @@ -737,11 +742,11 @@ class DboSource extends DataSource { if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) { if (!isset($resultSet) || !is_array($resultSet)) { if (Configure::read() > 0) { - e('
    ' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '); + echo '
    ' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' '; if (isset($this->error) && $this->error != null) { - e($this->error); + echo $this->error; } - e('
    '); + echo '
    '; } return null; } @@ -852,11 +857,8 @@ class DboSource extends DataSource { foreach ($fetch as $j => $data) { if ( - (isset($data[$with]) && $data[$with][$foreignKey] === $row[$model->alias][$model->primaryKey]) && - (!in_array($data[$with][$joinKeys[1]], $uniqueIds)) + (isset($data[$with]) && $data[$with][$foreignKey] === $row[$model->alias][$model->primaryKey]) ) { - $uniqueIds[] = $data[$with][$joinKeys[1]]; - if ($habtmFieldsCount <= 2) { unset($data[$with]); } @@ -1403,6 +1405,7 @@ class DboSource extends DataSource { function _prepareUpdateFields(&$model, $fields, $quoteValues = true, $alias = false) { $quotedAlias = $this->startQuote . $model->alias . $this->endQuote; + $updates = array(); foreach ($fields as $field => $value) { if ($alias && strpos($field, '.') === false) { $quoted = $model->escapeField($field); @@ -1512,12 +1515,12 @@ class DboSource extends DataSource { return $join; } /** - * Returns the an SQL calculation, i.e. COUNT() or MAX() + * Returns an SQL calculation, i.e. COUNT() or MAX() * * @param model $model * @param string $func Lowercase name of SQL function, i.e. 'count' or 'max' * @param array $params Function parameters (any values must be quoted manually) - * @return string An SQL calculation function + * @return string An SQL calculation function * @access public */ function calculate(&$model, $func, $params = array()) { @@ -1840,9 +1843,9 @@ class DboSource extends DataSource { if (array_keys($value) === array_values(array_keys($value))) { $count = count($value); if ($count === 1) { - $data = $this->name($key) . ' = ('; + $data = $this->__quoteFields($key) . ' = ('; } else { - $data = $this->name($key) . ' IN ('; + $data = $this->__quoteFields($key) . ' IN ('; } if ($quoteValues || strpos($value[0], '-!') !== 0) { if (is_object($model)) { @@ -1905,7 +1908,9 @@ class DboSource extends DataSource { } } + $type = (is_object($model) ? $model->getColumnType($key) : null); + $null = ($value === null || (is_array($value) && empty($value))); if (strtolower($operator) === 'not') { @@ -1914,6 +1919,7 @@ class DboSource extends DataSource { ); return $data[0]; } + $value = $this->value($value, $type); if ($key !== '?') { @@ -1954,6 +1960,7 @@ class DboSource extends DataSource { break; } } + return "{$key} {$operator} {$value}"; } /** @@ -2381,11 +2388,12 @@ class DboSource extends DataSource { if (!empty($value['unique'])) { $out .= 'UNIQUE '; } + $name = $this->startQuote . $name . $this->endQuote; } if (is_array($value['column'])) { - $out .= 'KEY '. $name .' (' . join(', ', array_map(array(&$this, 'name'), $value['column'])) . ')'; + $out .= 'KEY ' . $name . ' (' . join(', ', array_map(array(&$this, 'name'), $value['column'])) . ')'; } else { - $out .= 'KEY '. $name .' (' . $this->name($value['column']) . ')'; + $out .= 'KEY ' . $name . ' (' . $this->name($value['column']) . ')'; } $join[] = $out; } diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php index ae19e51ef..657aa61dc 100644 --- a/cake/libs/model/model.php +++ b/cake/libs/model/model.php @@ -373,6 +373,10 @@ class Model extends Overloadable { $this->useTable = $table; } + if ($ds !== null) { + $this->useDbConfig = $ds; + } + if (is_subclass_of($this, 'AppModel')) { $appVars = get_class_vars('AppModel'); $merge = array('_findMethods'); @@ -823,8 +827,11 @@ class Model extends Overloadable { $type = $this->getColumnType($field); if (in_array($type, array('datetime', 'timestamp', 'date', 'time'))) { - $useNewDate = (isset($data['year']) || isset($data['month']) || isset($data['day']) || isset($data['hour']) || isset($data['minute'])); + $useNewDate = (isset($data['year']) || isset($data['month']) || + isset($data['day']) || isset($data['hour']) || isset($data['minute'])); + $dateFields = array('Y' => 'year', 'm' => 'month', 'd' => 'day', 'H' => 'hour', 'i' => 'min', 's' => 'sec'); + $timeFields = array('H' => 'hour', 'i' => 'min', 's' => 'sec'); $db =& ConnectionManager::getDataSource($this->useDbConfig); $format = $db->columns[$type]['format']; @@ -836,27 +843,42 @@ class Model extends Overloadable { if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] == 12 && 'am' == $data['meridian']) { $data['hour'] = '00'; } - - foreach ($dateFields as $key => $val) { - if (in_array($val, array('hour', 'min', 'sec'))) { - if (!isset($data[$val]) || $data[$val] === '0' || empty($data[$val])) { + if ($type == 'time') { + foreach ($timeFields as $key => $val) { + if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') { $data[$val] = '00'; + } elseif ($data[$val] === '') { + $data[$val] = ''; } else { $data[$val] = sprintf('%02d', $data[$val]); } + if (!empty($data[$val])) { + $date[$key] = $data[$val]; + } else { + return null; + } } - if (in_array($type, array('datetime', 'timestamp', 'date')) && !isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) { - return null; - } elseif (isset($data[$val]) && !empty($data[$val])) { - $date[$key] = $data[$val]; + } + + if ($type == 'datetime' || $type == 'timestamp' || $type == 'date') { + foreach ($dateFields as $key => $val) { + if ($val == 'hour' || $val == 'min' || $val == 'sec') { + if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') { + $data[$val] = '00'; + } else { + $data[$val] = sprintf('%02d', $data[$val]); + } + } + if (!isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) { + return null; + } + if (isset($data[$val]) && !empty($data[$val])) { + $date[$key] = $data[$val]; + } } } $date = str_replace(array_keys($date), array_values($date), $format); - if ($type == 'time' && $date == '00:00:00') { - return null; - } - - if ($useNewDate && (!empty($date))) { + if ($useNewDate && !empty($date)) { return $date; } } @@ -1321,7 +1343,7 @@ class Model extends Overloadable { unset($values); } elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) { $newData[] = $row; - } elseif (isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) { + } elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) { $newData[] = $row[$join]; } } @@ -1471,7 +1493,7 @@ class Model extends Overloadable { if (Set::numeric(array_keys($data))) { while ($validates) { foreach ($data as $key => $record) { - if (!$currentValidates = $this->__save($this, $record, $options)) { + if (!$currentValidates = $this->__save($record, $options)) { $validationErrors[$key] = $this->validationErrors; } @@ -1524,7 +1546,7 @@ class Model extends Overloadable { if (isset($associations[$association])) { switch ($associations[$association]) { case 'belongsTo': - if ($this->__save($this->{$association}, $values, $options)) { + if ($this->{$association}->__save($values, $options)) { $data[$this->alias][$this->belongsTo[$association]['foreignKey']] = $this->{$association}->id; } else { $validationErrors[$association] = $this->{$association}->validationErrors; @@ -1537,7 +1559,7 @@ class Model extends Overloadable { } } } - if (!$this->__save($this, $data, $options)) { + if (!$this->__save($data, $options)) { $validationErrors[$this->alias] = $this->validationErrors; $validates = false; } @@ -1555,7 +1577,7 @@ class Model extends Overloadable { switch ($type) { case 'hasOne': $values[$this->{$type}[$association]['foreignKey']] = $this->id; - if (!$this->__save($this->{$association}, $values, $options)) { + if (!$this->{$association}->__save($values, $options)) { $validationErrors[$association] = $this->{$association}->validationErrors; $validates = false; } @@ -1628,12 +1650,12 @@ class Model extends Overloadable { * @access private * @see Model::saveAll() */ - function __save(&$model, $data, $options) { + function __save($data, $options) { if ($options['validate'] === 'first' || $options['validate'] === 'only') { - if (!($model->create($data) && $model->validates($options))) { + if (!($this->create($data) && $this->validates($options))) { return false; } - } elseif (!($model->create(null) !== null && $model->save($data, $options))) { + } elseif (!($this->create(null) !== null && $this->save($data, $options))) { return false; } return true; @@ -1807,7 +1829,7 @@ class Model extends Overloadable { ); if (empty($ids)) { - return false; + return true; } if ($callbacks) { @@ -2466,8 +2488,8 @@ class Model extends Overloadable { * rule (in case of multiple validation for field) that was broken. * * @param string $field The name of the field to invalidate - * @param mixed $value Name of validation rule that was not failed. If no validation key - * is provided, defaults to true. + * @param mixed $value Name of validation rule that was not failed, or validation message to + * be returned. If no validation key is provided, defaults to true. * @access public */ function invalidate($field, $value = true) { diff --git a/cake/libs/model/schema.php b/cake/libs/model/schema.php index d3e2811ab..23c2f4816 100644 --- a/cake/libs/model/schema.php +++ b/cake/libs/model/schema.php @@ -338,7 +338,7 @@ class CakeSchema extends Object { $col = "\t\t'indexes' => array("; $props = array(); foreach ((array)$value as $key => $index) { - $props[] = "'{$key}' => array(".join(', ', $this->__values($index)).")"; + $props[] = "'{$key}' => array(" . join(', ', $this->__values($index)) . ")"; } $col .= join(', ', $props); } @@ -446,7 +446,7 @@ class CakeSchema extends Object { if (is_array($values)) { foreach ($values as $key => $val) { if (is_array($val)) { - $vals[] = "'{$key}' => array('".join("', '", $val)."')"; + $vals[] = "'{$key}' => array('" . join("', '", $val) . "')"; } else if (!is_numeric($key)) { $val = var_export($val, true); $vals[] = "'{$key}' => {$val}"; diff --git a/cake/libs/object.php b/cake/libs/object.php index 358fd759f..61c0896cd 100644 --- a/cake/libs/object.php +++ b/cake/libs/object.php @@ -77,9 +77,10 @@ class Object { /** * Calls a controller's method from any location. * - * @param string $url URL in the form of Cake URL ("/controller/method/parameter") + * @param mixed $url String or array-based url. * @param array $extra if array includes the key "return" it sets the AutoRender to true. - * @return mixed Success (true/false) or contents if 'return' is set in $extra + * @return mixed Boolean true or false on success/failure, or contents + * of rendered action if 'return' is set in $extra. * @access public */ function requestAction($url, $extra = array()) { diff --git a/cake/libs/router.php b/cake/libs/router.php index 4071c6f12..45dc5c12a 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -311,9 +311,9 @@ class Router extends Object { /** * Builds a route regular expression * - * @param string $route An empty string, or a route string "/" - * @param array $default NULL or an array describing the default route - * @param array $params An array matching the named elements in the route to regular expressions which that element should match. + * @param string $route An empty string, or a route string "/" + * @param array $default NULL or an array describing the default route + * @param array $params An array matching the named elements in the route to regular expressions which that element should match. * @return array * @see routes * @access public @@ -460,8 +460,6 @@ class Router extends Object { if (isset($names[$key])) { $out[$names[$key]] = $_this->stripEscape($found); - } elseif (isset($names[$key]) && empty($names[$key]) && empty($out[$names[$key]])) { - break; } else { $argOptions['context'] = array('action' => $out['action'], 'controller' => $out['controller']); extract($_this->getArgs($found, $argOptions)); @@ -535,10 +533,7 @@ class Router extends Object { function compile($i) { $route = $this->routes[$i]; - if (!list($pattern, $names) = $this->writeRoute($route[0], $route[1], $route[2])) { - unset($this->routes[$i]); - return array(); - } + list($pattern, $names) = $this->writeRoute($route[0], $route[1], $route[2]); $this->routes[$i] = array( $route[0], $pattern, $names, array_merge(array('plugin' => null, 'controller' => null), (array)$route[1]), @@ -1082,7 +1077,7 @@ class Router extends Object { if (isset($params[$key])) { $string = $params[$key]; unset($params[$key]); - } else { + } elseif (strpos($out, $key) != strlen($out) - strlen($key)) { $key = $key . '/'; } $out = str_replace(':' . $key, $string, $out); @@ -1200,7 +1195,7 @@ class Router extends Object { $paths = Router::getPaths(); if (!empty($paths['base']) && stristr($url, $paths['base'])) { - $url = preg_replace('/' . preg_quote($paths['base'], '/') . '/', '', $url, 1); + $url = preg_replace('/^' . preg_quote($paths['base'], '/') . '/', '', $url, 1); } $url = '/' . $url; @@ -1245,7 +1240,7 @@ class Router extends Object { * @access public * @static */ - function stripPlugin($base, $plugin) { + function stripPlugin($base, $plugin = null) { if ($plugin != null) { $base = preg_replace('/(?:' . $plugin . ')/', '', $base); $base = str_replace('//', '', $base); @@ -1258,7 +1253,6 @@ class Router extends Object { } return $base; } - /** * Strip escape characters from parameter values. * @@ -1274,9 +1268,9 @@ class Router extends Object { return $param; } - $return = preg_replace('/^(?:[\\t ]*(?:-!)+)/', '', $param); - return $return; + return preg_replace('/^(?:[\\t ]*(?:-!)+)/', '', $param); } + foreach ($param as $key => $value) { if (is_string($value)) { $return[$key] = preg_replace('/^(?:[\\t ]*(?:-!)+)/', '', $value); @@ -1349,7 +1343,9 @@ class Router extends Object { continue; } $param = $_this->stripEscape($param); - if ((!isset($options['named']) || !empty($options['named'])) && strpos($param, $_this->named['separator']) !== false) { + + $separatorIsPresent = strpos($param, $_this->named['separator']) !== false; + if ((!isset($options['named']) || !empty($options['named'])) && $separatorIsPresent) { list($key, $val) = explode($_this->named['separator'], $param, 2); $hasRule = isset($rules[$key]); $passIt = (!$hasRule && !$greedy) || ($hasRule && !Router::matchNamed($key, $val, $rules[$key], $context)); diff --git a/cake/libs/set.php b/cake/libs/set.php index bed03379a..d48adc7de 100644 --- a/cake/libs/set.php +++ b/cake/libs/set.php @@ -918,7 +918,7 @@ class Set extends Object { * to null (useful for Set::merge). You can optionally group the values by what is obtained when * following the path specified in $groupPath. * - * @param array $data Array from where to extract keys and values + * @param mixed $data Array or object from where to extract keys and values * @param mixed $path1 As an array, or as a dot-separated string. * @param mixed $path2 As an array, or as a dot-separated string. * @param string $groupPath As an array, or as a dot-separated string. diff --git a/cake/libs/socket.php b/cake/libs/socket.php index fb50940d0..c5c945aa0 100644 --- a/cake/libs/socket.php +++ b/cake/libs/socket.php @@ -120,7 +120,11 @@ class CakeSocket extends Object { $this->setLastError($errStr, $errNum); } - return $this->connected = is_resource($this->connection); + $this->connected = is_resource($this->connection); + if ($this->connected) { + stream_set_timeout($this->connection, $this->config['timeout']); + } + return $this->connected; } /** @@ -218,7 +222,13 @@ class CakeSocket extends Object { } if (!feof($this->connection)) { - return fread($this->connection, $length); + $buffer = fread($this->connection, $length); + $info = stream_get_meta_data($this->connection); + if ($info['timed_out']) { + $this->setLastError(E_WARNING, __('Connection timed out', true)); + return false; + } + return $buffer; } else { return false; } diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp index 857ac206c..0de1c6cc3 100644 --- a/cake/libs/view/errors/missing_action.ctp +++ b/cake/libs/view/errors/missing_action.ctp @@ -25,11 +25,11 @@

    : - ".$action."", "".$controller."");?> + " . $action . "", "" . $controller . "");?>

    : - ".$controller."::", "".$action."()", APP_DIR.DS."controllers".DS.Inflector::underscore($controller).".php");?> + " . $controller . "::", "" . $action . "()", APP_DIR . DS . "controllers" . DS . Inflector::underscore($controller) . ".php");?> 

     <?php
@@ -47,5 +47,5 @@ class  extends AppController {

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp index 49af6e3a3..ec154de02 100644 --- a/cake/libs/view/errors/missing_component_class.ctp +++ b/cake/libs/view/errors/missing_component_class.ctp @@ -25,11 +25,11 @@

    : - ". $component ."Component", "". $controller ."Controller");?> + " . $component . "Component", "" . $controller . "Controller");?>

    : - ". $component ."Component", APP_DIR.DS."controllers".DS."components".DS.$file);?> + " . $component . "Component", APP_DIR . DS . "controllers" . DS . "components" . DS . $file);?> 

     <?php
@@ -40,5 +40,5 @@ class Component extends Object {

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp index e4eb675b9..3b8b874fb 100644 --- a/cake/libs/view/errors/missing_component_file.ctp +++ b/cake/libs/view/errors/missing_component_file.ctp @@ -29,7 +29,7 @@

    : - ". $component ."Component", APP_DIR.DS."controllers".DS."components".DS.$file);?> + " . $component . "Component", APP_DIR . DS . "controllers" . DS . "components" . DS . $file);?> 

     <?php
@@ -40,5 +40,5 @@ class Component extends Object {

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp index 829cc53ca..676747284 100644 --- a/cake/libs/view/errors/missing_controller.ctp +++ b/cake/libs/view/errors/missing_controller.ctp @@ -25,11 +25,11 @@

    : - ".$controller."");?> + " . $controller . "");?>

    : - ".$controller."", APP_DIR.DS."controllers".DS.Inflector::underscore($controller).".php");?> + " . $controller . "", APP_DIR . DS . "controllers" . DS . Inflector::underscore($controller) . ".php");?> 

     <?php
@@ -41,5 +41,5 @@ class  extends AppController {

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp index d94d1ab1d..e1f464cdd 100644 --- a/cake/libs/view/errors/missing_helper_class.ctp +++ b/cake/libs/view/errors/missing_helper_class.ctp @@ -29,7 +29,7 @@

    : - + 

     <?php
@@ -40,5 +40,5 @@ class  extends AppHelper {

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp index 7affb0fd4..34d6d5dc7 100644 --- a/cake/libs/view/errors/missing_helper_file.ctp +++ b/cake/libs/view/errors/missing_helper_file.ctp @@ -25,11 +25,11 @@

    : - +

    : - + 

     <?php
@@ -40,5 +40,5 @@ class  extends AppHelper {

    : - +

    diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp index c41c59d45..cb8445a44 100644 --- a/cake/libs/view/errors/missing_layout.ctp +++ b/cake/libs/view/errors/missing_layout.ctp @@ -25,13 +25,13 @@

    : - ". $file ."");?> + " . $file . "");?>

    : - ". $file ."");?> + " . $file . "");?>

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_model.ctp b/cake/libs/view/errors/missing_model.ctp index 49cf8f7a4..c2d64e95f 100644 --- a/cake/libs/view/errors/missing_model.ctp +++ b/cake/libs/view/errors/missing_model.ctp @@ -29,7 +29,7 @@

    : - ". $model . "", APP_DIR.DS."models".DS.Inflector::underscore($model).".php");?> + " . $model . "", APP_DIR . DS . "models" . DS . Inflector::underscore($model) . ".php");?> 

     <?php
@@ -42,5 +42,5 @@ class  extends AppModel {

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_scaffolddb.ctp b/cake/libs/view/errors/missing_scaffolddb.ctp index 2477d3207..443199224 100644 --- a/cake/libs/view/errors/missing_scaffolddb.ctp +++ b/cake/libs/view/errors/missing_scaffolddb.ctp @@ -29,9 +29,9 @@

    : - +

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp index 341897680..1bdc59f69 100644 --- a/cake/libs/view/errors/missing_table.ctp +++ b/cake/libs/view/errors/missing_table.ctp @@ -25,9 +25,9 @@

    : - ". $table ."", "". $model ."");?> + " . $table . "", "" . $model . "");?>

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp index 184573751..737da88c0 100644 --- a/cake/libs/view/errors/missing_view.ctp +++ b/cake/libs/view/errors/missing_view.ctp @@ -25,7 +25,7 @@

    : - ". $controller."Controller::", "". $action ."()");?> + " . $controller . "Controller::", "". $action . "()");?>

    : @@ -33,5 +33,5 @@

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp index f172c50aa..6d9e92c70 100644 --- a/cake/libs/view/errors/private_action.ctp +++ b/cake/libs/view/errors/private_action.ctp @@ -25,9 +25,9 @@

    : - ". $controller ."::", "". $action ."()");?> + " . $controller . "::", "" . $action . "()");?>

    : - +

    \ No newline at end of file diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp index d20843cbd..9ce156af7 100644 --- a/cake/libs/view/errors/scaffold_error.ctp +++ b/cake/libs/view/errors/scaffold_error.ctp @@ -29,7 +29,7 @@

    : - + 

     <?php
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index 97d5c9580..ed0de9782 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -958,7 +958,7 @@ class AjaxHelper extends AppHelper {
 			$keys = array_keys($this->__ajaxBuffer);
 
 			if (count($divs) == 1 && in_array($divs[0], $keys)) {
-				e($this->__ajaxBuffer[$divs[0]]);
+				echo $this->__ajaxBuffer[$divs[0]];
 			} else {
 				foreach ($this->__ajaxBuffer as $key => $val) {
 					if (in_array($key, $divs)) {
@@ -969,14 +969,13 @@ class AjaxHelper extends AppHelper {
 				$out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"';
 				$out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent(';
 				$out .= '__ajaxUpdater__[n]))); }';
-				e($this->Javascript->codeBlock($out, false));
+				echo $this->Javascript->codeBlock($out, false);
 			}
 			$scripts = $this->Javascript->getCache();
 
 			if (!empty($scripts)) {
-				e($this->Javascript->codeBlock($scripts, false));
+				echo $this->Javascript->codeBlock($scripts, false);
 			}
-
 			$this->_stop();
 		}
 	}
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index dd4f1b499..d8e60b12f 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -264,7 +264,8 @@ class CacheHelper extends AppHelper {
 				$controller->params = $this->params = unserialize(stripslashes(\'' . addslashes(serialize($this->params)) . '\'));
 				$controller->action = $this->action = unserialize(\'' . serialize($this->action) . '\');
 				$controller->data = $this->data = unserialize(stripslashes(\'' . addslashes(serialize($this->data)) . '\'));
-				$controller->themeWeb = $this->themeWeb = \'' . $this->themeWeb . '\';';
+				$controller->themeWeb = $this->themeWeb = \'' . $this->themeWeb . '\';
+				Router::setRequestInfo(array($this->params, array(\'base\' => $this->base, \'webroot\' => $this->webroot)));';
 
 		if ($useCallbacks == true) {
 			$file .= '
@@ -275,7 +276,6 @@ class CacheHelper extends AppHelper {
 		}
 
 		$file .= '
-				Router::setRequestInfo(array($this->params, array(\'base\' => $this->base, \'webroot\' => $this->webroot)));
 				$loadedHelpers = array();
 				$loadedHelpers = $this->_loadHelpers($loadedHelpers, $this->helpers);
 				foreach (array_keys($loadedHelpers) as $helper) {
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index ce6ea9302..cb9408998 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -316,7 +316,7 @@ class HtmlHelper extends AppHelper {
 /**
  * Creates a link element for CSS stylesheets.
  *
- * @param mixed $path The name of a CSS style sheet or an array containing names of 
+ * @param mixed $path The name of a CSS style sheet or an array containing names of
  *   CSS stylesheets. If `$path` is prefixed with '/', the path will be relative to the webroot
  *   of your application. Otherwise, the path will be relative to your CSS path, usually webroot/css.
  * @param string $rel Rel attribute. Defaults to "stylesheet". If equal to 'import' the stylesheet will be imported.
@@ -437,10 +437,11 @@ class HtmlHelper extends AppHelper {
 		} elseif ($path[0] === '/') {
 			$path = $this->webroot($path);
 		} elseif (strpos($path, '://') === false) {
-			if ((Configure::read('Asset.timestamp') == true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force') {
-				$path .= '?' . @filemtime(str_replace('/', DS, WWW_ROOT . IMAGES_URL . $path));
-			}
 			$path = $this->webroot(IMAGES_URL . $path);
+
+			if ((Configure::read('Asset.timestamp') == true && Configure::read() > 0) || Configure::read('Asset.timestamp') === 'force') {
+				$path .= '?' . @filemtime(str_replace('/', DS, WWW_ROOT . $path));
+			}
 		}
 
 		if (!isset($options['alt'])) {
@@ -639,4 +640,4 @@ class HtmlHelper extends AppHelper {
 		return $out;
 	}
 }
-?>
+?>
\ No newline at end of file
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 9a921deb9..9756d62ed 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -60,10 +60,10 @@ class JavascriptHelper extends AppHelper {
  * @access public
  */
 	var $tags = array(
-		'javascriptblock' => '',
 		'javascriptstart' => '',
-		'javascriptend' => ''
+		'javascriptend' => '',
+		'javascriptblock' => '',
+		'javascriptlink' => ''
 	);
 /**
  * Holds options passed to codeBlock(), saved for when block is dumped to output
@@ -173,42 +173,28 @@ class JavascriptHelper extends AppHelper {
 			$options = array();
 		}
 		$defaultOptions = array('allowCache' => true, 'safe' => true, 'inline' => true);
-		$options = array_merge($defaultOptions, compact('safe'), $options);
+		$options = array_merge($defaultOptions, $options);
 
-		if ($this->_cacheEvents && $this->_cacheAll && $options['allowCache'] && $script !== null) {
+		if (empty($script)) {
+			$this->__scriptBuffer = @ob_get_contents();
+			$this->_blockOptions = $options;
+			$this->inBlock = true;
+			@ob_end_clean();
+			ob_start();
+			return null;
+		}
+		if ($this->_cacheEvents && $this->_cacheAll && $options['allowCache']) {
 			$this->_cachedEvents[] = $script;
+			return null;
+		}
+		if ($options['safe'] || $this->safe) {
+			$script  = "\n" . '//' . "\n";
+		}
+		if ($options['inline']) {
+			return sprintf($this->tags['javascriptblock'], $script);
 		} else {
-			$block = ($script !== null);
-			$safe = ($options['safe'] || $this->safe);
-			if ($safe && !($this->_cacheAll && $options['allowCache'])) {
-				$script  = "\n" . '//' . "\n";
-				}
-			}
-
-			if ($script === null) {
-				$this->__scriptBuffer = @ob_get_contents();
-				$this->_blockOptions = $options;
-				$this->inBlock = true;
-				@ob_end_clean();
-				ob_start();
-				return null;
-			} else if (!$block) {
-				$this->_blockOptions = $options;
-			}
-
-			if ($options['inline']) {
-				if ($block) {
-					return sprintf($this->tags['javascriptblock'], $script);
-				} else {
-					$safe = ($safe ? "\n" . '//tags['javascriptstart'] . $safe;
-				}
-			} elseif ($block) {
-				$view =& ClassRegistry::getObject('view');
-				$view->addScript(sprintf($this->tags['javascriptblock'], $script));
-			}
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript(sprintf($this->tags['javascriptblock'], $script));
 		}
 	}
 /**
@@ -217,26 +203,23 @@ class JavascriptHelper extends AppHelper {
  * @return mixed
  */
 	function blockEnd() {
+		if (!isset($this->inBlock) || !$this->inBlock) {
+			return;
+		}
 		$script = @ob_get_contents();
 		@ob_end_clean();
 		ob_start();
 		echo $this->__scriptBuffer;
 		$this->__scriptBuffer = null;
 		$options = $this->_blockOptions;
-		$safe = ((isset($options['safe']) && $options['safe']) || $this->safe);
 		$this->_blockOptions = array();
 		$this->inBlock = false;
-
-		if (isset($options['inline']) && !$options['inline']) {
-			$view =& ClassRegistry::getObject('view');
-			$view->addScript(sprintf($this->tags['javascriptblock'], $script));
-		}
-
-		if (!empty($script) && $this->_cacheAll && $options['allowCache']) {
-			$this->_cachedEvents[] = $script;
+		
+		if (empty($script)) {
 			return null;
 		}
-		return ife($safe, "\n" . '//]]>' . "\n", '').$this->tags['javascriptend'];
+		
+		return $this->codeBlock($script, $options);
 	}
 /**
  * Returns a JavaScript include tag (SCRIPT element).  If the filename is prefixed with "/",
@@ -319,8 +302,104 @@ class JavascriptHelper extends AppHelper {
  * @return string Escaped string.
  */
 	function escapeString($string) {
-		$escape = array('\n' => '\\\n', "\r\n" => '\n', "\r" => '\n', "\n" => '\n', '"' => '\"', "'" => "\\'");
-		return str_replace(array_keys($escape), array_values($escape), $string);
+		App::import('Core', 'Multibyte');
+		$escape = array("\r\n" => "\n", "\r" => "\n");
+		$string = str_replace(array_keys($escape), array_values($escape), $string);
+		return $this->_utf8ToHex($string);
+	}
+/**
+ * Encode a string into JSON.  Converts and escapes necessary characters.
+ *
+ * @return void
+ **/
+	function _utf8ToHex($string) {
+		$length = strlen($string);
+		$return = '';
+		for ($i = 0; $i < $length; ++$i) {
+			$ord = ord($string{$i});
+			switch (true) {
+				case $ord == 0x08:
+					$return .= '\b';
+					break;
+				case $ord == 0x09:
+					$return .= '\t';
+					break;
+				case $ord == 0x0A:
+					$return .= '\n';
+					break;
+				case $ord == 0x0C:
+					$return .= '\f';
+					break;
+				case $ord == 0x0D:
+					$return .= '\r';
+					break;
+				case $ord == 0x22:
+				case $ord == 0x2F:
+				case $ord == 0x5C:
+				case $ord == 0x27:
+					$return .= '\\' . $string{$i};
+					break;
+				case (($ord >= 0x20) && ($ord <= 0x7F)):
+					$return .= $string{$i};
+					break;
+				case (($ord & 0xE0) == 0xC0):
+					if ($i + 1 >= $length) {
+						$i += 1;
+						$return .= '?';
+						break;
+					}
+					$charbits = $string{$i} . $string{$i + 1};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 1;
+					break;
+				case (($ord & 0xF0) == 0xE0):
+					if ($i + 2 >= $length) {
+						$i += 2;
+						$return .= '?';
+						break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 2;
+					break;
+				case (($ord & 0xF8) == 0xF0):
+					if ($i + 3 >= $length) {
+					   $i += 3;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 3;
+					break;
+				case (($ord & 0xFC) == 0xF8):
+					if ($i + 4 >= $length) {
+					   $i += 4;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 4;
+					break;
+				case (($ord & 0xFE) == 0xFC):
+					if ($i + 5 >= $length) {
+					   $i += 5;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4} . $string{$i + 5};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 5;
+					break;
+			}
+		}
+		return $return;
 	}
 /**
  * Attach an event to an element. Used with the Prototype library.
@@ -493,6 +572,15 @@ class JavascriptHelper extends AppHelper {
  * Generates a JavaScript object in JavaScript Object Notation (JSON)
  * from an array
  *
+ * ### Options
+ *
+ * - block - Wraps the return value in a script tag if true. Default is false
+ * - prefix - Prepends the string to the returned data. Default is ''
+ * - postfix - Appends the string to the returned data. Default is ''
+ * - stringKeys - A list of array keys to be treated as a string.
+ * - quoteKeys - If false treats $stringKeys as a list of keys **not** to be quoted. Default is true.
+ * - q - The type of quote to use. Default is "'"
+ *
  * @param array $data Data to be converted
  * @param array $options Set of options: block, prefix, postfix, stringKeys, quoteKeys, q
  * @param string $prefix DEPRECATED, use $options['prefix'] instead. Prepends the string to the returned data
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index f5e197a05..7b5dd09a2 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -67,10 +67,10 @@ class PaginatorHelper extends AppHelper {
  */
 	var $options = array();
 /**
- * Gets the current page of the in the recordset for the given model
+ * Gets the current paging parameters from the resultset for the given model
  *
  * @param  string $model Optional model name.  Uses the default if none is specified.
- * @return string The current page number of the paginated resultset.
+ * @return array The array of paging parameters for the paginated resultset.
  */
 	function params($model = null) {
 		if (empty($model)) {
@@ -140,7 +140,9 @@ class PaginatorHelper extends AppHelper {
 
 		if (isset($options['sort']) && !empty($options['sort'])) {
 			if (preg_match('/(?:\w+\.)?(\w+)/', $options['sort'], $result) && isset($result[1])) {
-				return $result[1];
+				if ($result[0] == $this->defaultModel()) {
+					return $result[1];
+				}
 			}
 			return $options['sort'];
 		} elseif (isset($options['order']) && is_array($options['order'])) {
@@ -149,6 +151,7 @@ class PaginatorHelper extends AppHelper {
 			if (preg_match('/(?:\w+\.)?(\w+)/', $options['order'], $result) && isset($result[1])) {
 				return $result[1];
 			}
+			return $options['order'];
 		}
 		return null;
 	}
@@ -223,17 +226,12 @@ class PaginatorHelper extends AppHelper {
 		}
 		$dir = 'asc';
 		$sortKey = $this->sortKey($options['model']);
-		$defaultModel = $this->defaultModel();
-
-		if (strpos($sortKey, $defaultModel) !== false && strpos($key, $defaultModel) === false) {
-			$isSorted = ($sortKey === $defaultModel . '.' . $key);
-		} else {
-			$isSorted = ($sortKey === $key);
-		}
+		$isSorted = ($sortKey === $key || $sortKey === $this->defaultModel() . '.' . $key);
 
 		if ($isSorted && $this->sortDir($options['model']) === 'asc') {
 			$dir = 'desc';
 		}
+
 		if (is_array($title) && array_key_exists($dir, $title)) {
 			$title = $title[$dir];
 		}
@@ -452,9 +450,9 @@ class PaginatorHelper extends AppHelper {
 	function numbers($options = array()) {
 		if ($options === true) {
 			$options = array(
-						'before' => ' | ', 'after' => ' | ',
-						'first' => 'first', 'last' => 'last',
-						);
+				'before' => ' | ', 'after' => ' | ',
+				'first' => 'first', 'last' => 'last',
+			);
 		}
 
 		$options = array_merge(
@@ -493,11 +491,12 @@ class PaginatorHelper extends AppHelper {
 				$end = $params['page'] + ($modulus  - $params['page']) + 1;
 			}
 
-			if ($first && $start > (int)$first) {
-				if ($start == $first + 1) {
-					$out .= $this->first($first, array('tag' => $tag, 'after' => $separator));
+			if ($first && $start > 1) {
+				$offset = ($start <= (int)$first) ? $start - 1 : $first;
+				if ($offset < $start - 1) {
+					$out .= $this->first($offset, array('tag' => $tag, 'separator' => $separator));
 				} else {
-					$out .= $this->first($first, array('tag' => $tag));
+					$out .= $this->first($offset, array('tag' => $tag, 'after' => $separator, 'separator' => $separator));
 				}
 			}
 
@@ -523,11 +522,12 @@ class PaginatorHelper extends AppHelper {
 
 			$out .= $after;
 
-			if ($last && $end <= $params['pageCount'] - (int)$last) {
-				if ($end + 1 == $params['pageCount']) {
-					$out .= $this->last($last, array('tag' => $tag, 'before' => $separator));
+			if ($last && $end < $params['pageCount']) {
+				$offset = ($params['pageCount'] < $end + (int)$last) ? $params['pageCount'] - $end : $last;
+				if ($offset <= $last && $params['pageCount'] - $end > $offset) {
+					$out .= $this->last($offset, array('tag' => $tag, 'separator' => $separator));
 				} else {
-					$out .= $this->last($last, array('tag' => $tag));
+					$out .= $this->last($offset, array('tag' => $tag, 'before' => $separator, 'separator' => $separator));
 				}
 			}
 
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index adc0813dd..d78170ab1 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -142,10 +142,10 @@ class SessionHelper extends CakeSession {
 					$out = $flash['message'];
 				} else {
 					$view =& ClassRegistry::getObject('view');
-					list($tmpLayout, $tmpVars, $tmpTitle) = array($view->layout, $view->viewVars, $view->pageTitle);
-					list($view->layout, $view->viewVars, $view->pageTitle) = array($flash['layout'], $flash['params'], '');
-					$out = $view->renderLayout($flash['message']);
-					list($view->layout, $view->viewVars, $view->pageTitle) = array($tmpLayout, $tmpVars, $tmpTitle);
+					list($tmpVars, $tmpTitle) = array($view->viewVars, $view->pageTitle);
+					list($view->viewVars, $view->pageTitle) = array($flash['params'], '');
+					$out = $view->renderLayout($flash['message'], $flash['layout']);
+					list($view->viewVars, $view->pageTitle) = array($tmpVars, $tmpTitle);
 				}
 				echo($out);
 				parent::del('Message.' . $key);
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index d12a0396b..a3ae2bee4 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -277,17 +277,20 @@ class TextHelper extends AppHelper {
 		}
 
 		$pos = strpos(strtolower($text), strtolower($phrase));
+
 		$startPos = 0;
 		if ($pos > $radius) {
 			$startPos = $pos - $radius;
 		}
+
 		$textLen = strlen($text);
+
 		$endPos = $pos + $phraseLen + $radius;
 		if ($endPos >= $textLen) {
 			$endPos = $textLen;
 		}
-		$excerpt = substr($text, $startPos, $endPos - $startPos);
 
+		$excerpt = substr($text, $startPos, $endPos - $startPos);
 		if ($startPos != 0) {
 			$excerpt = substr_replace($excerpt, $ending, 0, $phraseLen);
 		}
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 066d97906..e2a8c723a 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -481,7 +481,7 @@ class TimeHelper extends AppHelper {
  * @return bool
  */
 	function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
-		$tmp = r(' ', '', $timeInterval);
+		$tmp = str_replace(' ', '', $timeInterval);
 		if (is_numeric($tmp)) {
 			$timeInterval = $tmp . ' ' . __('days', true);
 		}
diff --git a/cake/libs/view/layouts/xml/default.ctp b/cake/libs/view/layouts/xml/default.ctp
index c68870298..566ca2158 100644
--- a/cake/libs/view/layouts/xml/default.ctp
+++ b/cake/libs/view/layouts/xml/default.ctp
@@ -1,2 +1,2 @@
-header()); ?>
+header(); ?>
 
\ No newline at end of file
diff --git a/cake/libs/view/scaffolds/edit.ctp b/cake/libs/view/scaffolds/edit.ctp
index b9ea9a24d..6705b4bf4 100644
--- a/cake/libs/view/scaffolds/edit.ctp
+++ b/cake/libs/view/scaffolds/edit.ctp
@@ -25,7 +25,7 @@
 
    
 create();
-	echo $form->inputs(null, array('created', 'modified', 'updated'));
+	echo $form->inputs($scaffoldFields, array('created', 'modified', 'updated'));
 	echo $form->end(__('Submit', true));
 ?>
 
    
@@ -40,8 +40,8 @@
 		foreach ($associations as $_type => $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t
  • ".$html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index'))."
    • \n";
-					echo "\t\t
  • ".$html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add'))."
    • \n";
+					echo "\t\t
  • " . $html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "
    • \n";
+					echo "\t\t
  • " . $html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "
    • \n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index 5d18fef54..c5b9e0e7f 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -86,8 +86,8 @@ echo "\n";
 		foreach ($associations as $_type => $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t
  • ".$html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index'))."
    • \n";
-					echo "\t\t
  • ".$html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'))."
    • \n";
+					echo "\t\t
  • " . $html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
    • \n";
+					echo "\t\t
  • " . $html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
    • \n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index 0c5ef7420..a497ca673 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -37,14 +37,14 @@ foreach ($scaffoldFields as $_field) {
 		foreach ($associations['belongsTo'] as $_alias => $_details) {
 			if ($_field === $_details['foreignKey']) {
 				$isKey = true;
-				echo "\t\t".Inflector::humanize($_alias)."\n";
+				echo "\t\t" . Inflector::humanize($_alias) . "\n";
 				echo "\t\t\n\t\t\t" . $html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t \n";
 				break;
 			}
 		}
 	}
 	if ($isKey !== true) {
-		echo "\t\t".Inflector::humanize($_field)."\n";
+		echo "\t\t" . Inflector::humanize($_field) . "\n";
 		echo "\t\t\n\t\t\t{${$singularVar}[$modelClass][$_field]}\n \t\t\n";
 	}
 }
@@ -63,8 +63,8 @@ foreach ($scaffoldFields as $_field) {
 	foreach ($associations as $_type => $_data) {
 		foreach ($_data as $_alias => $_details) {
 			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-				echo "\t\t
  • ".$html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index'))."
    • \n";
-				echo "\t\t
  • ".$html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'))."
    • \n";
+				echo "\t\t
  • " . $html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
    • \n";
+				echo "\t\t
  • " . $html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
    • \n";
 				$done[] = $_details['controller'];
 			}
 		}
@@ -87,8 +87,8 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?>
 			if ($i++ % 2 == 0) {
 				$class = ' class="altrow"';
 			}
-			echo "\t\t".Inflector::humanize($_field)."\n";
-			echo "\t\t\n\t" .${$singularVar}[$_alias][$_field] ."\n \n";
+			echo "\t\t" . Inflector::humanize($_field) . "\n";
+			echo "\t\t\n\t" . ${$singularVar}[$_alias][$_field] . "\n \n";
 		}
 ?>
 	
@@ -122,7 +122,7 @@ $otherSingularVar = Inflector::variable($_alias);
 ".Inflector::humanize($_field)."\n";
+			echo "\t\t" . Inflector::humanize($_field) . "\n";
 		}
 ?>
 		Actions
@@ -137,7 +137,7 @@ $otherSingularVar = Inflector::variable($_alias);
 		echo "\t\t\n";
 
 			foreach ($otherFields as $_field) {
-				echo "\t\t\t".${$otherSingularVar}[$_field]."\n";
+				echo "\t\t\t" . ${$otherSingularVar}[$_field] . "\n";
 			}
 
 			echo "\t\t\t\n";
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index d0ad82bdf..1604debfb 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -417,6 +417,10 @@ class View extends Object {
  */
 	function renderLayout($content_for_layout, $layout = null) {
 		$layoutFileName = $this->_getLayoutFileName($layout);
+		if (empty($layoutFileName)) {
+			return $this->output;
+		}
+
 		$debug = '';
 
 		if (isset($this->viewVars['cakeDebug']) && Configure::read() > 2) {
@@ -800,7 +804,7 @@ class View extends Object {
 			}
 		}
 
-		$paths = $this->_paths($this->plugin);
+		$paths = $this->_paths(Inflector::underscore($this->plugin));
 
 		foreach ($paths as $path) {
 			if (file_exists($path . $name . $this->ext)) {
@@ -840,7 +844,7 @@ class View extends Object {
 		if (!is_null($this->layoutPath)) {
 			$subDir = $this->layoutPath . DS;
 		}
-		$paths = $this->_paths($this->plugin);
+		$paths = $this->_paths(Inflector::underscore($this->plugin));
 		$file = 'layouts' . DS . $subDir . $name;
 
 		$exts = array($this->ext, '.ctp', '.thtml');
@@ -892,7 +896,7 @@ class View extends Object {
 		$paths = array();
 		$viewPaths = Configure::read('viewPaths');
 
-		if ($plugin !== null) {
+		if (!empty($plugin)) {
 			$count = count($viewPaths);
 			for ($i = 0; $i < $count; $i++) {
 				$paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS;
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 845068514..1a2048800 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -201,6 +201,7 @@ class XmlNode extends Object {
 		}
 
 		$tagOpts = $this->__tagOptions($name);
+
 		if ($tagOpts === false) {
 			return;
 		}
@@ -221,7 +222,6 @@ class XmlNode extends Object {
 		$attributes = array();
 		$children = array();
 		$chldObjs = array();
-		$document =& $this->document();
 
 		if (is_object($object)) {
 			$chldObjs = get_object_vars($object);
@@ -239,7 +239,12 @@ class XmlNode extends Object {
 			$node->createTextNode($chldObjs[$tagOpts['value']]);
 			unset($chldObjs[$tagOpts['value']]);
 		}
-		unset($chldObjs['_name_']);
+
+		$n = $name;
+		if (!empty($chldObjs['_name_'])) {
+			$n = null;
+			unset($chldObjs['_name_']);
+		}
 		$c = 0;
 
 		foreach ($chldObjs as $key => $val) {
@@ -247,14 +252,11 @@ class XmlNode extends Object {
 				$attributes[$key] = $val;
 			} else {
 				if (!isset($tagOpts['children']) || $tagOpts['children'] === array() || (is_array($tagOpts['children']) && in_array($key, $tagOpts['children']))) {
-					$n = $key;
-
-					if (is_numeric($n)) {
-						$n = $name;
+					if (!is_numeric($key)) {
+						$n = $key;
 					}
 					if (is_array($val)) {
-						foreach ($val as $i => $obj2) {
-							$n2 = $i;
+						foreach ($val as $n2 => $obj2) {
 							if (is_numeric($n2)) {
 								$n2 = $n;
 							}
@@ -262,6 +264,7 @@ class XmlNode extends Object {
 						}
 					} else {
 						if (is_object($val)) {
+
 							$node->normalize($val, $n, $options);
 						} elseif ($options['format'] == 'tags' && $this->__tagOptions($key) !== false) {
 							$tmp =& $node->createElement($key);
@@ -607,6 +610,9 @@ class XmlNode extends Object {
 
 			if (is_array($this->attributes) && count($this->attributes) > 0) {
 				foreach ($this->attributes as $key => $val) {
+					if (is_bool($val) && $val === false) {
+						$val = 0;
+					}
 					$d .= ' ' . $key . '="' . htmlspecialchars($val, ENT_QUOTES, Configure::read('App.encoding')) . '"';
 				}
 			}
@@ -627,7 +633,6 @@ class XmlNode extends Object {
 				if ($options['whitespace']) {
 					$d .= "\n";
 				}
-
 				$count = count($this->children);
 				$cDepth = $depth + 1;
 				for ($i = 0; $i < $count; $i++) {
@@ -682,6 +687,19 @@ class XmlNode extends Object {
 					$out[$child->name] = $value;
 				}
 				continue;
+			} elseif (count($child->children) === 0 && $child->value == '') {
+				$value = $child->attributes;
+
+				if (isset($out[$child->name]) || isset($multi[$key])) {
+					if (!isset($multi[$key])) {
+						$multi[$key] = array($out[$child->name]);
+						unset($out[$child->name]);
+					}
+					$multi[$key][] = $value;
+				} else {
+					$out[$key] = $value;
+				}
+				continue;
 			} else {
 				$value = $child->toArray($camelize);
 			}
diff --git a/cake/tests/cases/basics.test.php b/cake/tests/cases/basics.test.php
index 3526a7ca2..7baeeb60f 100644
--- a/cake/tests/cases/basics.test.php
+++ b/cake/tests/cases/basics.test.php
@@ -54,6 +54,36 @@ class BasicsTest extends CakeTestCase {
 		Configure::write('localePaths', $this->_localePaths);
 		Configure::write('Config.language', $this->_language);
 	}
+/**
+ * test the array_diff_key compatibility function.
+ *
+ * @return void
+ **/
+	function testArrayDiffKey() {
+		$one = array('one' => 1, 'two' => 2, 'three' => 3);
+		$two = array('one' => 'one', 'two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('three' => 3);
+		$this->assertEqual($result, $expected);
+
+		$one = array('one' => array('value', 'value-two'), 'two' => 2, 'three' => 3);
+		$two = array('two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('one' => array('value', 'value-two'), 'three' => 3);
+		$this->assertEqual($result, $expected);
+
+		$one = array('one' => null, 'two' => 2, 'three' => '', 'four' => 0);
+		$two = array('two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('one' => null, 'three' => '', 'four' => 0);
+		$this->assertEqual($result, $expected);
+
+		$one = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
+		$two = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
+		$result = array_diff_key($one, $two);
+		$this->assertEqual($result, array());
+
+	}
 /**
  * testHttpBase method
  *
@@ -94,12 +124,29 @@ class BasicsTest extends CakeTestCase {
 
 		$_SERVER = $_ENV = array();
 
+		$this->assertFalse(env('HTTPS'));
+
 		$_SERVER['HTTPS'] = 'on';
 		$this->assertTrue(env('HTTPS'));
 
+		$_SERVER['HTTPS'] = '1';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 'I am not empty';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 1;
+		$this->assertTrue(env('HTTPS'));
+
 		$_SERVER['HTTPS'] = 'off';
 		$this->assertFalse(env('HTTPS'));
 
+		$_SERVER['HTTPS'] = false;
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = '';
+		$this->assertFalse(env('HTTPS'));
+
 		$_SERVER = array();
 
 		$_ENV['SCRIPT_URI'] = 'https://domain.test/a/test.php';
@@ -388,16 +435,16 @@ class BasicsTest extends CakeTestCase {
 	function test__c() {
 		Configure::write('Config.language', 'rule_1_po');
 
-		$result = __c('Plural Rule 1', 5, true);
+		$result = __c('Plural Rule 1', 6, true);
 		$expected = 'Plural Rule 1 (translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __c('Plural Rule 1 (from core)', 5, true);
+		$result = __c('Plural Rule 1 (from core)', 6, true);
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
 		ob_start();
-			__c('Plural Rule 1 (from core)', 5);
+			__c('Plural Rule 1 (from core)', 6);
 		$result = ob_get_clean();
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
@@ -411,24 +458,24 @@ class BasicsTest extends CakeTestCase {
 	function test__dc() {
 		Configure::write('Config.language', 'rule_1_po');
 
-		$result = __dc('default', 'Plural Rule 1', 5, true);
+		$result = __dc('default', 'Plural Rule 1', 6, true);
 		$expected = 'Plural Rule 1 (translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dc('default', 'Plural Rule 1 (from core)', 5, true);
+		$result = __dc('default', 'Plural Rule 1 (from core)', 6, true);
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dc('core', 'Plural Rule 1', 5, true);
+		$result = __dc('core', 'Plural Rule 1', 6, true);
 		$expected = 'Plural Rule 1';
 		$this->assertEqual($result, $expected);
 
-		$result = __dc('core', 'Plural Rule 1 (from core)', 5, true);
+		$result = __dc('core', 'Plural Rule 1 (from core)', 6, true);
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
 		ob_start();
-			__dc('default', 'Plural Rule 1 (from core)', 5);
+			__dc('default', 'Plural Rule 1 (from core)', 6);
 		$result = ob_get_clean();
 		$expected = 'Plural Rule 1 (from core translated)';
 		$this->assertEqual($result, $expected);
@@ -442,20 +489,20 @@ class BasicsTest extends CakeTestCase {
 	function test__dcn() {
 		Configure::write('Config.language', 'rule_1_po');
 
-		$result = __dcn('default', '%d = 1', '%d = 0 or > 1', 0, 5, true);
+		$result = __dcn('default', '%d = 1', '%d = 0 or > 1', 0, 6, true);
 		$expected = '%d = 0 or > 1 (translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 5, true);
+		$result = __dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6, true);
 		$expected = '%d = 1 (from core translated)';
 		$this->assertEqual($result, $expected);
 
-		$result = __dcn('core', '%d = 1', '%d = 0 or > 1', 0, 5, true);
+		$result = __dcn('core', '%d = 1', '%d = 0 or > 1', 0, 6, true);
 		$expected = '%d = 0 or > 1';
 		$this->assertEqual($result, $expected);
 
 		ob_start();
-			__dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 5);
+			__dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6);
 		$result = ob_get_clean();
 		$expected = '%d = 1 (from core translated)';
 		$this->assertEqual($result, $expected);
diff --git a/cake/tests/cases/console/cake.test.php b/cake/tests/cases/console/cake.test.php
index 9ec2e57dd..6eda913f8 100644
--- a/cake/tests/cases/console/cake.test.php
+++ b/cake/tests/cases/console/cake.test.php
@@ -396,6 +396,25 @@ class ShellDispatcherTest extends UnitTestCase {
 		$Dispatcher->params = $Dispatcher->args = array();
 		$Dispatcher->parseParams($params);
 		$this->assertEqual($expected, $Dispatcher->params);
+
+
+		$params = array(
+			'cake.php',
+			'-working',
+			'D:\www',
+			'bake',
+			'my_app',
+		);
+		$expected = array(
+			'working' => 'D:\www',
+			'app' => 'www',
+			'root' => 'D:',
+			'webroot' => 'webroot'
+		);
+
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
 	}
 /**
  * testBuildPaths method
diff --git a/cake/tests/cases/console/libs/acl.test.php b/cake/tests/cases/console/libs/acl.test.php
index df4e337d8..f27a69436 100644
--- a/cake/tests/cases/console/libs/acl.test.php
+++ b/cake/tests/cases/console/libs/acl.test.php
@@ -86,7 +86,7 @@ class AclShellTest extends CakeTestCase {
 	function startTest() {
 		$this->Dispatcher =& new TestAclShellMockShellDispatcher();
 		$this->Task =& new MockAclShell($this->Dispatcher);
-		$this->Task->Dispatch = new $this->Dispatcher;
+		$this->Task->Dispatch =& $this->Dispatcher;
 		$this->Task->params['datasource'] = 'test_suite';
 	}
 
diff --git a/cake/tests/cases/console/libs/api.test.php b/cake/tests/cases/console/libs/api.test.php
new file mode 100644
index 000000000..b5568fce7
--- /dev/null
+++ b/cake/tests/cases/console/libs/api.test.php
@@ -0,0 +1,116 @@
+Dispatcher =& new ApiShellMockShellDispatcher();
+		$this->Shell =& new MockApiShell($this->Dispatcher);
+		$this->Shell->Dispatch =& $this->Dispatcher;
+	}
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+/**
+ * Test that method names are detected properly including those with no arguments.
+ *
+ * @access public
+ * @return void
+ */
+	function testMethodNameDetection () {
+		$this->Shell->setReturnValueAt(0, 'in', 'q');
+		$this->Shell->expectAt(0, 'out', array('Controller'));
+		$expected = array(
+			array(
+				'1. afterFilter()',
+				'2. beforeFilter()',
+				'3. beforeRender()',
+				'4. constructClasses()',
+				'5. disableCache()',
+				'6. flash($message, $url, $pause = 1)',
+				'7. header($status)',
+				'8. isAuthorized()',
+				'9. loadModel($modelClass = null, $id = null)',
+				'10. paginate($object = null, $scope = array(), $whitelist = array())',
+				'11. postConditions($data = array(), $op = null, $bool = \'AND\', $exclusive = false)',
+				'12. redirect($url, $status = null, $exit = true)',
+				'13. referer($default = null, $local = false)',
+				'14. render($action = null, $layout = null, $file = null)',
+				'15. set($one, $two = null)',
+				'16. setAction($action)',
+				'17. validate()',
+				'18. validateErrors()'
+			)
+		);
+		$this->Shell->expectAt(1, 'out', $expected);
+
+		$this->Shell->args = array('controller');
+		$this->Shell->paths['controller'] = CAKE_CORE_INCLUDE_PATH . DS . LIBS . 'controller' . DS;
+		$this->Shell->main();
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/shell.test.php b/cake/tests/cases/console/libs/shell.test.php
index bfd15a95b..b832088e5 100644
--- a/cake/tests/cases/console/libs/shell.test.php
+++ b/cake/tests/cases/console/libs/shell.test.php
@@ -37,10 +37,9 @@ if (!class_exists('ShellDispatcher')) {
 	ob_end_clean();
 }
 
-Mock::generatePartial(
-				'ShellDispatcher', 'TestShellMockShellDispatcher',
-				array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
-				);
+Mock::generatePartial('ShellDispatcher', 'TestShellMockShellDispatcher', array(
+	'getInput', 'stdout', 'stderr', '_stop', '_initEnvironment'
+));
 /**
  * TestShell class
  *
@@ -48,6 +47,13 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs
  */
 class TestShell extends Shell {
+/**
+ * Fixtures used in this test case
+ *
+ * @var name
+ * @access public
+ */	
+	var $name = 'TestShell';
 }
 /**
  * TestAppleTask class
diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php
index c8835cfcb..548f29606 100644
--- a/cake/tests/cases/console/libs/tasks/test.test.php
+++ b/cake/tests/cases/console/libs/tasks/test.test.php
@@ -65,7 +65,7 @@ class TestTaskTest extends CakeTestCase {
 	function setUp() {
 		$this->Dispatcher =& new TestTestTaskMockShellDispatcher();
 		$this->Task =& new MockTestTask($this->Dispatcher);
-		$this->Task->Dispatch = new $this->Dispatcher;
+		$this->Task->Dispatch =& $this->Dispatcher;
 	}
 /**
  * tearDown method
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
index 399106bc6..895eaaf40 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/cake/tests/cases/libs/cake_test_case.test.php
@@ -219,6 +219,7 @@ class CakeTestCaseTest extends CakeTestCase {
 		$this->Case->before('start');
 		$this->expectError();
 		$this->Case->loadFixtures('Wrong!');
+		$this->Case->end();
 	}
 /**
  * testGetTests Method
@@ -263,6 +264,10 @@ class CakeTestCaseTest extends CakeTestCase {
 		$result = $this->Case->testAction('/tests_apps/set_action', array('return' => 'vars'));
 		$this->assertEqual($result, array('var' => 'string'));
 
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$fixture =& new PostFixture();
+		$fixture->create($db);
+
 		$result = $this->Case->testAction('/tests_apps_posts/add', array('return' => 'vars'));
 		$this->assertTrue(array_key_exists('posts', $result));
 		$this->assertEqual(count($result['posts']), 1);
@@ -304,7 +309,7 @@ class CakeTestCaseTest extends CakeTestCase {
 			)
 		));
 		$this->assertEqual(array_keys($result['data']), array('name', 'pork'));
-
+		$fixture->drop($db);
 
 		$db =& ConnectionManager::getDataSource('test_suite');
 		$_backPrefix = $db->config['prefix'];
@@ -314,11 +319,11 @@ class CakeTestCaseTest extends CakeTestCase {
 		$config['prefix'] = 'cake_testcase_test_';
 
 		ConnectionManager::create('cake_test_case', $config);
-		$db =& ConnectionManager::getDataSource('cake_test_case');
+		$db2 =& ConnectionManager::getDataSource('cake_test_case');
 
-		$fixture =& new PostFixture($db);
-		$fixture->create($db);
-		$fixture->insert($db);
+		$fixture =& new PostFixture($db2);
+		$fixture->create($db2);
+		$fixture->insert($db2);
 
 		$result = $this->Case->testAction('/tests_apps_posts/fixtured', array(
 			'return' => 'vars',
@@ -327,15 +332,12 @@ class CakeTestCaseTest extends CakeTestCase {
 		));
 		$this->assertTrue(isset($result['posts']));
 		$this->assertEqual(count($result['posts']), 3);
-		$tables = $db->listSources(true);
+		$tables = $db2->listSources();
 		$this->assertFalse(in_array('cake_testaction_test_suite_posts', $tables));
 
-		$fixture->drop($db);
+		$fixture->drop($db2);
 
 		$db =& ConnectionManager::getDataSource('test_suite');
-		$db->config['prefix'] = $_backPrefix;
-		$fixture->drop($db);
-
 
 		//test that drop tables behaves as exepected with testAction
 		$db =& ConnectionManager::getDataSource('test_suite');
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/cake/tests/cases/libs/cake_test_fixture.test.php
index 03a712a56..d5844bc6c 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -60,9 +60,9 @@ class CakeTestFixtureTestFixture extends CakeTestFixture {
  * @var array
  */
 	var $records = array(
-		array('name' => 'Gandalf'),
-		array('name' => 'Captain Picard'),
-		array('name' => 'Chewbacca')
+		array('name' => 'Gandalf', 'created' => '2009-04-28 19:20:00'),
+		array('name' => 'Captain Picard', 'created' => '2009-04-28 19:20:00'),
+		array('name' => 'Chewbacca', 'created' => '2009-04-28 19:20:00')
 	);
 }
 /**
diff --git a/cake/tests/cases/libs/controller/component.test.php b/cake/tests/cases/libs/controller/component.test.php
index cd99ec02c..e3f78b28c 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/cake/tests/cases/libs/controller/component.test.php
@@ -436,6 +436,21 @@ class ComponentTest extends CakeTestCase {
 		$this->assertEqual($Controller->Orange->settings, $expected);
 		$this->assertEqual($Controller->ParamTest->test, 'value');
 	}
+
+/**
+ * Ensure that settings are not duplicated when passed into component initialize.
+ *
+ * @return void
+ **/
+	function testComponentParamsNoDuplication() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('Orange' => array('setting' => array('itemx')));
+
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+		$expected = array('setting' => array('itemx'), 'colour' => 'blood orange');
+		$this->assertEqual($Controller->Orange->settings, $expected, 'Params duplication has occured %s');
+	}
 /**
  * Test mutually referencing components.
  *
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/cake/tests/cases/libs/controller/components/auth.test.php
index 00bf8a9c6..481b2dd5f 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/cake/tests/cases/libs/controller/components/auth.test.php
@@ -728,7 +728,36 @@ class AuthTest extends CakeTestCase {
 		$this->Controller->params['action'] = 'Add';
 		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
 	}
+/**
+ * test that allow() and allowedActions work with camelCase method names.
+ *
+ * @return void
+ **/
+	function testAllowedActionsWithCamelCaseMethods() {
+		$url = '/auth_test/camelCase';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->allow('*');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result, 'startup() should return true, as action is allowed. %s');
 
+		$url = '/auth_test/camelCase';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->allowedActions = array('delete', 'camelCase', 'add');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result, 'startup() should return true, as action is allowed. %s');
+
+		$this->Controller->Auth->allowedActions = array('delete', 'add');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertFalse($result, 'startup() should return false, as action is not allowed. %s');
+	}
 /**
  * testLoginRedirect method
  *
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
index 08f033aac..27086ecce 100644
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/cake/tests/cases/libs/controller/components/email.test.php
@@ -104,6 +104,15 @@ class EmailTestComponent extends EmailComponent {
 	function getMessage() {
 		return $this->__message;
 	}
+/**
+ * Convenience method for testing.
+ *
+ * @access public
+ * @return string
+ */
+	function strip($content, $message = false) {
+		return parent::__strip($content, $message);
+	}
 }
 /**
  * EmailTestController class
@@ -328,7 +337,8 @@ MSGBLOC;
 
 		// TODO: better test for format of message sent?
 		$this->Controller->EmailTest->sendAs = 'both';
-		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"' . "\n", $message);
+		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $message);
+
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 	}
@@ -403,10 +413,11 @@ HTMLBLOC;
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 
 		$this->Controller->EmailTest->sendAs = 'both';
-		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"' . "\n", $header);
+		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $header);
 		$expect .= '--alt-' . "\n" . 'Content-Type: text/plain; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 7bit' . "\n\n" . $text . "\n\n";
 		$expect .= '--alt-' . "\n" . 'Content-Type: text/html; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 7bit' . "\n\n" . $html . "\n\n";
 		$expect = '
    ' . $expect . '--alt---' . "\n\n" . '
    ';
+
 		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
 		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
 
@@ -499,9 +510,21 @@ TEXTBLOC;
 		$content = "Previous content\n--alt-\nContent-TypeContent-Type:: text/html; charsetcharset==utf-8\nContent-Transfer-Encoding: 7bit";
 		$content .= "\n\n
    My own html content
    ";
 
-		$result = $this->Controller->EmailTest->__strip($content, true);
+		$result = $this->Controller->EmailTest->strip($content, true);
 		$expected = "Previous content\n--alt-\n text/html; utf-8\n 7bit\n\n
    My own html content
    ";
 		$this->assertEqual($result, $expected);
+
+		$content = '
    Some HTML content with an email link';
+		$result  = $this->Controller->EmailTest->strip($content, true);
+		$expected = $content;
+		$this->assertEqual($result, $expected);
+
+		$content  = '
    Some HTML content with an ';
+		$content .= 'email link';
+		$result  = $this->Controller->EmailTest->strip($content, true);
+		$expected = $content;
+		$this->assertEqual($result, $expected);
+
 	}
 /**
  * testMultibyte method
@@ -535,6 +558,66 @@ TEXTBLOC;
 		preg_match('/Subject: (.*)Header:/s', $this->Controller->Session->read('Message.email.message'), $matches);
 		$this->assertEqual(trim($matches[1]), $subject);
 	}
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testSendAsIsNotIgnoredIfAttachmentsPresent() {
+		$this->Controller->EmailTest->reset();
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->attachments = array(__FILE__);
+		$body = '
    This is the body of the message
    ';
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertNoPattern('/text\/plain/', $msg);
+		$this->assertPattern('/text\/html/', $msg);
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertPattern('/text\/plain/', $msg);
+		$this->assertNoPattern('/text\/html/', $msg);
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/text\/plain/', $msg);
+		$this->assertNoPattern('/text\/html/', $msg);
+		$this->assertPattern('/multipart\/alternative/', $msg);
+	}
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testNoDoubleNewlinesInHeaders() {
+		$this->Controller->EmailTest->reset();
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$body = '
    This is the body of the message
    ';
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/\n\nContent-Transfer-Encoding/', $msg);
+		$this->assertPattern('/\nContent-Transfer-Encoding/', $msg);
+	}
 /**
  * testReset method
  *
@@ -553,6 +636,7 @@ TEXTBLOC;
 		$this->Controller->EmailTest->additionalParams = 'X-additional-header';
 		$this->Controller->EmailTest->delivery = 'smtp';
 		$this->Controller->EmailTest->smtpOptions['host'] = 'blah';
+		$this->Controller->EmailTest->attachments = array('attachment1', 'attachment2');
 
 		$this->assertFalse($this->Controller->EmailTest->send('Should not work'));
 
@@ -571,6 +655,7 @@ TEXTBLOC;
 		$this->assertNull($this->Controller->EmailTest->getBoundary());
 		$this->assertIdentical($this->Controller->EmailTest->getMessage(), array());
 		$this->assertNull($this->Controller->EmailTest->smtpError);
+		$this->assertIdentical($this->Controller->EmailTest->attachments, array());
 	}
 /**
  * osFix method
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/cake/tests/cases/libs/controller/components/request_handler.test.php
index 0af25da9c..f0e638d4d 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -35,6 +35,13 @@ Mock::generatePartial('RequestHandlerComponent', 'NoStopRequestHandler', array('
  * @subpackage    cake.tests.cases.libs.controller.components
  */
 class RequestHandlerTestController extends Controller {
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ **/
+	var $name = 'RequestHandlerTest';
 /**
  * uses property
  *
@@ -124,21 +131,32 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	var $RequestHandler;
 /**
- * setUp method
+ * startTest method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->_init();
 	}
 /**
- * tearDown method
+ * init method
+ *
+ * @access protected
+ * @return void
+ */
+	function _init() {
+		$this->Controller = new RequestHandlerTestController(array('components' => array('RequestHandler')));
+		$this->Controller->constructClasses();
+		$this->RequestHandler =& $this->Controller->RequestHandler;
+	}
+/**
+ * endTest method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->RequestHandler);
 		unset($this->Controller);
 		if (!headers_sent()) {
@@ -241,6 +259,24 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
 		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
 	}
+/**
+ * test that calling renderAs() more than once continues to work.
+ *
+ * @link #6466
+ * @return void
+ **/
+	function testRenderAsCalledTwice() {
+		$this->RequestHandler->renderAs($this->Controller, 'xml');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test/xml');
+		$this->assertEqual($this->Controller->layoutPath, 'xml');
+		
+		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
+
+		$this->RequestHandler->renderAs($this->Controller, 'js');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test/js');
+		$this->assertEqual($this->Controller->layoutPath, 'js');
+		$this->assertTrue(in_array('Js', $this->Controller->helpers));
+	}
 /**
  * testRequestClientTypes method
  *
@@ -502,16 +538,5 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		Configure::write('viewPaths', $_paths);
 		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
 	}
-/**
- * init method
- *
- * @access protected
- * @return void
- */
-	function _init() {
-		$this->Controller = new RequestHandlerTestController(array('components' => array('RequestHandler')));
-		$this->Controller->constructClasses();
-		$this->RequestHandler =& $this->Controller->RequestHandler;
-	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/cake/tests/cases/libs/controller/components/security.test.php
index 0ef3dc24c..f744f2dce 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/cake/tests/cases/libs/controller/components/security.test.php
@@ -363,6 +363,14 @@ class SecurityComponentTest extends CakeTestCase {
  * @return void
  */
 	function testDigestAuth() {
+		$skip = $this->skipIf((version_compare(PHP_VERSION, '5.1') == -1) XOR (!function_exists('apache_request_headers')),
+			"%s Cannot run Digest Auth test for PHP versions < 5.1"
+		);
+
+		if ($skip) {
+			return;
+		}
+
 		$this->Controller->action = 'posted';
 		$_SERVER['PHP_AUTH_DIGEST'] = $digest = <<
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ * @since         CakePHP(tm) v 1.2.3
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('AppController')) {
+	/**
+	 * Test case AppController requred
+	 *
+	 * @package cake.tests.cases.libs.controller
+	 **/
+	class AppController extends Controller {
+		/**
+		 * components
+		 *
+		 * @var array
+		 **/
+		var $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
+		/**
+		 * helpers
+		 *
+		 * @var array
+		 **/
+		var $helpers = array('MergeVar' => array('format' => 'html', 'terse'));
+	}
+} elseif (!defined('APP_CONTROLLER_EXISTS')) {
+	define('APP_CONTROLLER_EXISTS', true);
+}
+
+/**
+ * MergeVar Component
+ *
+ * @package cake.tests.cases.libs.controller
+ **/
+class MergeVarComponent extends Object {
+
+}
+
+/**
+ * Additional controller for testing
+ *
+ * @package cake.tests.cases.libs.controller
+ **/
+class MergeVariablesController extends AppController {
+/**
+ * name
+ *
+ * @var string
+ **/
+	var $name = 'MergeVariables';
+/**
+ * uses
+ *
+ * @var arrays
+ **/
+	var $uses = array();
+}
+
+/**
+ * MergeVarPlugin App Controller
+ *
+ * @package cake.tests.cases.libs.controller
+ **/
+class MergeVarPluginAppController extends AppController {
+/**
+ * components
+ *
+ * @var array
+ **/
+	var $components = array('Auth' => array('setting' => 'val', 'otherVal'));
+/**
+ * helpers
+ *
+ * @var array
+ **/
+	var $helpers = array('Javascript');
+}
+
+/**
+ * MergePostsController
+ *
+ * @package cake.tests.cases.libs.controller
+ **/
+class MergePostsController extends MergeVarPluginAppController {
+/**
+ * name
+ *
+ * @var string
+ **/
+	var $name = 'MergePosts';
+/**
+ * uses
+ *
+ * @var array
+ **/
+	var $uses = array();
+}
+
+
+/**
+ * Test Case for Controller Merging of Vars.
+ *
+ * @package cake.tests.cases.libs.controller
+ **/
+class ControllerMergeVarsTestCase extends CakeTestCase {
+
+/**
+ * end test
+ *
+ * @return void
+ **/
+	function endTest() {
+		ClassRegistry::flush();
+	}
+/**
+ * test that component settings are not duplicated when merging component settings
+ *
+ * @return void
+ **/
+	function testComponentParamMergingNoDuplication() {
+		$Controller =& new MergeVariablesController();
+		$Controller->constructClasses();
+
+		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
+		$this->assertEqual($Controller->components, $expected, 'Duplication of settings occured. %s');
+	}
+/**
+ * test component merges with redeclared components
+ *
+ * @return void
+ **/
+	function testComponentMergingWithRedeclarations() {
+		$Controller =& new MergeVariablesController();
+		$Controller->components['MergeVar'] = array('remote', 'redirect' => true);
+		$Controller->constructClasses();
+
+		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => true, 'remote'));
+		$this->assertEqual($Controller->components, $expected, 'Merging of settings is wrong. %s');
+	}
+/**
+ * test merging of helpers array, ensure no duplication occurs
+ *
+ * @return void
+ **/
+	function testHelperSettingMergingNoDuplication() {
+		$Controller =& new MergeVariablesController();
+		$Controller->constructClasses();
+
+		$expected = array('MergeVar' => array('format' => 'html', 'terse'));
+		$this->assertEqual($Controller->helpers, $expected, 'Duplication of settings occured. %s');
+	}
+/**
+ * test merging of vars with plugin
+ *
+ * @return void
+ **/
+	function testMergeVarsWithPlugin() {
+		$Controller =& new MergePostsController();
+		$Controller->components = array('Email' => array('ports' => 'open'));
+		$Controller->plugin = 'MergeVarPlugin';
+		$Controller->constructClasses();
+
+		$expected = array(
+			'MergeVar' => array('flag', 'otherFlag', 'redirect' => false),
+			'Auth' => array('setting' => 'val', 'otherVal'),
+			'Email' => array('ports' => 'open')
+		);
+		$this->assertEqual($Controller->components, $expected, 'Components are unexpected %s');
+		
+		$expected = array(
+			'Javascript',
+			'MergeVar' => array('format' => 'html', 'terse')
+		);
+		$this->assertEqual($Controller->helpers, $expected, 'Helpers are unexpected %s');
+
+		$Controller =& new MergePostsController();
+		$Controller->components = array();
+		$Controller->plugin = 'MergeVarPlugin';
+		$Controller->constructClasses();
+
+		$expected = array(
+			'MergeVar' => array('flag', 'otherFlag', 'redirect' => false),
+			'Auth' => array('setting' => 'val', 'otherVal'),
+		);
+		$this->assertEqual($Controller->components, $expected, 'Components are unexpected %s');
+	}
+/**
+ * Ensure that __mergeVars is not being greedy and merging with
+ * AppController when you make an instance of Controller
+ *
+ * @return void
+ **/
+	function testMergeVarsNotGreedy() {
+		$Controller =& new Controller();
+		$Controller->components = array();
+		$Controller->uses = array();
+		$Controller->constructClasses();
+
+		$this->assertTrue(isset($Controller->Session));
+	}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/cake/tests/cases/libs/controller/scaffold.test.php
index 78dca4ee3..d7dfa7ea3 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/cake/tests/cases/libs/controller/scaffold.test.php
@@ -47,6 +47,37 @@ class ScaffoldMockController extends Controller {
  */
 	var $scaffold;
 }
+/**
+ * ScaffoldMockControllerWithFields class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldMockControllerWithFields extends Controller {
+/**
+ * name property
+ *
+ * @var string 'ScaffoldMock'
+ * @access public
+ */
+	var $name = 'ScaffoldMock';
+/**
+ * scaffold property
+ *
+ * @var mixed
+ * @access public
+ */
+	var $scaffold;
+/**
+ * function _beforeScaffold
+ *
+ * @param string method
+ */
+	function _beforeScaffold($method) {
+		$this->set('scaffoldFields', array('title'));
+		return true;
+	}
+}
 /**
  * TestScaffoldMock class
  *
@@ -197,21 +228,21 @@ class ScaffoldViewTest extends CakeTestCase {
  */
 	var $fixtures = array('core.article', 'core.user', 'core.comment');
 /**
- * setUp method
+ * startTest method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Controller =& new ScaffoldMockController();
 	}
 /**
- * tearDown method
+ * endTest method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->Controller);
 	}
 /**
@@ -421,7 +452,6 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->assertPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
 		$this->assertPattern('/
  • ]*>Delete<\/a>\s*<\/li>/', $result);
 	}
-
 /**
  * Test Admin Index Scaffolding.
  *
@@ -531,21 +561,21 @@ class ScaffoldTest extends CakeTestCase {
  */
 	var $fixtures = array('core.article', 'core.user', 'core.comment');
 /**
- * setUp method
+ * startTest method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Controller =& new ScaffoldMockController();
 	}
 /**
- * tearDown method
+ * endTest method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->Controller);
 	}
 /**
@@ -580,7 +610,6 @@ class ScaffoldTest extends CakeTestCase {
 		$result = $Scaffold->getParams();
 		$this->assertEqual($result['action'], 'admin_edit');
 	}
-
 /**
  * test that the proper names and variable values are set by Scaffold
  *
@@ -608,7 +637,7 @@ class ScaffoldTest extends CakeTestCase {
 		$this->Controller->base = '/';
 		$this->Controller->constructClasses();
 		$Scaffold =& new TestScaffoldMock($this->Controller, $params);
-		$result = $this->Controller->viewVars;
+		$result = $Scaffold->controller->viewVars;
 
 		$this->assertEqual($result['singularHumanName'], 'Scaffold Mock');
 		$this->assertEqual($result['pluralHumanName'], 'Scaffold Mock');
@@ -619,5 +648,37 @@ class ScaffoldTest extends CakeTestCase {
 		$this->assertEqual($result['pluralVar'], 'scaffoldMock');
 		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
 	}
+/**
+ * test that the proper names and variable values are set by Scaffold
+ *
+ * @return void
+ **/
+	function testEditScaffoldWithScaffoldFields() {
+		$this->Controller = new ScaffoldMockControllerWithFields();
+		$this->Controller->action = 'edit';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'edit',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		ob_start();
+		new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertNoPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
index cb6a79891..b3fa948b1 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -399,12 +399,12 @@ class HttpSocketTest extends CakeTestCase {
 		$this->Socket->setReturnValue('read', false);
 		$this->Socket->_mock->_call_counts['read'] = 0;
 		$number = mt_rand(0, 9999999);
-		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n
    Hello, your lucky number is ".$number."
    ";
+		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n
    Hello, your lucky number is " . $number . "
    ";
 		$this->Socket->setReturnValueAt(0, 'read', $serverResponse);
 		$this->Socket->expect('write', array("GET / HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n"));
 		$this->Socket->expectCallCount('read', 2);
 		$response = $this->Socket->request($request);
-		$this->assertIdentical($response, "
    Hello, your lucky number is ".$number."
    ");
+		$this->assertIdentical($response, "
    Hello, your lucky number is " . $number . "
    ");
 
 		$this->Socket->reset();
 		$serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n
    This is a cookie test!
    ";
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index 4a1183036..e570bc6f5 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -39,8 +39,15 @@ class I18nTest extends CakeTestCase {
  * @return void
  */
 	function setUp() {
+		$this->_objects = Configure::read('__objects');
+		Configure::write('__objects', array());
+
 		$this->_localePaths = Configure::read('localePaths');
 		Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale'));
+
+		$this->_pluginPaths = Configure::read('pluginPaths');
+		Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'));
+
 	}
 /**
  * tearDown method
@@ -50,6 +57,9 @@ class I18nTest extends CakeTestCase {
  */
 	function tearDown() {
 		Configure::write('localePaths', $this->_localePaths);
+		Configure::write('pluginPaths', $this->_pluginPaths);
+		Configure::write('__objects', $this->_objects);
+
 	}
 /**
  * testDefaultStrings method
@@ -2353,9 +2363,6 @@ class I18nTest extends CakeTestCase {
  * @return void
  */
 	function testPluginTranslation() {
-		$pluginPaths = Configure::read('pluginPaths');
-		Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'));
-
 		Configure::write('Config.language', 'po');
 		$singular = $this->__domainSingular();
 		$this->assertEqual('Plural Rule 1 (from plugin)', $singular);
@@ -2387,8 +2394,6 @@ class I18nTest extends CakeTestCase {
 		$this->assertTrue(in_array('23 = 0 or > 1 (from plugin)', $plurals));
 		$this->assertTrue(in_array('24 = 0 or > 1 (from plugin)', $plurals));
 		$this->assertTrue(in_array('25 = 0 or > 1 (from plugin)', $plurals));
-
-		Configure::write('pluginPaths', $pluginPaths);
 	}
 /**
  * testPoMultipleLineTranslation method
@@ -2484,6 +2489,12 @@ class I18nTest extends CakeTestCase {
 		$expected = 'this is a "quoted string" (translated)';
 		$this->assertEqual(__('this is a "quoted string"', true), $expected);
 	}
+/**
+ * testFloatValue method
+ *
+ * @access public
+ * @return void
+ */
 	function testFloatValue() {
 		Configure::write('Config.language', 'rule_9_po');
 
@@ -2499,6 +2510,70 @@ class I18nTest extends CakeTestCase {
 		$expected = "%d everything else (translated)";
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * testCategory method
+ *
+ * @access public
+ * @return void
+ */
+	function testCategory() {
+		Configure::write('Config.language', 'po');
+		$category = $this->__category();
+		$this->assertEqual('Monetary Po (translated)', $category);
+	}
+/**
+ * testPluginCategory method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginCategory() {
+		Configure::write('Config.language', 'po');
+
+		$singular = $this->__domainCategorySingular();
+		$this->assertEqual('Monetary Plural Rule 1 (from plugin)', $singular);
+
+		$plurals = $this->__domainCategoryPlural();
+		$this->assertTrue(in_array('Monetary 0 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('Monetary 1 = 1 (from plugin)', $plurals));
+	}
+/**
+ * testCategoryThenSingular method
+ *
+ * @access public
+ * @return void
+ */
+	function testCategoryThenSingular() {
+		Configure::write('Config.language', 'po');
+		$category = $this->__category();
+		$this->assertEqual('Monetary Po (translated)', $category);
+
+		$singular = $this->__singular();
+		$this->assertEqual('Po (translated)', $singular);
+	}
+/**
+ * Singular method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainCategorySingular($domain = 'test_plugin', $category = LC_MONETARY) {
+		$singular = __dc($domain, 'Plural Rule 1', $category, true);
+		return $singular;
+	}
+/**
+ * Plural method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainCategoryPlural($domain = 'test_plugin', $category = LC_MONETARY) {
+		$plurals = array();
+		for ($number = 0; $number <= 25; $number++) {
+			$plurals[] =  sprintf(__dcn($domain, '%d = 1', '%d = 0 or > 1', (float)$number, $category, true), (float)$number);
+		}
+		return $plurals;
+	}
 /**
  * Singular method
  *
@@ -2522,6 +2597,16 @@ class I18nTest extends CakeTestCase {
 		}
 		return $plurals;
 	}
+/**
+ * category method
+ *
+ * @access private
+ * @return void
+ */
+	function __category($category = LC_MONETARY) {
+		$singular = __c('Plural Rule 1', $category, true);
+		return $singular;
+	}
 /**
  * Singular method
  *
diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
index f3aaea211..48df8fa3c 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/cake/tests/cases/libs/l10n.test.php
@@ -848,7 +848,7 @@ class L10nTest extends CakeTestCase {
 
 		$result = $l10n->catalog(array('sk'));
 		$expected = array(
-			'sk' => array('language' => 'Slovack', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8')
+			'sk' => array('language' => 'Slovak', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8')
 		);
 		$this->assertEqual($result, $expected);
 
diff --git a/cake/tests/cases/libs/model/behavior.test.php b/cake/tests/cases/libs/model/behavior.test.php
index 9b3760259..727316a22 100644
--- a/cake/tests/cases/libs/model/behavior.test.php
+++ b/cake/tests/cases/libs/model/behavior.test.php
@@ -257,7 +257,7 @@ class TestBehavior extends ModelBehavior {
 		}
 		echo "onError trigger success";
 	}
-		/**
+/**
  * beforeTest method
  *
  * @param mixed $model
@@ -265,8 +265,8 @@ class TestBehavior extends ModelBehavior {
  * @return void
  */
 	function beforeTest(&$model) {
-		$model->beforeTestResult[] = get_class($this);
-		return get_class($this);
+		$model->beforeTestResult[] = strtolower(get_class($this));
+		return strtolower(get_class($this));
 	}
 /**
  * testMethod method
@@ -337,6 +337,58 @@ class Test2Behavior extends TestBehavior{
  */
 class Test3Behavior extends TestBehavior{
 }
+/**
+ * Test4Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test4Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasMany' => array('Comment'))
+		);
+	}
+}
+/**
+ * Test5Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test5Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('belongsTo' => array('User'))
+		);
+	}
+}
+/**
+ * Test6Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test6Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasAndBelongsToMany' => array('Tag'))
+		);
+	}
+}
+/**
+ * Test7Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test7Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasOne' => array('Attachment'))
+		);
+	}
+}
 /**
  * BehaviorTest class
  *
@@ -350,7 +402,10 @@ class BehaviorTest extends CakeTestCase {
  * @var array
  * @access public
  */
-	var $fixtures = array('core.apple', 'core.sample');
+	var $fixtures = array(
+		'core.apple', 'core.sample', 'core.article', 'core.user', 'core.comment',
+		'core.attachment', 'core.tag', 'core.articles_tag'
+	);
 /**
  * tearDown method
  *
@@ -928,26 +983,73 @@ class BehaviorTest extends CakeTestCase {
  * @return void
  */
 	function testBehaviorTrigger() {
-		$Apple = new Apple();
+		$Apple =& new Apple();
 		$Apple->Behaviors->attach('Test');
 		$Apple->Behaviors->attach('Test2');
 		$Apple->Behaviors->attach('Test3');
 
 		$Apple->beforeTestResult = array();
 		$Apple->Behaviors->trigger($Apple, 'beforeTest');
-		$expected = array('TestBehavior', 'Test2Behavior', 'Test3Behavior');
+		$expected = array('testbehavior', 'test2behavior', 'test3behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 
 		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => 'Test2Behavior'));
-		$expected = array('TestBehavior', 'Test2Behavior');
+		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => 'test2behavior'));
+		$expected = array('testbehavior', 'test2behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 
 		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => array('Test2Behavior', 'Test3Behavior')));
-		$expected = array('TestBehavior', 'Test2Behavior');
+		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => array('test2behavior', 'test3behavior')));
+		$expected = array('testbehavior', 'test2behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 	}
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testBindModelCallsInBehaviors() {
+		$this->loadFixtures('Article', 'Comment');
+
+		// hasMany
+		$Article = new Article();
+		$Article->unbindModel(array('hasMany' => array('Comment')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('Comment', $result));
+
+		$Article->Behaviors->attach('Test4');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('Comment', $result));
+
+		// belongsTo
+		$Article->unbindModel(array('belongsTo' => array('User')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('User', $result));
+
+		$Article->Behaviors->attach('Test5');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('User', $result));
+
+		// hasAndBelongsToMany
+		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('Tag', $result));
+
+		$Article->Behaviors->attach('Test6');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('Comment', $result));
+
+		// hasOne
+		$Comment = new Comment();
+		$Comment->unbindModel(array('hasOne' => array('Attachment')));
+		$result = $Comment->find('first');
+		$this->assertFalse(array_key_exists('Attachment', $result));
+
+		$Comment->Behaviors->attach('Test7');
+		$result = $Comment->find('first');
+		$this->assertTrue(array_key_exists('Attachment', $result));
+	}
 /**
  * Test attach and detaching
  *
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
index d7cf0d0c5..ca16f3188 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -1982,70 +1982,76 @@ class ContainableBehaviorTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 
-		$result = $this->User->find('all', array('contain' => array(
-			'ArticleFeatured' => array(
-				'title', 'order' => 'title DESC',
-				'Featured' => array(
-					'category_id',
-					'Category' => 'name'
-				)
-			)
-		)));
-		$expected = array(
-			array(
-				'User' => array(
-					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
-				),
-				'ArticleFeatured' => array(
-					array(
-						'title' => 'Third Article', 'id' => 3, 'user_id' => 1,
-						'Featured' => array()
-					),
-					array(
-						'title' => 'First Article', 'id' => 1, 'user_id' => 1,
-						'Featured' => array(
-							'category_id' => 1, 'id' => 1,
-							'Category' => array(
-								'name' => 'Category 1'
-							)
-						)
-					)
-				)
-			),
-			array(
-				'User' => array(
-					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
-				),
-				'ArticleFeatured' => array()
-			),
-			array(
-				'User' => array(
-					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
-				),
-				'ArticleFeatured' => array(
-					array(
-						'title' => 'Second Article', 'id' => 2, 'user_id' => 3,
-						'Featured' => array(
-							'category_id' => 1, 'id' => 2,
-							'Category' => array(
-								'name' => 'Category 1'
-							)
-						)
-					)
-				)
-			),
-			array(
-				'User' => array(
-					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
-					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
-				),
-				'ArticleFeatured' => array()
-			)
+		$orders = array(
+			'title DESC', 'title DESC, published DESC',
+			array('title' => 'DESC'), array('title' => 'DESC', 'published' => 'DESC'),
 		);
-		$this->assertEqual($result, $expected);
+		foreach ($orders as $order) {
+			$result = $this->User->find('all', array('contain' => array(
+				'ArticleFeatured' => array(
+					'title', 'order' => $order,
+					'Featured' => array(
+						'category_id',
+						'Category' => 'name'
+					)
+				)
+			)));
+			$expected = array(
+				array(
+					'User' => array(
+						'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+					),
+					'ArticleFeatured' => array(
+						array(
+							'title' => 'Third Article', 'id' => 3, 'user_id' => 1,
+							'Featured' => array()
+						),
+						array(
+							'title' => 'First Article', 'id' => 1, 'user_id' => 1,
+							'Featured' => array(
+								'category_id' => 1, 'id' => 1,
+								'Category' => array(
+									'name' => 'Category 1'
+								)
+							)
+						)
+					)
+				),
+				array(
+					'User' => array(
+						'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+					),
+					'ArticleFeatured' => array()
+				),
+				array(
+					'User' => array(
+						'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+					),
+					'ArticleFeatured' => array(
+						array(
+							'title' => 'Second Article', 'id' => 2, 'user_id' => 3,
+							'Featured' => array(
+								'category_id' => 1, 'id' => 2,
+								'Category' => array(
+									'name' => 'Category 1'
+								)
+							)
+						)
+					)
+				),
+				array(
+					'User' => array(
+						'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+					),
+					'ArticleFeatured' => array()
+				)
+			);
+			$this->assertEqual($result, $expected);
+		}
 	}
 /**
  * testFindThirdLevelNonReset method
@@ -3225,7 +3231,6 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		$options = array(
 			'conditions' => array(
-				'Comment.comment !=' => 'Crazy',
 				'Comment.published' => 'Y',
 			),
 			'contain' => 'User',
@@ -3236,7 +3241,6 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		$dummyResult = $this->Article->Comment->find('all', array(
 			'conditions' => array(
-				'Comment.comment !=' => 'Silly',
 				'User.user' => 'mariano'
 			),
 			'fields' => array('User.password'),
@@ -3320,7 +3324,6 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		$initialOptions = array(
 			'conditions' => array(
-				'Comment.comment' => '!= Crazy',
 				'Comment.published' => 'Y',
 			),
 			'contain' => 'User',
@@ -3331,7 +3334,6 @@ class ContainableBehaviorTest extends CakeTestCase {
 
 		$findOptions = array(
 			'conditions' => array(
-				'Comment.comment !=' => 'Silly',
 				'User.user' => 'mariano',
 			),
 			'fields' => array('User.password'),
@@ -3409,7 +3411,8 @@ class ContainableBehaviorTest extends CakeTestCase {
 					'joinTable'				=> 'articles_tags',
 					'foreignKey'			=> 'article_id',
 					'associationForeignKey' => 'tag_id',
-					'conditions' 			=> 'LENGTH(ShortTag.tag) <= 3'
+					// LENGHT function mysql-only, using LIKE does almost the same
+					'conditions' 			=> 'ShortTag.tag LIKE "???"'
 				)
 			)
 		);
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/cake/tests/cases/libs/model/behaviors/translate.test.php
index 20eb3651c..3ec69f02b 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -427,15 +427,18 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$expected = array(1 => 'Titel #1', 2 => 'Titel #2', 3 => 'Titel #3');
 		$this->assertEqual($result, $expected);
 
-		$debug = Configure::read('debug');
-		Configure::write('debug', 0);
+		// MSSQL trigger an error and stops the page even if the debug = 0
+		if ($this->db->config['driver'] != 'mssql') {
+			$debug = Configure::read('debug');
+			Configure::write('debug', 0);
 
-		$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => false));
-		$this->assertEqual($result, array());
+			$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => false));
+			$this->assertEqual($result, array());
 
-		$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'after'));
-		$this->assertEqual($result, array());
-		Configure::write('debug', $debug);
+			$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'after'));
+			$this->assertEqual($result, array());
+			Configure::write('debug', $debug);
+		}
 
 		$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'before'));
 		$expected = array(1 => null, 2 => null, 3 => null);
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
index 1cd3268fa..04ab3baed 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -43,6 +43,13 @@ class DboMssqlTestDb extends DboMssql {
  * @access public
  */
 	var $simulated = array();
+/**
+ * simalate property
+ *
+ * @var array
+ * @access public
+ */
+	var $simulate = true;
 /**
  * fetchAllResultsStack
  *
@@ -58,8 +65,12 @@ class DboMssqlTestDb extends DboMssql {
  * @return void
  */
 	function _execute($sql) {
-		$this->simulated[] = $sql;
-		return null;
+		if ($this->simulate) {
+			$this->simulated[] = $sql;
+			return null;
+		} else {
+			return parent::_execute($sql);
+		}
 	}
 /**
  * fetchAll method
@@ -104,6 +115,15 @@ class DboMssqlTestDb extends DboMssql {
 	function getPrimaryKey($model) {
 		return parent::_getPrimaryKey($model);
 	}
+/**
+ * clearFieldMappings method
+ *
+ * @access public
+ * @return void
+ */
+	function clearFieldMappings() {
+		$this->__fieldMappings = array();
+	}
 }
 /**
  * MssqlTestModel class
@@ -152,6 +172,17 @@ class MssqlTestModel extends Model {
 		'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
 		'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
 	);
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'MssqlClientTestModel' => array(
+			'foreignKey' => 'client_id'
+		)
+	);
 /**
  * find method
  *
@@ -189,6 +220,41 @@ class MssqlTestModel extends Model {
 		$this->_schema = $schema;
 	}
 }
+/**
+ * MssqlClientTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class MssqlClientTestModel extends Model {
+/**
+ * name property
+ *
+ * @var string 'MssqlAssociatedTestModel'
+ * @access public
+ */
+	var $name = 'MssqlClientTestModel';
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+/**
+ * _schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
+		'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'created'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+}
 /**
  * DboMssqlTest class
  *
@@ -203,6 +269,20 @@ class DboMssqlTest extends CakeTestCase {
  * @access public
  */
 	var $db = null;
+/**
+ * autoFixtures property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoFixtures = false;
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.category');
 /**
  * Skip if cannot connect to mssql
  *
@@ -212,6 +292,26 @@ class DboMssqlTest extends CakeTestCase {
 		$this->_initDb();
 		$this->skipUnless($this->db->config['driver'] == 'mssql', '%s SQL Server connection not available');
 	}
+/**
+ * Make sure all fixtures tables are being created
+ *
+ * @access public
+ */
+	function start() {
+		$this->db->simulate = false;
+		parent::start();
+		$this->db->simulate = true;
+	}
+/**
+ * Make sure all fixtures tables are being dropped
+ *
+ * @access public
+ */
+	function end() {
+		$this->db->simulate = false;
+		parent::end();
+		$this->db->simulate = true;
+	}
 /**
  * Sets up a Dbo class instance for testing
  *
@@ -238,8 +338,22 @@ class DboMssqlTest extends CakeTestCase {
  * @return void
  */
 	function testQuoting() {
-		$result = $this->db->fields($this->model);
-		$expected = array(
+		$expected = "1.2";
+		$result = $this->db->value(1.2, 'float');
+		$this->assertIdentical($expected, $result);
+
+		$expected = "'1,2'";
+		$result = $this->db->value('1,2', 'float');
+		$this->assertIdentical($expected, $result);
+	}
+/**
+ * testFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testFields() {
+		$fields = array(
 			'[MssqlTestModel].[id] AS [MssqlTestModel__0]',
 			'[MssqlTestModel].[client_id] AS [MssqlTestModel__1]',
 			'[MssqlTestModel].[name] AS [MssqlTestModel__2]',
@@ -259,15 +373,32 @@ class DboMssqlTest extends CakeTestCase {
 			'[MssqlTestModel].[created] AS [MssqlTestModel__16]',
 			'CONVERT(VARCHAR(20), [MssqlTestModel].[updated], 20) AS [MssqlTestModel__17]'
 		);
+
+		$result = $this->db->fields($this->model);
+		$expected = $fields;
 		$this->assertEqual($result, $expected);
 
-		$expected = "1.2";
-		$result = $this->db->value(1.2, 'float');
-		$this->assertIdentical($expected, $result);
+		$this->db->clearFieldMappings();
+		$result = $this->db->fields($this->model, null, 'MssqlTestModel.*');
+		$expected = $fields;
+		$this->assertEqual($result, $expected);
 
-		$expected = "'1,2'";
-		$result = $this->db->value('1,2', 'float');
-		$this->assertIdentical($expected, $result);
+		$this->db->clearFieldMappings();
+		$result = $this->db->fields($this->model, null, array('*', 'AnotherModel.id', 'AnotherModel.name'));
+		$expected = array_merge($fields, array(
+			'[AnotherModel].[id] AS [AnotherModel__18]',
+			'[AnotherModel].[name] AS [AnotherModel__19]'));
+		$this->assertEqual($result, $expected);
+
+		$this->db->clearFieldMappings();
+		$result = $this->db->fields($this->model, null, array('*', 'MssqlClientTestModel.*'));
+		$expected = array_merge($fields, array(
+			'[MssqlClientTestModel].[id] AS [MssqlClientTestModel__18]',
+			'[MssqlClientTestModel].[name] AS [MssqlClientTestModel__19]',
+			'[MssqlClientTestModel].[email] AS [MssqlClientTestModel__20]',
+			'CONVERT(VARCHAR(20), [MssqlClientTestModel].[created], 20) AS [MssqlClientTestModel__21]',
+			'CONVERT(VARCHAR(20), [MssqlClientTestModel].[updated], 20) AS [MssqlClientTestModel__22]'));
+		$this->assertEqual($result, $expected);
 	}
 /**
  * testDistinctFields method
@@ -330,6 +461,64 @@ class DboMssqlTest extends CakeTestCase {
 		);
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * testBuildColumn
+ *
+ * @return unknown_type
+ * @access public
+ */
+	function testBuildColumn() {
+		$column = array('name' => 'id', 'type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary');
+		$result = $this->db->buildColumn($column);
+		$expected = '[id] int IDENTITY (1, 1) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'client_id', 'type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11');
+		$result = $this->db->buildColumn($column);
+		$expected = '[client_id] int DEFAULT 0 NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'client_id', 'type' => 'integer', 'null' => true);
+		$result = $this->db->buildColumn($column);
+		$expected = '[client_id] int NULL';
+		$this->assertEqual($result, $expected);
+
+		// 'name' => 'type' format for columns
+		$column = array('type' => 'integer', 'name' => 'client_id');
+		$result = $this->db->buildColumn($column);
+		$expected = '[client_id] int NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('type' => 'string', 'name' => 'name');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => '', 'default' => '', 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) DEFAULT \'\' NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => false, 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => false, 'default' => null, 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => true, 'default' => null, 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => true, 'default' => '', 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) DEFAULT \'\'';
+		$this->assertEqual($result, $expected);
+	}
 /**
  * testUpdateAllSyntax method
  *
@@ -353,6 +542,7 @@ class DboMssqlTest extends CakeTestCase {
  * @access public
  */
 	function testGetPrimaryKey() {
+		// When param is a model
 		$result = $this->db->getPrimaryKey($this->model);
 		$this->assertEqual($result, 'id');
 
@@ -361,6 +551,12 @@ class DboMssqlTest extends CakeTestCase {
 		$this->model->setSchema($schema);
 		$result = $this->db->getPrimaryKey($this->model);
 		$this->assertNull($result);
+
+		// When param is a table name
+		$this->db->simulate = false;
+		$this->loadFixtures('Category');
+		$result = $this->db->getPrimaryKey('categories');
+		$this->assertEqual($result, 'id');
 	}
 /**
  * testInsertMulti
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
index a2d86a574..3b19174c4 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -297,5 +297,21 @@ class DboMysqliTest extends CakeTestCase {
 		$expected = 'float';
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testTransactions() {
+		$this->db->begin($this->model);
+		$this->assertTrue($this->db->_transactionStarted);
+
+		$beginSqlCalls = Set::extract('/.[query=START TRANSACTION]', $this->db->_queriesLog);
+		$this->assertEqual(1, count($beginSqlCalls));
+
+		$this->db->commit($this->model);
+		$this->assertFalse($this->db->_transactionStarted);
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
index 6c387da43..aec59ba4c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -290,6 +290,21 @@ class DboPostgresTest extends CakeTestCase {
 		$this->assertEqual($this->db2->value('1', 'boolean'), 'TRUE');
 		$this->assertEqual($this->db2->value(null, 'boolean'), "NULL");
 	}
+/**
+ * test that date columns do not generate errors with null and nullish values.
+ *
+ * @return void
+ **/
+	function testDateAsNull() {
+		$this->assertEqual($this->db2->value(null, 'date'), 'NULL');
+		$this->assertEqual($this->db2->value('', 'date'), 'NULL');
+
+		$this->assertEqual($this->db2->value('', 'datetime'), 'NULL');
+		$this->assertEqual($this->db2->value(null, 'datetime'), 'NULL');
+
+		$this->assertEqual($this->db2->value('', 'timestamp'), 'NULL');
+		$this->assertEqual($this->db2->value(null, 'timestamp'), 'NULL');
+	}
 /**
  * Tests that different Postgres boolean 'flavors' are properly returned as native PHP booleans
  *
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
index cb10ebc46..87c5cfcee 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -1211,6 +1211,8 @@ class DboSourceTest extends CakeTestCase {
 
 		$this->testDb =& new DboTest($this->__config);
 		$this->testDb->cacheSources = false;
+		$this->testDb->startQuote = '`';
+		$this->testDb->endQuote = '`';
 		Configure::write('debug', 1);
 		$this->debug = Configure::read('debug');
 		$this->Model =& new TestModel();
@@ -1235,6 +1237,7 @@ class DboSourceTest extends CakeTestCase {
 	function testFieldDoubleEscaping() {
 		$config = array_merge($this->__config, array('driver' => 'test'));
 		$test =& ConnectionManager::create('quoteTest', $config);
+		$test->simulated = array();
 
 		$this->Model =& new Article2(array('alias' => 'Article', 'ds' => 'quoteTest'));
 		$this->Model->setDataSource('quoteTest');
@@ -2133,7 +2136,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('score' => array(2=>1, 2, 10)));
-		$expected = " WHERE `score` IN (1, 2, 10)";
+		$expected = " WHERE score IN (1, 2, 10)";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions("Aro.rght = Aro.lft + 1.1");
@@ -2385,7 +2388,7 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('score' => array(1, 2, 10)));
-		$expected = " WHERE `score` IN (1, 2, 10)";
+		$expected = " WHERE score IN (1, 2, 10)";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('score' => array()));
@@ -2476,7 +2479,7 @@ class DboSourceTest extends CakeTestCase {
 			'NOT' => array('Course.id' => null, 'Course.vet' => 'N', 'level_of_education_id' => array(912,999)),
 			'Enrollment.yearcompleted >' => '0')
 		);
-		$this->assertPattern('/^\s*WHERE\s+\(NOT\s+\(`Course`\.`id` IS NULL\)\s+AND NOT\s+\(`Course`\.`vet`\s+=\s+\'N\'\)\s+AND NOT\s+\(`level_of_education_id` IN \(912, 999\)\)\)\s+AND\s+`Enrollment`\.`yearcompleted`\s+>\s+\'0\'\s*$/', $result);
+		$this->assertPattern('/^\s*WHERE\s+\(NOT\s+\(`Course`\.`id` IS NULL\)\s+AND NOT\s+\(`Course`\.`vet`\s+=\s+\'N\'\)\s+AND NOT\s+\(level_of_education_id IN \(912, 999\)\)\)\s+AND\s+`Enrollment`\.`yearcompleted`\s+>\s+\'0\'\s*$/', $result);
 
 		$result = $this->testDb->conditions(array('id <>' => '8'));
 		$this->assertPattern('/^\s*WHERE\s+`id`\s+<>\s+\'8\'\s*$/', $result);
@@ -2495,16 +2498,24 @@ class DboSourceTest extends CakeTestCase {
 			"Listing.description LIKE" => "%term_2%"
 		);
 		$result = $this->testDb->conditions($conditions);
-		$expected = " WHERE NOT (`Listing`.`expiration` BETWEEN '1' AND '100') AND ((`Listing`.`title` LIKE '%term%') OR (`Listing`.`description` LIKE '%term%')) AND ((`Listing`.`title` LIKE '%term_2%') OR (`Listing`.`description` LIKE '%term_2%'))";
+		$expected = " WHERE NOT (`Listing`.`expiration` BETWEEN '1' AND '100') AND" .
+		" ((`Listing`.`title` LIKE '%term%') OR (`Listing`.`description` LIKE '%term%')) AND" .
+		" ((`Listing`.`title` LIKE '%term_2%') OR (`Listing`.`description` LIKE '%term_2%'))";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->testDb->conditions(array('MD5(CONCAT(Reg.email,Reg.id))' => 'blah'));
 		$expected = " WHERE MD5(CONCAT(`Reg`.`email`,`Reg`.`id`)) = 'blah'";
 		$this->assertEqual($result, $expected);
 
+		$result = $this->testDb->conditions(array(
+			'MD5(CONCAT(Reg.email,Reg.id))' => array('blah', 'blahblah')
+		));
+		$expected = " WHERE MD5(CONCAT(`Reg`.`email`,`Reg`.`id`)) IN ('blah', 'blahblah')";
+		$this->assertEqual($result, $expected);
+
 		$conditions = array('id' => array(2, 5, 6, 9, 12, 45, 78, 43, 76));
 		$result = $this->testDb->conditions($conditions);
-		$expected = " WHERE `id` IN (2, 5, 6, 9, 12, 45, 78, 43, 76)";
+		$expected = " WHERE id IN (2, 5, 6, 9, 12, 45, 78, 43, 76)";
 		$this->assertEqual($result, $expected);
 
 		$conditions = array('title' => 'user(s)');
@@ -3384,14 +3395,14 @@ class DboSourceTest extends CakeTestCase {
 			'MyIndex' => array('column' => 'id', 'unique' => true)
 		);
 		$result = $this->testDb->buildIndex($data);
-		$expected = array('UNIQUE KEY MyIndex (`id`)');
+		$expected = array('UNIQUE KEY `MyIndex` (`id`)');
 		$this->assertEqual($result, $expected);
 
 		$data = array(
 			'MyIndex' => array('column' => array('id', 'name'), 'unique' => true)
 		);
 		$result = $this->testDb->buildIndex($data);
-		$expected = array('UNIQUE KEY MyIndex (`id`, `name`)');
+		$expected = array('UNIQUE KEY `MyIndex` (`id`, `name`)');
 		$this->assertEqual($result, $expected);
 	}
 /**
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index 7ac8b0dd3..ce87d8f62 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -1,7 +1,7 @@
 loadFixtures('Article');
-		$Article = ClassRegistry::init('Article');
-
-		$assocTypes = array('hasMany', 'hasOne', 'belongsTo', 'hasAndBelongsToMany');
-		foreach ($assocTypes as $type) {
-			 $this->assertEqual($Article->getAssociated($type), array_keys($Article->{$type}));
-		}
-
-		$Article->bindModel(array('hasMany' => array('Category')));
-		$this->assertEqual($Article->getAssociated('hasMany'), array('Comment', 'Category'));
-
-		$results = $Article->getAssociated();
-		$this->assertEqual(sort(array_keys($results)), array('Category', 'Comment', 'Tag'));
-
-		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
-		$this->assertEqual($Article->getAssociated('hasAndBelongsToMany'), array());
-
-		$result = $Article->getAssociated('Category');
-		$expected = array(
-			'className' => 'Category',
-			'foreignKey' => 'article_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'dependent' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => '',
-			'association' => 'hasMany',
-		);
-		$this->assertEqual($result, $expected);
-	}
-
-/**
- * testAutoConstructAssociations method
- *
- * @access public
- * @return void
- */
-	function testAutoConstructAssociations() {
-		$this->loadFixtures('User', 'ArticleFeatured');
-		$TestModel =& new AssociationTest1();
-
-		$result = $TestModel->hasAndBelongsToMany;
-		$expected = array('AssociationTest2' => array(
-				'unique' => false,
-				'joinTable' => 'join_as_join_bs',
-				'foreignKey' => false,
-				'className' => 'AssociationTest2',
-				'with' => 'JoinAsJoinB',
-				'associationForeignKey' => 'join_b_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '',
-				'finderQuery' => '', 'deleteQuery' => '', 'insertQuery' => ''
-		));
-		$this->assertEqual($result, $expected);
-
-		// Tests related to ticket https://trac.cakephp.org/ticket/5594
-		$TestModel =& new ArticleFeatured();
-		$TestFakeModel =& new ArticleFeatured(array('table' => false));
-
-		$expected = array(
-			'User' => array(
-				'className' => 'User', 'foreignKey' => 'user_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
-			),
-			'Category' => array(
-				'className' => 'Category', 'foreignKey' => 'category_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
-			)
-		);
-		$this->assertIdentical($TestModel->belongsTo, $expected);
-		$this->assertIdentical($TestFakeModel->belongsTo, $expected);
-
-		$this->assertEqual($TestModel->User->name, 'User');
-		$this->assertEqual($TestFakeModel->User->name, 'User');
-		$this->assertEqual($TestModel->Category->name, 'Category');
-		$this->assertEqual($TestFakeModel->Category->name, 'Category');
-
-		$expected = array(
-			'Featured' => array(
-				'className' => 'Featured', 'foreignKey' => 'article_featured_id',
-				'conditions' => '', 'fields' => '', 'order' => '', 'dependent' => ''
-			)
-		);
-		$this->assertIdentical($TestModel->hasOne, $expected);
-		$this->assertIdentical($TestFakeModel->hasOne, $expected);
-
-		$this->assertEqual($TestModel->Featured->name, 'Featured');
-		$this->assertEqual($TestFakeModel->Featured->name, 'Featured');
-
-		$expected = array(
-			'Comment' => array(
-				'className' => 'Comment', 'dependent' => true,
-				'foreignKey' => 'article_featured_id', 'conditions' => '', 'fields' => '',
-				'order' => '', 'limit' => '', 'offset' => '', 'exclusive' => '',
-				'finderQuery' => '', 'counterQuery' => ''
-			)
-		);
-		$this->assertIdentical($TestModel->hasMany, $expected);
-		$this->assertIdentical($TestFakeModel->hasMany, $expected);
-
-		$this->assertEqual($TestModel->Comment->name, 'Comment');
-		$this->assertEqual($TestFakeModel->Comment->name, 'Comment');
-
-		$expected = array(
-			'Tag' => array(
-				'className' => 'Tag', 'joinTable' => 'article_featureds_tags',
-				'with' => 'ArticleFeaturedsTag', 'foreignKey' => 'article_featured_id',
-				'associationForeignKey' => 'tag_id', 'conditions' => '', 'fields' => '',
-				'order' => '', 'limit' => '', 'offset' => '', 'unique' => true, 'finderQuery' => '',
-				'deleteQuery' => '', 'insertQuery' => ''
-			)
-		);
-		$this->assertIdentical($TestModel->hasAndBelongsToMany, $expected);
-		$this->assertIdentical($TestFakeModel->hasAndBelongsToMany, $expected);
-
-		$this->assertEqual($TestModel->Tag->name, 'Tag');
-		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
-	}
-/**
- * test Model::__construct
- *
- * ensure that $actsAS and $_findMethods are merged.
- *
- * @return void
- **/
-	function testConstruct() {
-		$this->loadFixtures('Post', 'Comment');
-
-		$TestModel =& ClassRegistry::init('MergeVarPluginPost');
-		$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
-		$this->assertTrue(isset($TestModel->Behaviors->Containable));
-		$this->assertTrue(isset($TestModel->Behaviors->Tree));
-
-		$TestModel =& ClassRegistry::init('MergeVarPluginComment');
-		$expected = array('Containable', 'Containable' => array('some_settings'));
-		$this->assertEqual($TestModel->actsAs, $expected);
-		$this->assertTrue(isset($TestModel->Behaviors->Containable));
-	}
-/**
- * testColumnTypeFetching method
- *
- * @access public
- * @return void
- */
-	function testColumnTypeFetching() {
-		$model =& new Test();
-		$this->assertEqual($model->getColumnType('id'), 'integer');
-		$this->assertEqual($model->getColumnType('notes'), 'text');
-		$this->assertEqual($model->getColumnType('updated'), 'datetime');
-		$this->assertEqual($model->getColumnType('unknown'), null);
-
-		$model =& new Article();
-		$this->assertEqual($model->getColumnType('User.created'), 'datetime');
-		$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
-		$this->assertEqual($model->getColumnType('Article.id'), 'integer');
-	}
-/**
- * testMultipleBelongsToWithSameClass method
- *
- * @access public
- * @return void
- */
-	function testMultipleBelongsToWithSameClass() {
-		$this->loadFixtures(
-			'DeviceType', 'DeviceTypeCategory', 'FeatureSet', 'ExteriorTypeCategory',
-			'Document', 'Device', 'DocumentDirectory'
-		);
-		$DeviceType =& new DeviceType();
-
-		$DeviceType->recursive = 2;
-		$result = $DeviceType->read(null, 1);
-
-		$expected = array(
-			'DeviceType' => array(
-				'id' => 1, 'device_type_category_id' => 1, 'feature_set_id' => 1,
-				'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1,
-				'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0
-			),
-			'Image' => array('id' => 1, 'document_directory_id' => 1, 'name' => 'Document 1',
-				'DocumentDirectory' => array('id' => 1, 'name' => 'DocumentDirectory 1')),
-			'Extra1' => array(
-				'id' => 1, 'document_directory_id' => 1, 'name' => 'Document 1',
-				'DocumentDirectory' => array('id' => 1, 'name' => 'DocumentDirectory 1')
-			),
-			'Extra2' => array(
-				'id' => 1, 'document_directory_id' => 1, 'name' => 'Document 1',
-				'DocumentDirectory' => array('id' => 1, 'name' => 'DocumentDirectory 1')
-			),
-			'DeviceTypeCategory' => array('id' => 1, 'name' => 'DeviceTypeCategory 1'),
-			'FeatureSet' => array('id' => 1, 'name' => 'FeatureSet 1'),
-			'ExteriorTypeCategory' => array(
-				'id' => 1, 'image_id' => 1, 'name' => 'ExteriorTypeCategory 1',
-				'Image' => array('id' => 1, 'device_type_id' => 1, 'name' => 'Device 1', 'typ' => 1)
-			),
-			'Device' => array(
-				array('id' => 1, 'device_type_id' => 1, 'name' => 'Device 1', 'typ' => 1),
-				array('id' => 2, 'device_type_id' => 1, 'name' => 'Device 2', 'typ' => 1),
-				array('id' => 3, 'device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2)
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmRecursiveBelongsTo method
- *
- * @access public
- * @return void
- */
-	function testHabtmRecursiveBelongsTo() {
-		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio', 'Syfile', 'Image');
-		$Portfolio =& new Portfolio();
-
-		$result = $Portfolio->find(array('id' => 2), null, null, 3);
-		$expected = array('Portfolio' => array(
-			'id' => 2, 'seller_id' => 1, 'name' => 'Portfolio 2'),
-			'Item' => array(
-			array(
-				'id' => 2, 'syfile_id' => 2, 'published' => 0, 'name' => 'Item 2',
-				'ItemsPortfolio' => array('id' => 2, 'item_id' => 2, 'portfolio_id' => 2),
-				'Syfile' => array(
-					'id' => 2, 'image_id' => 2, 'name' => 'Syfile 2', 'item_count' => null,
-					'Image' => array('id' => 2, 'name' => 'Image 2'
-				))
-			),
-			array(
-				'id' => 6, 'syfile_id' => 6, 'published' => 0, 'name' => 'Item 6',
-				'ItemsPortfolio' => array('id' => 6, 'item_id' => 6, 'portfolio_id' => 2),
-				'Syfile' => array(
-					'id' => 6, 'image_id' => null, 'name' => 'Syfile 6', 'item_count' => null,
-					'Image' => array()
-				)
-			)
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmUuidWithUuidId method
- *
- * @access public
- * @return void
- */
-	function testHabtmUuidWithUuidId() {
-		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolio');
-		$TestModel =& new Uuidportfolio();
-
-		$data = array('Uuidportfolio' => array('name' => 'Portfolio 3'));
-		$data['Uuiditem']['Uuiditem'] = array('483798c8-c7cc-430e-8cf9-4fcc40cf8569');
-		$TestModel->create($data);
-		$TestModel->save();
-		$id = $TestModel->id;
-		$result = $TestModel->read(null, $id);
-		$this->assertEqual(1, count($result['Uuiditem']));
-		$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
-	}
-/**
- * test HABTM saving when join table has no primary key and only 2 columns.
- *
- * @return void
- **/
-	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
-		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
-		$Fruit =& new Fruit();
-		$data = array(
-			'Fruit' => array(
-				'color' => 'Red',
-				'shape' => 'Heart-shaped',
-				'taste' => 'sweet',
-				'name' => 'Strawberry',
-			),
-			'UuidTag' => array(
-				'UuidTag' => array(
-					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
-				)
-			)
-		);
-		$this->assertTrue($Fruit->save($data));
-	}
-/**
- * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
- *
- * @return void
- **/
-	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
-		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
-		$Fruit =& new FruitNoWith();
-		$data = array(
-			'Fruit' => array(
-				'color' => 'Red',
-				'shape' => 'Heart-shaped',
-				'taste' => 'sweet',
-				'name' => 'Strawberry',
-			),
-			'UuidTag' => array(
-				'UuidTag' => array(
-					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
-				)
-			)
-		);
-		$this->assertTrue($Fruit->save($data));
-	}
-/**
- * testHabtmUuidWithNumericId method
- *
- * @access public
- * @return void
- */
-	function testHabtmUuidWithNumericId() {
-		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolioNumericid');
-		$TestModel =& new Uuiditem();
-
-		$data = array('Uuiditem' => array('name' => 'Item 7', 'published' => 0));
-		$data['Uuidportfolio']['Uuidportfolio'] = array('480af662-eb8c-47d3-886b-230540cf8569');
-		$TestModel->create($data);
-		$TestModel->save();
-		$id = $TestModel->id;
-		$result = $TestModel->read(null, $id);
-		$this->assertEqual(1, count($result['Uuidportfolio']));
-	}
-/**
- * testHabtmFinderQuery method
- *
- * @access public
- * @return void
- */
-	function testHabtmFinderQuery() {
-		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
-		$Article =& new Article();
-
-		$sql = $this->db->buildStatement(
-			array(
-				'fields' => $this->db->fields($Article->Tag, null, array(
-					'Tag.id', 'Tag.tag', 'ArticlesTag.article_id', 'ArticlesTag.tag_id'
-				)),
-				'table' => $this->db->fullTableName('tags'),
-				'alias' => 'Tag',
-				'limit' => null,
-				'offset' => null,
-				'group' => null,
-				'joins' => array(array(
-					'alias' => 'ArticlesTag',
-					'table' => $this->db->fullTableName('articles_tags'),
-					'conditions' => array(
-						array("ArticlesTag.article_id" => '{$__cakeID__$}'),
-						array("ArticlesTag.tag_id" => $this->db->identifier('Tag.id'))
-					)
-				)),
-				'conditions' => array(),
-				'order' => null
-			),
-			$Article
-		);
-
-		$Article->hasAndBelongsToMany['Tag']['finderQuery'] = $sql;
-		$result = $Article->find('first');
-		$expected = array(array('id' => '1', 'tag' => 'tag1'), array('id' => '2', 'tag' => 'tag2'));
-		$this->assertEqual($result['Tag'], $expected);
-	}
-/**
- * testHabtmLimitOptimization method
- *
- * @access public
- * @return void
- */
-	function testHabtmLimitOptimization() {
-		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
-		$TestModel =& new Article();
-
-		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 2;
-		$result = $TestModel->read(null, 2);
-		$expected = array(
-			'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-			'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-			'Comment' => array(
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
-			),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 1;
-		$result = $TestModel->read(null, 2);
-		unset($expected['Tag'][1]);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmUniqueKey method
- *
- * @access public
- * @return void
- */
-	function testHabtmUniqueKey() {
-		$model =& new Item();
-		$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
-	}
-/**
- * testHasManyLimitOptimization method
- *
- * @access public
- * @return void
- */
-	function testHasManyLimitOptimization() {
-		$this->loadFixtures('Project', 'Thread', 'Message', 'Bid');
-		$Project =& new Project();
-		$Project->recursive = 3;
-
-		$result = $Project->find('all');
-		$expected = array(
-			array('Project' => array('id' => 1, 'name' => 'Project 1'),
-					'Thread' => array(
-						array(
-							'id' => 1, 'project_id' => 1, 'name' => 'Project 1, Thread 1',
-								'Project' => array(
-									'id' => 1, 'name' => 'Project 1',
-									'Thread' => array(
-										array('id' => 1, 'project_id' => 1, 'name' => 'Project 1, Thread 1'),
-										array('id' => 2, 'project_id' => 1, 'name' => 'Project 1, Thread 2')
-									)
-								),
-								'Message' => array(
-									array(
-										'id' => 1, 'thread_id' => 1, 'name' => 'Thread 1, Message 1',
-										'Bid' => array('id' => 1, 'message_id' => 1, 'name' => 'Bid 1.1')
-									)
-								)
-						),
-						array(
-							'id' => 2, 'project_id' => 1, 'name' => 'Project 1, Thread 2',
-							'Project' => array(
-								'id' => 1, 'name' => 'Project 1',
-								'Thread' => array(
-									array('id' => 1, 'project_id' => 1, 'name' => 'Project 1, Thread 1'),
-									array('id' => 2, 'project_id' => 1, 'name' => 'Project 1, Thread 2')
-								)
-							),
-							'Message' => array(
-								array(
-									'id' => 2, 'thread_id' => 2, 'name' => 'Thread 2, Message 1',
-									'Bid' => array('id' => 4, 'message_id' => 2, 'name' => 'Bid 2.1')
-								)
-							)
-						)
-				)
-			),
-			array('Project' => array('id' => 2, 'name' => 'Project 2'),
-					'Thread' => array(
-						array(
-							'id' => 3, 'project_id' => 2, 'name' => 'Project 2, Thread 1',
-							'Project' => array(
-								'id' => 2, 'name' => 'Project 2',
-								'Thread' => array(
-									array('id' => 3, 'project_id' => 2, 'name' => 'Project 2, Thread 1'),
-								)
-							),
-							'Message' => array(
-								array(
-									'id' => 3, 'thread_id' => 3, 'name' => 'Thread 3, Message 1',
-									'Bid' => array('id' => 3, 'message_id' => 3, 'name' => 'Bid 3.1')
-								)
-							)
-						)
-					)
-			),
-			array('Project' => array('id' => 3, 'name' => 'Project 3'),
-					'Thread' => array()
-				)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testWithAssociation method
- *
- * @access public
- * @return void
- */
-	function testWithAssociation() {
-		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
-		$TestModel =& new Something();
-		$result = $TestModel->SomethingElse->find('all');
-
-		$expected = array(
-			array('SomethingElse' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'Something' => array(array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
-					'JoinThing' => array('id' => '3', 'something_id' => '3', 'something_else_id' => '1', 'doomed' => '1', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')))),
-			array('SomethingElse' => array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'Something' => array(array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-					'JoinThing' => array('id' => '1', 'something_id' => '1', 'something_else_id' => '2', 'doomed' => '1', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')))),
-			array('SomethingElse' => array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'Something' => array (array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-					'JoinThing' => array('id' => '2', 'something_id' => '2', 'something_else_id' => '3', 'doomed' => '0', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array('Something' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'SomethingElse' => array(
-					array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-						'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2')))),
-				array('Something' => array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-					'SomethingElse' => array(
-						array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
-						'JoinThing' => array('doomed' => '0', 'something_id' => '2', 'something_else_id' => '3')))),
-				array('Something' => array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-					'SomethingElse' => array(
-						array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-						'JoinThing' => array('doomed' => '1', 'something_id' => '3', 'something_else_id' => '1')))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->findById(1);
-		$expected = array(
-			'Something' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'SomethingElse' => array(array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-					'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2'))));
-		$this->assertEqual($result, $expected);
-
-		$expected = $TestModel->findById(1);
-		$TestModel->set($expected);
-		$TestModel->save();
-		$result = $TestModel->findById(1);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false;
-		$TestModel->create(array(
-			'Something' => array('id' => 1),
-			'SomethingElse' => array(3, array('something_else_id' => 1, 'doomed' => '1'))
-		));
-		$ts = date('Y-m-d H:i:s');
-		$TestModel->save();
-
-		$TestModel->hasAndBelongsToMany['SomethingElse']['order'] = 'SomethingElse.id ASC';
-		$result = $TestModel->findById(1);
-		$expected = array(
-			'Something' => array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => $ts),
-				'SomethingElse' => array(
-					array('id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-						'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '1')),
-					array('id' => '2', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-						'JoinThing' => array('doomed' => '1', 'something_id' => '1', 'something_else_id' => '2')),
-					array('id' => '3', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
-						'JoinThing' => array('doomed' => '0', 'something_id' => '1', 'something_else_id' => '3'))));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testDynamicAssociations method
- *
- * @access public
- * @return void
- */
-	function testDynamicAssociations() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = $TestModel->hasOne = array();
-		$TestModel->hasMany['Comment'] = array_merge($TestModel->hasMany['Comment'], array(
-			'foreignKey' => false,
-			'conditions' => array('Comment.user_id =' => '2')
-		));
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'Comment' => array(
-					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-					array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
-				)
-			),
-			array(
-				'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'Comment' => array(
-					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-					array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
-				)
-			),
-			array(
-				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'Comment' => array(
-					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-					array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveMultipleHabtm method
- *
- * @access public
- * @return void
- */
-	function testSaveMultipleHabtm() {
-		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
-		$TestModel = new JoinA();
-		$result = $TestModel->findById(1);
-
-		$expected = array(
-			'JoinA' => array('id' => 1, 'name' => 'Join A 1', 'body' => 'Join A 1 Body', 'created' => '2008-01-03 10:54:23', 'updated' => '2008-01-03 10:54:23'),
-				'JoinB' => array(
-					0 => array('id' => 2, 'name' => 'Join B 2', 'created' => '2008-01-03 10:55:02', 'updated' => '2008-01-03 10:55:02',
-						'JoinAsJoinB' => array('id' => 1, 'join_a_id' => 1, 'join_b_id' => 2, 'other' => 'Data for Join A 1 Join B 2', 'created' => '2008-01-03 10:56:33', 'updated' => '2008-01-03 10:56:33'))),
-				'JoinC' => array(
-					0 => array('id' => 2, 'name' => 'Join C 2', 'created' => '2008-01-03 10:56:12', 'updated' => '2008-01-03 10:56:12',
-						'JoinAsJoinC' => array('id' => 1, 'join_a_id' => 1, 'join_c_id' => 2, 'other' => 'Data for Join A 1 Join C 2', 'created' => '2008-01-03 10:57:22', 'updated' => '2008-01-03 10:57:22'))));
-
-		$this->assertEqual($result, $expected);
-
-		$ts = date('Y-m-d H:i:s');
-		$TestModel->id = 1;
-		$data = array(
-			'JoinA' => array('id' => '1', 'name' => 'New name for Join A 1', 'updated' => $ts),
-			'JoinB' => array(array('id' => 1, 'join_b_id' => 2, 'other' => 'New data for Join A 1 Join B 2', 'created' => $ts, 'updated' => $ts)),
-			'JoinC' => array(array('id' => 1, 'join_c_id' => 2, 'other' => 'New data for Join A 1 Join C 2', 'created' => $ts, 'updated' => $ts)));
-		$TestModel->set($data);
-		$TestModel->save();
-
-		$result = $TestModel->findById(1);
-		$expected = array(
-			'JoinA' => array('id' => 1, 'name' => 'New name for Join A 1', 'body' => 'Join A 1 Body', 'created' => '2008-01-03 10:54:23', 'updated' => $ts),
-				'JoinB' => array(
-					0 => array('id' => 2, 'name' => 'Join B 2', 'created' => '2008-01-03 10:55:02', 'updated' => '2008-01-03 10:55:02',
-						'JoinAsJoinB' => array('id' => 1, 'join_a_id' => 1, 'join_b_id' => 2, 'other' => 'New data for Join A 1 Join B 2', 'created' => $ts, 'updated' => $ts))),
-				'JoinC' => array(
-					0 => array('id' => 2, 'name' => 'Join C 2', 'created' => '2008-01-03 10:56:12', 'updated' => '2008-01-03 10:56:12',
-						'JoinAsJoinC' => array('id' => 1, 'join_a_id' => 1, 'join_c_id' => 2, 'other' => 'New data for Join A 1 Join C 2', 'created' => $ts, 'updated' => $ts))));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllRecursiveSelfJoin method
- *
- * @access public
- * @return void
- */
-	function testFindAllRecursiveSelfJoin() {
-		$this->loadFixtures('Home', 'AnotherArticle', 'Advertisement');
-		$TestModel =& new Home();
-		$TestModel->recursive = 2;
-
-		$result = $TestModel->find('all');
-		$expected = array(array('Home' => array(
-						'id' => '1', 'another_article_id' => '1', 'advertisement_id' => '1', 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-								'AnotherArticle' => array('id' => '1', 'title' => 'First Article', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-										'Home' => array(array('id' => '1', 'another_article_id' => '1', 'advertisement_id' => '1', 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'))),
-								'Advertisement' => array('id' => '1', 'title' => 'First Ad', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-									'Home' => array(array('id' => '1', 'another_article_id' => '1', 'advertisement_id' => '1', 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-										array('id' => '2', 'another_article_id' => '3', 'advertisement_id' => '1', 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')))),
-				array('Home' => array(
-						'id' => '2', 'another_article_id' => '3', 'advertisement_id' => '1', 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-								'AnotherArticle' => array('id' => '3', 'title' => 'Third Article', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
-										'Home' => array(array('id' => '2', 'another_article_id' => '3', 'advertisement_id' => '1', 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'))),
-								'Advertisement' => array('id' => '1', 'title' => 'First Ad', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
-									'Home' => array(array('id' => '1', 'another_article_id' => '1', 'advertisement_id' => '1', 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-											array('id' => '2', 'another_article_id' => '3', 'advertisement_id' => '1', 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')))));
-		$this->assertEqual($result, $expected);
-
-
-
-	}
-/**
- * testFindAllRecursiveWithHabtm method
- *
- * @return void
- * @access public
- */
-	function testFindAllRecursiveWithHabtm() {
-		$this->loadFixtures(
-			'MyCategoriesMyUsers', 'MyCategoriesMyProducts', 'MyCategory', 'MyUser', 'MyProduct'
-		);
-		$MyUser =& new MyUser();
-		$MyUser->recursive = 2;
-
-		$result = $MyUser->find('all');
-		$expected = array(
-			array(
-				'MyUser' => array('id' => '1', 'firstname' => 'userA'),
-				'MyCategory' => array(
-					array(
-						'id' => '1',
-						'name' => 'A',
-						'MyProduct' => array(
-							array('id' => '1', 'name' => 'book')
-						)
-					),
-					array(
-						'id' => '3',
-						'name' => 'C',
-						'MyProduct' => array(array('id' => '2', 'name' => 'computer'))
-					)
-				)
-			),
-			array(
-				'MyUser' => array('id' => '2', 'firstname' => 'userB'),
-				'MyCategory' => array(
-					array(
-						'id' => '1',
-						'name' => 'A',
-						'MyProduct' => array(array('id' => '1', 'name' => 'book'))
-					),
-					array(
-						'id' => '2',
-						'name' => 'B',
-						'MyProduct' => array(
-							array('id' => '1', 'name' => 'book'),
-							array('id' => '2', 'name' => 'computer')
-						)
-					)
-				)
-			)
-		);
-		$this->assertIdentical($result, $expected);
-	}
-/**
- * testFindSelfAssociations method
- *
- * @access public
- * @return void
- */
-	function testFindSelfAssociations() {
-		$this->loadFixtures('Person');
-
-		$TestModel =& new Person();
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 1);
-		$expected = array(
-				'Person' => array('id' => 1, 'name' => 'person', 'mother_id' => 2, 'father_id' => 3),
-				'Mother' => array('id' => 2, 'name' => 'mother', 'mother_id' => 4, 'father_id' => 5,
-					'Mother' => array('id' => 4, 'name' => 'mother - grand mother', 'mother_id' => 0, 'father_id' => 0),
-					'Father' => array('id' => 5, 'name' => 'mother - grand father', 'mother_id' => 0, 'father_id' => 0)),
-				'Father' => array('id' => 3, 'name' => 'father', 'mother_id' => 6, 'father_id' => 7,
-					'Father' => array('id' => 7, 'name' => 'father - grand father', 'mother_id' => 0, 'father_id' => 0),
-					'Mother' => array('id' => 6, 'name' => 'father - grand mother', 'mother_id' => 0, 'father_id' => 0)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 3;
-		$result = $TestModel->read(null, 1);
-		$expected = array(
-				'Person' => array('id' => 1, 'name' => 'person', 'mother_id' => 2, 'father_id' => 3),
-				'Mother' => array('id' => 2, 'name' => 'mother', 'mother_id' => 4, 'father_id' => 5,
-					'Mother' => array('id' => 4, 'name' => 'mother - grand mother', 'mother_id' => 0, 'father_id' => 0,
-						'Mother' => array(),
-						'Father' => array()),
-					'Father' => array('id' => 5, 'name' => 'mother - grand father', 'mother_id' => 0, 'father_id' => 0,
-						'Father' => array(),
-						'Mother' => array())),
-				'Father' => array('id' => 3, 'name' => 'father', 'mother_id' => 6, 'father_id' => 7,
-					'Father' => array('id' => 7, 'name' => 'father - grand father', 'mother_id' => 0, 'father_id' => 0,
-						'Father' => array(),
-						'Mother' => array()),
-					'Mother' => array('id' => 6, 'name' => 'father - grand mother', 'mother_id' => 0, 'father_id' => 0,
-						'Mother' => array(),
-						'Father' => array())));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testPluginAssociations method
- *
- * @access public
- * @return void
- */
-	function testPluginAssociations() {
-		$this->loadFixtures('TestPluginArticle', 'User', 'TestPluginComment');
-		$TestModel =& new TestPluginArticle();
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'TestPluginArticle' => array('id' => 1, 'user_id' => 1, 'title' => 'First Plugin Article', 'body' => 'First Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:39:23', 'updated' => '2008-09-24 10:41:31'),
-				'User' => array('id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'TestPluginComment' => array(
-					array('id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:45:23', 'updated' => '2008-09-24 10:47:31'),
-					array('id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:47:23', 'updated' => '2008-09-24 10:49:31'),
-					array('id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:49:23', 'updated' => '2008-09-24 10:51:31'),
-					array('id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Plugin Article', 'published' => 'N', 'created' => '2008-09-24 10:51:23', 'updated' => '2008-09-24 10:53:31')
-				)
-			),
-			array(
-				'TestPluginArticle' => array('id' => 2, 'user_id' => 3, 'title' => 'Second Plugin Article', 'body' => 'Second Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:41:23', 'updated' => '2008-09-24 10:43:31'),
-				'User' => array('id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-				'TestPluginComment' => array(
-					array('id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:53:23', 'updated' => '2008-09-24 10:55:31'),
-					array('id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:55:23', 'updated' => '2008-09-24 10:57:31')
-				)
-			),
-			array(
-				'TestPluginArticle' => array('id' => 3,'user_id' => 1, 'title' => 'Third Plugin Article', 'body' => 'Third Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:43:23', 'updated' => '2008-09-24 10:45:31'),
-				'User' => array('id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'TestPluginComment' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testIdentity method
- *
- * @access public
- * @return void
- */
-	function testIdentity() {
-		$TestModel =& new Test();
-		$result = $TestModel->alias;
-		$expected = 'Test';
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new TestAlias();
-		$result = $TestModel->alias;
-		$expected = 'TestAlias';
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Test(array('alias' => 'AnotherTest'));
-		$result = $TestModel->alias;
-		$expected = 'AnotherTest';
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testCreation method
- *
- * @access public
- * @return void
- */
-	function testCreation() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Test();
-		$result = $TestModel->create();
-		$expected = array('Test' => array('notes' => 'write some notes here'));
-		$this->assertEqual($result, $expected);
-		$TestModel =& new User();
-		$result = $TestModel->schema();
-
-		if (isset($this->db->columns['primary_key']['length'])) {
-			$intLength = $this->db->columns['primary_key']['length'];
-		} elseif (isset($this->db->columns['integer']['length'])) {
-			$intLength = $this->db->columns['integer']['length'];
-		} else {
-			$intLength = 11;
-		}
-		foreach (array('collate', 'charset') as $type) {
-			unset($result['user'][$type]);
-			unset($result['password'][$type]);
-		}
-
-		$expected = array(
-				'id' => array('type' => 'integer',	'null' => false, 'default' => null,	'length' => $intLength, 'key' => 'primary'),
-				'user' => array('type' => 'string',		'null' => false, 'default' => '',	'length' => 255),
-				'password' => array('type' => 'string',		'null' => false, 'default' => '',	'length' => 255),
-				'created' => array('type' => 'datetime',	'null' => true, 'default' => null,	'length' => null),
-				'updated'=> array('type' => 'datetime',	'null' => true, 'default' => null,	'length' => null));
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Article();
-		$result = $TestModel->create();
-		$expected = array('Article' => array('published' => 'N'));
-		$this->assertEqual($result, $expected);
-
-		$FeaturedModel =& new Featured();
-		$data = array(
-			'article_featured_id' => 1, 'category_id' => 1,
-			'published_date' => array('year' => 2008, 'month' => 06, 'day' => 11),
-			'end_date' => array('year' => 2008, 'month' => 06, 'day' => 20)
-		);
-		$expected = array('Featured' => array(
-			'article_featured_id' => 1, 'category_id' => 1,
-			'published_date' => '2008-6-11 00:00:00', 'end_date' => '2008-6-20 00:00:00'
-		));
-		$this->assertEqual($FeaturedModel->create($data), $expected);
-
-		$data = array(
-			'published_date' => array('year' => 2008, 'month' => 06, 'day' => 11),
-			'end_date' => array('year' => 2008, 'month' => 06, 'day' => 20),
-			'article_featured_id' => 1, 'category_id' => 1
-		);
-		$expected = array('Featured' => array(
-			'published_date' => '2008-6-11 00:00:00', 'end_date' => '2008-6-20 00:00:00',
-			'article_featured_id' => 1, 'category_id' => 1
-		));
-		$this->assertEqual($FeaturedModel->create($data), $expected);
-	}
-/**
- * ensure that __exists is reset on create
- *
- * @return void
- **/
-	function testResetOfExistsOnCreate() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-		$Article->id = 1;
-		$Article->saveField('title', 'Reset me');
-		$Article->delete();
-		$Article->id = 1;
-		$this->assertFalse($Article->exists());
-
-		$Article->create();
-		$this->assertFalse($Article->exists());
-		$Article->id = 2;
-		$Article->saveField('title', 'Staying alive');
-		$result = $Article->read(null, 2);
-		$this->assertEqual($result['Article']['title'], 'Staying alive');
-	}
-/**
- * testCreationOfEmptyRecord method
- *
- * @access public
- * @return void
- */
-	function testCreationOfEmptyRecord() {
-		$this->loadFixtures('Author');
-		$TestModel =& new Author();
-		$this->assertEqual($TestModel->find('count'), 4);
-
-		$TestModel->deleteAll(true, false, false);
-		$this->assertEqual($TestModel->find('count'), 0);
-
-		$result = $TestModel->save();
-		$this->assertTrue(isset($result['Author']['created']));
-		$this->assertTrue(isset($result['Author']['updated']));
-		$this->assertEqual($TestModel->find('count'), 1);
-	}
-/**
- * testCreateWithPKFiltering method
- *
- * @access public
- * @return void
- */
-	function testCreateWithPKFiltering() {
-		$TestModel =& new Article();
-		$data = array('id' => 5, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text');
-
-		$result = $TestModel->create($data);
-		$expected = array('Article' => array('published' => 'N', 'id' => 5, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text'));
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->id, 5);
-
-		$result = $TestModel->create($data, true);
-		$expected = array('Article' => array('published' => 'N', 'id' => false, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text'));
-		$this->assertEqual($result, $expected);
-		$this->assertFalse($TestModel->id);
-
-		$result = $TestModel->create(array('Article' => $data), true);
-		$expected = array('Article' => array('published' => 'N', 'id' => false, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text'));
-		$this->assertEqual($result, $expected);
-		$this->assertFalse($TestModel->id);
-
-		$data = array('id' => 6, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text', 'created' => '1970-01-01 00:00:00', 'updated' => '1970-01-01 12:00:00', 'modified' => '1970-01-01 12:00:00');
-
-		$result = $TestModel->create($data);
-		$expected = array('Article' => array('published' => 'N', 'id' => 6, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text', 'created' => '1970-01-01 00:00:00', 'updated' => '1970-01-01 12:00:00', 'modified' => '1970-01-01 12:00:00'));
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->id, 6);
-
-		$result = $TestModel->create(array('Article' => array_diff_key($data, array('created' => true, 'updated' => true, 'modified' => true))), true);
-		$expected = array('Article' => array('published' => 'N', 'id' => false, 'user_id' => 2, 'title' => 'My article', 'body' => 'Some text'));
-		$this->assertEqual($result, $expected);
-		$this->assertFalse($TestModel->id);
-	}
-/**
- * testCreationWithMultipleData method
- *
- * @access public
- * @return void
- */
-	function testCreationWithMultipleData() {
-		$this->loadFixtures('Article', 'Comment');
-		$Article =& new Article();
-		$Comment =& new Comment();
-
-		$articles = $Article->find('all', array('fields' => array('id','title'), 'recursive' => -1));
-		$comments = $Comment->find('all', array('fields' => array('id','article_id','user_id','comment','published'), 'recursive' => -1));
-		$this->assertEqual($articles, array(
-			array('Article' => array('id' => 1, 'title' => 'First Article')),
-			array('Article' => array('id' => 2, 'title' => 'Second Article')),
-			array('Article' => array('id' => 3, 'title' => 'Third Article'))));
-		$this->assertEqual($comments, array(
-			array('Comment' => array('id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'published' => 'N')),
-			array('Comment' => array('id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y'))));
-
-		$data = array('Comment' => array('article_id' => 2, 'user_id' => 4, 'comment' => 'Brand New Comment', 'published' => 'N'),
-				'Article' => array('id' => 2, 'title' => 'Second Article Modified'));
-		$result = $Comment->create($data);
-		$this->assertTrue($result);
-		$result = $Comment->save();
-		$this->assertTrue($result);
-
-		$articles = $Article->find('all', array('fields' => array('id','title'), 'recursive' => -1));
-		$comments = $Comment->find('all', array('fields' => array('id','article_id','user_id','comment','published'), 'recursive' => -1));
-		$this->assertEqual($articles, array(
-			array('Article' => array('id' => 1, 'title' => 'First Article')),
-			array('Article' => array('id' => 2, 'title' => 'Second Article')),
-			array('Article' => array('id' => 3, 'title' => 'Third Article'))));
-		$this->assertEqual($comments, array(
-			array('Comment' => array('id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'published' => 'N')),
-			array('Comment' => array('id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y')),
-			array('Comment' => array('id' => 7, 'article_id' => 2, 'user_id' => 4, 'comment' => 'Brand New Comment', 'published' => 'N'))));
-	}
-/**
- * testCreationWithMultipleDataSameModel method
- *
- * @access public
- * @return void
- */
-	function testCreationWithMultipleDataSameModel() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-		$SecondaryArticle =& new Article();
-
-		$result = $Article->field('title', array('id' => 1));
-		$this->assertEqual($result, 'First Article');
-
-		$data = array('Article' => array('user_id' => 2, 'title' => 'Brand New Article', 'body' => 'Brand New Article Body', 'published' => 'Y'),
-			'SecondaryArticle' => array('id' => 1));
-		$Article->create();
-		$result = $Article->save($data);
-		$this->assertTrue($result);
-
-		$result = $Article->getInsertID();
-		$this->assertTrue(!empty($result));
-
-		$result = $Article->field('title', array('id' => 1));
-		$this->assertEqual($result, 'First Article');
-
-		$articles = $Article->find('all', array('fields' => array('id','title'), 'recursive' => -1));
-		$this->assertEqual($articles, array(
-			array('Article' => array('id' => 1, 'title' => 'First Article')),
-			array('Article' => array('id' => 2, 'title' => 'Second Article')),
-			array('Article' => array('id' => 3, 'title' => 'Third Article')),
-			array('Article' => array('id' => 4, 'title' => 'Brand New Article'))));
-	}
-/**
- * testCreationWithMultipleDataSameModelManualInstances method
- *
- * @access public
- * @return void
- */
-	function testCreationWithMultipleDataSameModelManualInstances() {
-		$this->loadFixtures('PrimaryModel');
-		$Primary =& new PrimaryModel();
-		$Secondary =& new PrimaryModel();
-
-		$result = $Primary->field('primary_name', array('id' => 1));
-		$this->assertEqual($result, 'Primary Name Existing');
-
-		$data = array('PrimaryModel' => array('primary_name' => 'Primary Name New'),
-			'SecondaryModel' => array('id' => array(1)));
-		$Primary->create();
-		$result = $Primary->save($data);
-		$this->assertTrue($result);
-
-		$result = $Primary->field('primary_name', array('id' => 1));
-		$this->assertEqual($result, 'Primary Name Existing');
-
-		$result = $Primary->getInsertID();
-		$this->assertTrue(!empty($result));
-
-		$result = $Primary->field('primary_name', array('id' => $result));
-		$this->assertEqual($result, 'Primary Name New');
-
-		$result = $Primary->find('count');
-		$this->assertEqual($result, 2);
-	}
-/**
- * testReadFakeThread method
- *
- * @access public
- * @return void
- */
-	function testReadFakeThread() {
-		$this->loadFixtures('CategoryThread');
-		$TestModel =& new CategoryThread();
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->recursive = 6;
-		$TestModel->id = 7;
-		$result = $TestModel->read();
-		$expected = array(
-			'CategoryThread' => array('id' => 7, 'parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-				'ParentCategory' => array('id' => 6, 'parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 5, 'parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31')))))
-			)
-		);
-		$this->db->fullDebug = $fullDebug;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindFakeThread method
- *
- * @access public
- * @return void
- */
-	function testFindFakeThread() {
-		$this->loadFixtures('CategoryThread');
-		$TestModel =& new CategoryThread();
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->recursive = 6;
-		$result = $TestModel->find(array('CategoryThread.id' => 7));
-
-		$expected = array(
-			'CategoryThread' => array('id' => 7, 'parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-				'ParentCategory' => array('id' => 6, 'parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 5, 'parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-				'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31')))))
-			)
-		);
-		$this->db->fullDebug = $fullDebug;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllFakeThread method
- *
- * @access public
- * @return void
- */
-	function testFindAllFakeThread() {
-		$this->loadFixtures('CategoryThread');
-		$TestModel =& new CategoryThread();
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->recursive = 6;
-		$result = $TestModel->find('all', null, null, 'CategoryThread.id ASC');
-		$expected = array(
-			array('CategoryThread' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => null, 'parent_id' => null, 'name' => null, 'created' => null, 'updated' => null, 'ParentCategory' => array())),
-			array('CategoryThread' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array())),
-			array('CategoryThread' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array()))),
-			array('CategoryThread' => array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array())))),
-			array('CategoryThread' => array('id' => 5, 'parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array()))))),
-			array('CategoryThread' => array('id' => 6, 'parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => 5, 'parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-						'ParentCategory' => array())))))),
-			array('CategoryThread' => array('id' => 7, 'parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
-					'ParentCategory' => array('id' => 6, 'parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 5, 'parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 4, 'parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 3, 'parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 2, 'parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31',
-					'ParentCategory' => array('id' => 1, 'parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'))))))));
-		$this->db->fullDebug = $fullDebug;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testConditionalNumerics method
- *
- * @access public
- * @return void
- */
-	function testConditionalNumerics() {
-		$this->loadFixtures('NumericArticle');
-		$NumericArticle =& new NumericArticle();
-		$data = array('title' => '12345abcde');
-		$result = $NumericArticle->find($data);
-		$this->assertTrue(!empty($result));
-
-		// @TODO: make this pass in Cake 2.0 with passing the column around in db->value()
-		// SELECT * from articles WHERE title = 12345 // will find the article with title = 12345abcde, too : /
-		// $data = array('title' => '12345');
-		// $result = $NumericArticle->find($data);
-		// $this->assertTrue(empty($result));
-	}
-/**
- * test find('all') method
- *
- * @access public
- * @return void
- */
-	function testFindAll() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-		$TestModel->cacheQueries = false;
-
-		$result = $TestModel->find('all');
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-				array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31')),
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => 'User.id > 2'));
-		$expected = array(
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('User.id !=' => '0', 'User.user LIKE' => '%arr%')));
-		$expected = array(
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('User.id' => '0')));
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('or' => array('User.id' => '0', 'User.user LIKE' => '%a%'))));
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-				array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31')),
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-				array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano')),
-				array('User' => array('id' => '2', 'user' => 'nate')),
-				array('User' => array('id' => '3', 'user' => 'larry')),
-				array('User' => array('id' => '4', 'user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user ASC'));
-		$expected = array(
-				array('User' => array('user' => 'garrett')),
-				array('User' => array('user' => 'larry')),
-				array('User' => array('user' => 'mariano')),
-				array('User' => array('user' => 'nate')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user DESC'));
-		$expected = array(
-				array('User' => array('user' => 'nate')),
-				array('User' => array('user' => 'mariano')),
-				array('User' => array('user' => 'larry')),
-				array('User' => array('user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('limit' => 3, 'page' => 1));
-
-		$expected = array(
-				array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-				array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31')),
-				array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')));
-		$this->assertEqual($result, $expected);
-
-		$ids = array(4 => 1, 5 => 3);
-		$result = $TestModel->find('all', array('conditions' => array('User.id' => $ids)));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')),
-			array('User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31')),
-		);
-		$this->assertEqual($result, $expected);
-
-		// These tests are expected to fail on SQL Server since the LIMIT/OFFSET
-		// hack can't handle small record counts.
-		if ($this->db->config['driver'] != 'mssql') {
-			$result = $TestModel->find('all', array('limit' => 3, 'page' => 2));
-			$expected = array(
-					array('User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31')));
-			$this->assertEqual($result, $expected);
-
-			$result = $TestModel->find('all', array('limit' => 3, 'page' => 3));
-			$expected = array();
-			$this->assertEqual($result, $expected);
-		}
-	}
-/**
- * test find('list') method
- *
- * @access public
- * @return void
- */
-	function testGenerateFindList() {
-		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User');
-
-		$TestModel =& new Article();
-		$TestModel->displayField = 'title';
-
-		$result = $TestModel->find('list', array('order' => 'Article.title ASC'));
-		$expected = array(1 => 'First Article', 2 => 'Second Article', 3 => 'Third Article');
-		$this->assertEqual($result, $expected);
-
-		$db =& ConnectionManager::getDataSource('test_suite');
-		if ($db->config['driver'] == 'mysql') {
-			$result = $TestModel->find('list', array('order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC')));
-			$expected = array(1 => 'First Article', 3 => 'Third Article', 2 => 'Second Article');
-			$this->assertEqual($result, $expected);
-		}
-
-		$result = Set::combine($TestModel->find('all', array('order' => 'Article.title ASC', 'fields' => array('id', 'title'))), '{n}.Article.id', '{n}.Article.title');
-		$expected = array(1 => 'First Article', 2 => 'Second Article', 3 => 'Third Article');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::combine($TestModel->find('all', array('order' => 'Article.title ASC')), '{n}.Article.id', '{n}.Article');
-		$expected = array(
-				1 => array('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				2 => array('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				3 => array('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'));
-		$this->assertEqual($result, $expected);
-
-		$result = Set::combine($TestModel->find('all', array('order' => 'Article.title ASC')), '{n}.Article.id', '{n}.Article', '{n}.Article.user_id');
-		$expected = array(1 => array(
-						1 => array('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-						3 => array('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
-				3 => array(2 => array('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')));
-		$this->assertEqual($result, $expected);
-
-		$result = Set::combine($TestModel->find('all', array('order' => 'Article.title ASC', 'fields' => array('id', 'title', 'user_id'))), '{n}.Article.id', '{n}.Article.title', '{n}.Article.user_id');
-		$expected = array(1 => array(1 => 'First Article', 3 => 'Third Article'), 3 => array(2 => 'Second Article'));
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Apple();
-		$expected = array(1 => 'Red Apple 1', 2 => 'Bright Red Apple', 3 => 'green blue', 4 => 'Test Name', 5 => 'Blue Green', 6 => 'My new apple', 7 => 'Some odd color');
-
-		$this->assertEqual($TestModel->find('list'), $expected);
-		$this->assertEqual($TestModel->Parent->find('list'), $expected);
-
-		$TestModel =& new Post();
-		$result = $TestModel->find('list', array('fields' => 'Post.title'));
-		$expected = array(1 => 'First Post', 2 => 'Second Post', 3 => 'Third Post');
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array('fields' => 'title'));
-		$expected = array(1 => 'First Post', 2 => 'Second Post', 3 => 'Third Post');
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array('fields' => array('title', 'id')));
-		$expected = array('First Post' => '1', 'Second Post' => '2', 'Third Post' => '3');
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array('fields' => array('title', 'id', 'created')));
-		$expected = array(
-			'2007-03-18 10:39:23' => array('First Post' => '1'),
-			'2007-03-18 10:41:23' => array('Second Post' => '2'),
-			'2007-03-18 10:43:23' => array('Third Post' => '3'),
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array('fields' => array('Post.body')));
-		$expected = array(1 => 'First Post Body', 2 => 'Second Post Body', 3 => 'Third Post Body');
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array('fields' => array('Post.title', 'Post.body')));
-		$expected = array('First Post' => 'First Post Body', 'Second Post' => 'Second Post Body', 'Third Post' => 'Third Post Body');
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('list', array('fields' => array('Post.id', 'Post.title', 'Author.user'), 'recursive' => 1));
-		$expected = array('mariano' => array(1 => 'First Post', 3 => 'Third Post'), 'larry' => array(2 => 'Second Post'));
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new User();
-		$result = $TestModel->find('list', array('fields' => array('User.user', 'User.password')));
-		$expected = array('mariano' => '5f4dcc3b5aa765d61d8327deb882cf99', 'nate' => '5f4dcc3b5aa765d61d8327deb882cf99', 'larry' => '5f4dcc3b5aa765d61d8327deb882cf99', 'garrett' => '5f4dcc3b5aa765d61d8327deb882cf99');
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new ModifiedAuthor();
-		$result = $TestModel->find('list', array('fields' => array('Author.id', 'Author.user')));
-		$expected = array(1 => 'mariano (CakePHP)', 2 => 'nate (CakePHP)', 3 => 'larry (CakePHP)', 4 => 'garrett (CakePHP)');
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecordExists method
- *
- * @access public
- * @return void
- */
-	function testRecordExists() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$this->assertFalse($TestModel->exists());
-		$TestModel->read(null, 1);
-		$this->assertTrue($TestModel->exists());
-		$TestModel->create();
-		$this->assertFalse($TestModel->exists());
-		$TestModel->id = 4;
-		$this->assertTrue($TestModel->exists());
-
-		$TestModel =& new TheVoid();
-		$this->assertFalse($TestModel->exists());
-		$TestModel->id = 5;
-		$this->assertFalse($TestModel->exists());
-	}
-/**
- * testFindField method
- *
- * @access public
- * @return void
- */
-	function testFindField() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$TestModel->id = 1;
-		$result = $TestModel->field('user');
-		$this->assertEqual($result, 'mariano');
-
-		$result = $TestModel->field('User.user');
-		$this->assertEqual($result, 'mariano');
-
-		$TestModel->id = false;
-		$result = $TestModel->field('user', array('user' => 'mariano'));
-		$this->assertEqual($result, 'mariano');
-
-		$result = $TestModel->field('COUNT(*) AS count', true);
-		$this->assertEqual($result, 4);
-
-		$result = $TestModel->field('COUNT(*)', true);
-		$this->assertEqual($result, 4);
-	}
-/**
- * testFindUnique method
- *
- * @access public
- * @return void
- */
-	function testFindUnique() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$this->assertFalse($TestModel->isUnique(array('user' => 'nate')));
-		$TestModel->id = 2;
-		$this->assertTrue($TestModel->isUnique(array('user' => 'nate')));
-		$this->assertFalse($TestModel->isUnique(array('user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99')));
-	}
-/**
- * testUpdateExisting method
- *
- * @access public
- * @return void
- */
-	function testUpdateExisting() {
-		$this->loadFixtures('User', 'Article', 'Comment');
-		$TestModel =& new User();
-		$TestModel->create();
-
-		$TestModel->save(array('User' => array('user' => 'some user', 'password' => 'some password')));
-		$this->assertTrue(is_int($TestModel->id) || (intval($TestModel->id) === 5));
-		$id = $TestModel->id;
-
-		$TestModel->save(array('User' => array('user' => 'updated user')));
-		$this->assertEqual($TestModel->id, $id);
-
-		$result = $TestModel->findById($id);
-		$this->assertEqual($result['User']['user'], 'updated user');
-		$this->assertEqual($result['User']['password'], 'some password');
-
-		$Article =& new Article();
-		$Comment =& new Comment();
-		$data = array('Comment' => array('id' => 1, 'comment' => 'First Comment for First Article'),
-				'Article' => array('id' => 2, 'title' => 'Second Article'));
-
-		$result = $Article->save($data);
-		$this->assertTrue($result);
-
-		$result = $Comment->save($data);
-		$this->assertTrue($result);
-	}
-/**
- * testUpdateMultiple method
- *
- * @access public
- * @return void
- */
-	function testUpdateMultiple() {
-		$this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread');
-		$TestModel =& new Comment();
-		$result = Set::extract($TestModel->find('all'), '{n}.Comment.user_id');
-		$expected = array('2', '4', '1', '1', '1', '2');
-		$this->assertEqual($result, $expected);
-
-		$TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2));
-		$result = Set::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id');
-		$expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->updateAll(array('Comment.comment' => "'Updated today'"), array('Comment.user_id' => 5));
-		$this->assertTrue($result);
-		$result = Set::extract($TestModel->find('all', array('conditions' => array('Comment.user_id' => 5))), '{n}.Comment.comment');
-		$expected = array_fill(0, 2, 'Updated today');
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testUpdateWithCalculation method
- *
- * @access public
- * @return void
- */
-	function testUpdateWithCalculation() {
-		$this->loadFixtures('DataTest');
-		$model =& new DataTest();
-		$result = $model->saveAll(array(
-			array('count' => 5, 'float' => 1.1),
-			array('count' => 3, 'float' => 1.2),
-			array('count' => 4, 'float' => 1.3),
-			array('count' => 1, 'float' => 2.0),
-		));
-		$this->assertTrue($result);
-
-		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
-		$this->assertEqual($result, array(5, 3, 4, 1));
-
-		$this->assertTrue($model->updateAll(array('count' => 'count + 2')));
-		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
-		$this->assertEqual($result, array(7, 5, 6, 3));
-
-		$this->assertTrue($model->updateAll(array('DataTest.count' => 'DataTest.count - 1')));
-		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
-		$this->assertEqual($result, array(6, 4, 5, 2));
-	}
-/**
- * testBindUnbind method
- *
- * @access public
- * @return void
- */
-	function testBindUnbind() {
-		$this->loadFixtures('User', 'Comment', 'FeatureSet');
-		$TestModel =& new User();
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Comment')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano'), 'Comment' => array(
-				array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-				array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'),
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'))),
-			array('User' => array('id' => '2', 'user' => 'nate'), 'Comment' => array(
-				array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'))),
-			array('User' => array('id' => '3', 'user' => 'larry'), 'Comment' => array()),
-			array('User' => array('id' => '4', 'user' => 'garrett'), 'Comment' => array(
-				array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->resetAssociations();
-		$result = $TestModel->hasMany;
-		$this->assertEqual($result, array());
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Comment')), false);
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano'), 'Comment' => array(
-				array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-				array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'),
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'))),
-			array('User' => array('id' => '2', 'user' => 'nate'), 'Comment' => array(
-				array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'))),
-			array('User' => array('id' => '3', 'user' => 'larry'), 'Comment' => array()),
-			array('User' => array('id' => '4', 'user' => 'garrett'), 'Comment' => array(
-				array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->hasMany;
-		$expected = array('Comment' => array('className' => 'Comment', 'foreignKey' => 'user_id', 'conditions' => null, 'fields' => null, 'order' => null, 'limit' => null, 'offset' => null, 'dependent' => null, 'exclusive' => null, 'finderQuery' => null, 'counterQuery' => null) );
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano')),
-			array('User' => array('id' => '2', 'user' => 'nate')),
-			array('User' => array('id' => '3', 'user' => 'larry')),
-			array('User' => array('id' => '4', 'user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano'), 'Comment' => array(
-				array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-				array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'),
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'))),
-			array('User' => array('id' => '2', 'user' => 'nate'), 'Comment' => array(
-				array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'))),
-			array('User' => array('id' => '3', 'user' => 'larry'), 'Comment' => array()),
-			array('User' => array('id' => '4', 'user' => 'garrett'), 'Comment' => array(
-				array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')), false);
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano')),
-			array('User' => array('id' => '2', 'user' => 'nate')),
-			array('User' => array('id' => '3', 'user' => 'larry')),
-			array('User' => array('id' => '4', 'user' => 'garrett')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Comment' => array('className' => 'Comment', 'conditions' => 'Comment.published = \'Y\'') )));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano'), 'Comment' => array(
-				array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'))),
-			array('User' => array('id' => '2', 'user' => 'nate'), 'Comment' => array(
-				array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'))),
-			array('User' => array('id' => '3', 'user' => 'larry'), 'Comment' => array()),
-			array('User' => array('id' => '4', 'user' => 'garrett'), 'Comment' => array(
-				array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
-		$this->assertEqual($result, $expected);
-
-		$TestModel2 =& new DeviceType();
-
-		$expected = array('className' => 'FeatureSet', 'foreignKey' => 'feature_set_id', 'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => '');
-		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
-
-		$TestModel2->bind('FeatureSet', array('conditions' => array('active' => true)));
-		$expected['conditions'] = array('active' => true);
-		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
-
-		$TestModel2->bind('FeatureSet', array('foreignKey' => false, 'conditions' => array('Feature.name' => 'DeviceType.name')));
-		$expected['conditions'] = array('Feature.name' => 'DeviceType.name');
-		$expected['foreignKey'] = false;
-		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
-
-		$TestModel2->bind('NewFeatureSet', array('type' => 'hasMany', 'className' => 'FeatureSet', 'conditions' => array('active' => true)));
-		$expected = array('className' => 'FeatureSet', 'conditions' => array('active' => true), 'foreignKey' => 'device_type_id', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '', 'dependent' => '', 'exclusive' => '', 'finderQuery' => '', 'counterQuery' => '');
-		$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
-		$this->assertTrue(is_object($TestModel2->NewFeatureSet));
-	}
-/**
- * testBindMultipleTimes method
- *
- * @access public
- * @return void
- */
-	function testBindMultipleTimes() {
-		$this->loadFixtures('User', 'Comment', 'Article');
-		$TestModel =& new User();
-
-		$result = $TestModel->hasMany;
-		$expected = array();
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Items' => array('className' => 'Comment'))));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano'), 'Items' => array(
-				array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-				array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'),
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'))),
-			array('User' => array('id' => '2', 'user' => 'nate'), 'Items' => array(
-				array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'))),
-			array('User' => array('id' => '3', 'user' => 'larry'), 'Items' => array()),
-			array('User' => array('id' => '4', 'user' => 'garrett'), 'Items' => array(
-				array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Items' => array('className' => 'Article'))));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
-		$expected = array(
-			array('User' => array('id' => '1', 'user' => 'mariano'), 'Items' => array(
-				array('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				array('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'))),
-			array('User' => array('id' => '2', 'user' => 'nate'), 'Items' => array()),
-			array('User' => array('id' => '3', 'user' => 'larry'), 'Items' => array(
-				array('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'))),
-			array('User' => array('id' => '4', 'user' => 'garrett'), 'Items' => array()));
-		$this->assertEqual($result, $expected);
-	}
-
-/**
- * test that bindModel behaves with Custom primary Key associations
- *
- * @return void
- **/
-	function bindWithCustomPrimaryKey() {
-		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
-		$Model =& ClassRegistry::init('StoriesTag');
-		$Model->bindModel(array(
-			'belongsTo' => array(
-				'Tag' => array('className' => 'Tag', 'foreignKey' => 'story')
-			)
-		));
-		$result = $Model->find('all');
-		$this->assertFalse(empty($result));
-	}
-
-/**
- * test find('count') method
- *
- * @access public
- * @return void
- */
-	function testFindCount() {
-		$this->loadFixtures('User', 'Project');
-
-		$TestModel =& new User();
-		$result = $TestModel->find('count');
-		$this->assertEqual($result, 4);
-
-		$fullDebug = $this->db->fullDebug;
-		$this->db->fullDebug = true;
-		$TestModel->order = 'User.id';
-		$this->db->_queriesLog = array();
-		$result = $TestModel->find('count');
-		$this->assertEqual($result, 4);
-
-		$this->assertTrue(isset($this->db->_queriesLog[0]['query']));
-		$this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']);
-
-		$this->db->_queriesLog = array();
-		$this->db->fullDebug = $fullDebug;
-
-		$TestModel =& new Project();
-		$TestModel->create(array('name' => 'project')) && $TestModel->save();
-		$TestModel->create(array('name' => 'project')) && $TestModel->save();
-		$TestModel->create(array('name' => 'project')) && $TestModel->save();
-
-		$result = $TestModel->find('count', array('fields' => 'DISTINCT Project.name'));
-		$this->assertEqual($result, 4);
-	}
-/**
- * Test find(count) with Db::expression
- *
- * @access public
- * @return void
- */
-	function testFindCountWithDbExpressions() {
-		if ($this->skipIf($this->db->config['driver'] == 'postgres', '%s testFindCountWithExpressions is not compatible with Postgres')) {
-			return;
-		}
-		$this->loadFixtures('Project');
-		$db = ConnectionManager::getDataSource('test_suite');
-		$TestModel =& new Project();
-
-		$result = $TestModel->find('count', array('conditions' => array(
-			$db->expression('Project.name = \'Project 3\'')
-		)));
-		$this->assertEqual($result, 1);
-
-		$result = $TestModel->find('count', array('conditions' => array(
-			'Project.name' => $db->expression('\'Project 3\'')
-		)));
-		$this->assertEqual($result, 1);
-	}
-/**
- * testFindMagic method
- *
- * @access public
- * @return void
- */
-	function testFindMagic() {
-		$this->loadFixtures('User');
-		$TestModel =& new User();
-
-		$result = $TestModel->findByUser('mariano');
-		$expected = array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->findByPassword('5f4dcc3b5aa765d61d8327deb882cf99');
-		$expected = array('User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRead method
- *
- * @access public
- * @return void
- */
-	function testRead() {
-		$this->loadFixtures('User', 'Article');
-		$TestModel =& new User();
-
-		$result = $TestModel->read();
-		$this->assertFalse($result);
-
-		$TestModel->id = 2;
-		$result = $TestModel->read();
-		$expected = array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->read(null, 2);
-		$expected = array('User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->read(array('id', 'user'));
-		$expected = array('User' => array('id' => '2', 'user' => 'nate'));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->read('id, user', 2);
-		$expected = array('User' => array('id' => '2', 'user' => 'nate'));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Article')));
-		$this->assertTrue($result);
-
-		$TestModel->id = 1;
-		$result = $TestModel->read('id, user');
-		$expected = array('User' => array('id' => '1', 'user' => 'mariano'),
-			'Article' => array(
-				array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31' ),
-				array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31' )));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecursiveRead method
- *
- * @access public
- * @return void
- */
-	function testRecursiveRead() {
-		$this->loadFixtures('User', 'Article', 'Comment', 'Tag', 'ArticlesTag', 'Featured', 'ArticleFeatured');
-		$TestModel =& new User();
-
-		$result = $TestModel->bindModel(array('hasMany' => array('Article')), false);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 0;
-		$result = $TestModel->read('id, user', 1);
-		$expected = array(
-			'User' => array('id' => '1', 'user' => 'mariano'),
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 1;
-		$result = $TestModel->read('id, user', 1);
-		$expected = array('User' => array('id' => '1', 'user' => 'mariano'),
-			'Article' => array(
-				array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31' ),
-				array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31' )));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read('id, user', 3);
-		$expected = array('User' => array('id' => '3', 'user' => 'larry'),
-			'Article' => array(array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
-					'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-					'Comment' => array(array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
-						array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')),
-					'Tag' => array(
-						array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-						array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')))));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * @todo Figure out why Featured is not getting truncated properly
- */
-	function testRecursiveFindAll() {
-		$this->db->truncate(new Featured());
-
-		$this->loadFixtures('User', 'Article', 'Comment', 'Tag', 'ArticlesTag', 'Attachment', 'ArticleFeatured', 'Featured', 'Category');
-		$TestModel =& new Article();
-
-		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 1)));
-		$expected = array(
-			array(
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Comment' => array(
-					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-					array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
-					array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-					array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31')
-				),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
-				)
-			),
-			array(
-				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Comment' => array(),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 3), 'limit' => 1, 'recursive' => 2));
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
-				),
-				'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-				'Comment' => array(
-					array(
-						'id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
-						'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-						'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-						'Attachment' => array('id' => '1', 'comment_id' => 5, 'attachment' => 'attachment.zip', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31')
-					),
-					array(
-						'id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
-						'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-						'User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
-						'Attachment' => false
-					)
-				),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$Featured = new Featured();
-
-		$Featured->recursive = 2;
-		$Featured->bindModel(array(
-			'belongsTo' => array(
-				'ArticleFeatured' => array(
-					'conditions' => "ArticleFeatured.published = 'Y'",
-					'fields' => 'id, title, user_id, published'
-				)
-			)
-		));
-
-		$Featured->ArticleFeatured->unbindModel(array(
-			'hasMany' => array('Attachment', 'Comment'),
-			'hasAndBelongsToMany' => array('Tag'))
-		);
-
-		$orderBy = 'ArticleFeatured.id ASC';
-		$result = $Featured->find('all', array('order' => $orderBy, 'limit' => 3));
-
-		$expected = array(
-			array('Featured' => array('id' => '1', 'article_featured_id' => '1', 'category_id' => '1', 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'ArticleFeatured' => array('id' => '1', 'title' => 'First Article', 'user_id' => '1', 'published' => 'Y',
-					'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-					'Category' => array(),
-					'Featured' => array('id' => '1', 'article_featured_id' => '1', 'category_id' => '1', 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')),
-				'Category' => array('id' => '1', 'parent_id' => '0', 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31')),
-			array('Featured' => array('id' => '2', 'article_featured_id' => '2', 'category_id' => '1', 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'ArticleFeatured' => array('id' => '2', 'title' => 'Second Article', 'user_id' => '3', 'published' => 'Y',
-					'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-					'Category' => array(),
-					'Featured' => array('id' => '2', 'article_featured_id' => '2', 'category_id' => '1', 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')),
-				'Category' => array( 'id' => '1', 'parent_id' => '0', 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecursiveFindAllWithLimit method
- *
- * @access public
- * @return void
- */
-	function testRecursiveFindAllWithLimit() {
-		$this->loadFixtures('Article', 'User', 'Tag', 'ArticlesTag', 'Comment', 'Attachment');
-		$TestModel =& new Article();
-
-		$TestModel->hasMany['Comment']['limit'] = 2;
-
-		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 1)));
-		$expected = array(
-			array(
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Comment' => array(
-					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-					array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
-				),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
-				)
-			),
-			array(
-				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Comment' => array(),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->hasMany['Comment']['limit'] = 1;
-
-		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 3), 'limit' => 1, 'recursive' => 2));
-		$expected = array(
-			array(
-				'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-				'Comment' => array(
-					array(
-						'id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
-						'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-						'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-						'Attachment' => array('id' => '1', 'comment_id' => 5, 'attachment' => 'attachment.zip', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31')
-					)
-				),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testAssociationAfterFind method
- *
- * @access public
- * @return void
- */
-	function testAssociationAfterFind() {
-		$this->loadFixtures('Post', 'Author', 'Comment');
-		$TestModel =& new Post();
-		$result = $TestModel->find('all');
-		$expected = array(
-			array(
-				'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'Author' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working'),
-			), array(
-				'Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'Author' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31', 'test' => 'working'),
-			), array(
-				'Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'Author' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working')
-			)
-		);
-		$this->assertEqual($result, $expected);
-		unset($TestModel);
-
-		$Author =& new Author();
-		$Author->Post->bindModel(array(
-			'hasMany' => array(
-				'Comment' => array(
-					'className' => 'ModifiedComment',
-					'foreignKey' => 'article_id',
-				)
-		)));
-		$result = $Author->find('all', array(
-			'conditions' => array('Author.id' => 1),
-			'recursive' => 2
-		));
-		$expected = array(
-			'id' => 1,
-			'article_id' => 1,
-			'user_id' => 2,
-			'comment' => 'First Comment for First Article',
-			'published' => 'Y',
-			'created' => '2007-03-18 10:45:23',
-			'updated' => '2007-03-18 10:47:31',
-			'callback' => 'Fire'
-		);
-		$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
-	}
-/**
- * Tests that callbacks can be properly disabled
- *
- * @access public
- * @return void
- */
-	function testCallbackDisabling() {
-		$this->loadFixtures('Author');
-		$TestModel = new ModifiedAuthor();
-
-		$result = Set::extract($TestModel->find('all'), '/Author/user');
-		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->find('all', array('callbacks' => 'after')), '/Author/user');
-		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->find('all', array('callbacks' => 'before')), '/Author/user');
-		$expected = array('mariano', 'nate', 'larry', 'garrett');
-		$this->assertEqual($result, $expected);
-
-		$result = Set::extract($TestModel->find('all', array('callbacks' => false)), '/Author/user');
-		$expected = array('mariano', 'nate', 'larry', 'garrett');
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testValidatesBackwards method
- *
- * @access public
- * @return void
- */
-	function testValidatesBackwards() {
-		$TestModel =& new TestValidate();
-
-		$TestModel->validate = array(
-			'user_id' => VALID_NUMBER,
-			'title' => VALID_NOT_EMPTY,
-			'body' => VALID_NOT_EMPTY
-		);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => '', 'body' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 'title', 'body' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '', 'title' => 'title', 'body' => 'body'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => 'not a number', 'title' => 'title', 'body' => 'body'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 'title', 'body' => 'body'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-	}
-/**
- * testValidates method
- *
- * @access public
- * @return void
- */
-	function testValidates() {
-		$TestModel =& new TestValidate();
-
-		$TestModel->validate = array(
-			'user_id' => 'numeric',
-			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'),
-			'body' => 'notEmpty'
-		);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => '', 'body' => 'body'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 'title', 'body' => 'body'));
-		$result = $TestModel->create($data) && $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => '0', 'body' => 'body'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate['modified'] = array('allowEmpty' => true, 'rule' => 'date');
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'modified' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'modified' => '2007-05-01'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'modified' => 'invalid-date-here'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'modified' => 0));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'modified' => '0'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$TestModel->validate['modified'] = array('allowEmpty' => false, 'rule' => 'date');
-
-		$data = array('TestValidate' => array('modified' => null));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('modified' => false));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('modified' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('modified' => '2007-05-01'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate['slug'] = array('allowEmpty' => false, 'rule' => array('maxLength', 45));
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'slug' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'slug' => 'slug-right-here'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array('user_id' => '1', 'title' => 0, 'body' => 'body', 'slug' => 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$TestModel->validate = array(
-			'number' => array('rule' => 'validateNumber', 'min' => 3, 'max' => 5),
-			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty')
-		);
-
-		$data = array('TestValidate' => array('title' => 'title', 'number' => '0'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'title', 'number' => 0));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'title', 'number' => '3'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$data = array('TestValidate' => array('title' => 'title', 'number' => 3));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array(
-			'number' => array('rule' => 'validateNumber', 'min' => 5, 'max' => 10),
-			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty')
-		);
-
-		$data = array('TestValidate' => array('title' => 'title', 'number' => '3'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'title', 'number' => 3));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$TestModel->validate = array(
-			'title' => array('allowEmpty' => false, 'rule' => 'validateTitle')
-		);
-
-		$data = array('TestValidate' => array('title' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'new title'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'title-new'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array('title' => array('allowEmpty' => true, 'rule' => 'validateTitle'));
-		$data = array('TestValidate' => array('title' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array('title' => array('length' => array('allowEmpty' => true, 'rule' => array('maxLength', 10))));
-		$data = array('TestValidate' => array('title' => ''));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array('title' => array('rule' => array('userDefined', 'Article', 'titleDuplicate')));
-		$data = array('TestValidate' => array('title' => 'My Article Title'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-
-		$data = array('TestValidate' => array('title' => 'My Article With a Different Title'));
-		$result = $TestModel->create($data);
-		$this->assertTrue($result);
-		$result = $TestModel->validates();
-		$this->assertTrue($result);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'tooShort' => array('rule' => array('minLength', 50)),
-				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
-			),
-		);
-		$data = array('TestValidate' => array(
-			'title' => 'I am a short string'
-		));
-		$TestModel->create($data);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-		$result = $TestModel->validationErrors;
-		$expected = array(
-			'title' => 'onlyLetters'
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->validate = array(
-			'title' => array(
-				'tooShort' => array('rule' => array('minLength', 50), 'last' => true),
-				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
-			),
-		);
-		$data = array('TestValidate' => array(
-			'title' => 'I am a short string'
-		));
-		$TestModel->create($data);
-		$result = $TestModel->validates();
-		$this->assertFalse($result);
-		$result = $TestModel->validationErrors;
-		$expected = array(
-			'title' => 'tooShort'
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveField method
- *
- * @access public
- * @return void
- */
-	function testSaveField() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		$TestModel->id = 1;
-		$result = $TestModel->saveField('title', 'New First Article');
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-		$expected = array('Article' => array(
-			'id' => '1', 'user_id' => '1', 'title' => 'New First Article', 'body' => 'First Article Body'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 1;
-		$result = $TestModel->saveField('title', '');
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-		$expected = array('Article' => array(
-			'id' => '1', 'user_id' => '1', 'title' => '', 'body' => 'First Article Body'
-		));
-		$result['Article']['title'] = trim($result['Article']['title']);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 1;
-		$TestModel->set('body', 'Messed up data');
-		$this->assertTrue($TestModel->saveField('title', 'First Article'));
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-		$expected = array('Article' => array(
-			'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body'
-		));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
-
-		$TestModel->id = 1;
-		$result = $TestModel->saveField('title', '', true);
-		$this->assertFalse($result);
-
-		$this->loadFixtures('Node', 'Dependency');
-		$Node =& new Node();
-		$Node->set('id', 1);
-		$result = $Node->read();
-		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
-
-		$Node->saveField('state', 10);
-		$result = $Node->read();
-		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
-	}
-/**
- * testSaveWithCreate method
- *
- * @access public
- * @return void
- */
-	function testSaveWithCreate() {
-		$this->loadFixtures('User', 'Article', 'User', 'Comment', 'Tag', 'ArticlesTag', 'Attachment');
-		$TestModel =& new User();
-
-		$data = array('User' => array('user' => 'user', 'password' => ''));
-		$result = $TestModel->save($data);
-		$this->assertFalse($result);
-		$this->assertTrue(!empty($TestModel->validationErrors));
-
-		$TestModel =& new Article();
-
-		$data = array('Article' => array('user_id' => '', 'title' => '', 'body' => ''));
-		$result = $TestModel->create($data) && $TestModel->save();
-		$this->assertFalse($result);
-		$this->assertTrue(!empty($TestModel->validationErrors));
-
-		$data = array('Article' => array('id' => 1, 'user_id' => '1', 'title' => 'New First Article', 'body' => ''));
-		$result = $TestModel->create($data) && $TestModel->save();
-		$this->assertFalse($result);
-
-		$data = array('Article' => array('id' => 1, 'title' => 'New First Article'));
-		$result = $TestModel->create() && $TestModel->save($data, false);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
-		$expected = array('Article' => array(
-			'id' => '1', 'user_id' => '1', 'title' => 'New First Article', 'body' => 'First Article Body', 'published' => 'N'
-		));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article' => array('id' => 1, 'user_id' => '2', 'title' => 'First Article', 'body' => 'New First Article Body', 'published' => 'Y'));
-		$result = $TestModel->create() && $TestModel->save($data, true, array('id', 'title', 'published'));
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
-		$expected = array('Article' => array(
-			'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Article' => array('user_id' => '2', 'title' => 'New Article', 'body' => 'New Article Body', 'created' => '2007-03-18 14:55:23', 'updated' => '2007-03-18 14:57:31'),
-			'Tag' => array('Tag' => array(1, 3))
-		);
-		$TestModel->create();
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 4);
-		$expected = array(
-			'Article' => array('id' => '4', 'user_id' => '2', 'title' => 'New Article', 'body' => 'New Article Body', 'published' => 'N', 'created' => '2007-03-18 14:55:23', 'updated' => '2007-03-18 14:57:31'),
-			'User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
-			'Comment' => array(),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Comment' => array('article_id' => '4', 'user_id' => '1', 'comment' => 'Comment New Article', 'published' => 'Y', 'created' => '2007-03-18 14:57:23', 'updated' => '2007-03-18 14:59:31'));
-		$result = $TestModel->Comment->create() && $TestModel->Comment->save($data);
-		$this->assertTrue($result);
-
-		$data = array('Attachment' => array('comment_id' => '7', 'attachment' => 'newattachment.zip', 'created' => '2007-03-18 15:02:23', 'updated' => '2007-03-18 15:04:31'));
-		$result = $TestModel->Comment->Attachment->save($data);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 4);
-		$expected = array(
-			'Article' => array('id' => '4', 'user_id' => '2', 'title' => 'New Article', 'body' => 'New Article Body', 'published' => 'N', 'created' => '2007-03-18 14:55:23', 'updated' => '2007-03-18 14:57:31'),
-			'User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
-			'Comment' => array(
-				array(
-					'id' => '7', 'article_id' => '4', 'user_id' => '1', 'comment' => 'Comment New Article', 'published' => 'Y', 'created' => '2007-03-18 14:57:23', 'updated' => '2007-03-18 14:59:31',
-					'Article' => array('id' => '4', 'user_id' => '2', 'title' => 'New Article', 'body' => 'New Article Body', 'published' => 'N', 'created' => '2007-03-18 14:55:23', 'updated' => '2007-03-18 14:57:31'),
-					'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-					'Attachment' => array('id' => '2', 'comment_id' => '7', 'attachment' => 'newattachment.zip', 'created' => '2007-03-18 15:02:23', 'updated' => '2007-03-18 15:04:31')
-				)
-			),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveWithSet method
- *
- * @access public
- * @return void
- */
-	function testSaveWithSet() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		// Create record we will be updating later
-
-		$data = array('Article' => array('user_id' => '1', 'title' => 'Fourth Article', 'body' => 'Fourth Article Body', 'published' => 'Y'));
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		// Check record we created
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$expected = array('Article' => array('id' => '4', 'user_id' => '1', 'title' => 'Fourth Article', 'body' => 'Fourth Article Body', 'published' => 'Y'));
-		$this->assertEqual($result, $expected);
-
-		// Create new record just to overlap Model->id on previously created record
-
-		$data = array('Article' => array('user_id' => '4', 'title' => 'Fifth Article', 'body' => 'Fifth Article Body', 'published' => 'Y'));
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$expected = array('Article' => array(
-			'id' => '5', 'user_id' => '4', 'title' => 'Fifth Article', 'body' => 'Fifth Article Body', 'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		// Go back and edit the first article we created, starting by checking it's still there
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$expected = array('Article' => array('id' => '4', 'user_id' => '1', 'title' => 'Fourth Article', 'body' => 'Fourth Article Body', 'published' => 'Y'));
-		$this->assertEqual($result, $expected);
-
-		// And now do the update with set()
-
-		$data = array('Article' => array('id' => '4', 'title' => 'Fourth Article - New Title', 'published' => 'N'));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$expected = array('Article' => array('id' => '4', 'user_id' => '1', 'title' => 'Fourth Article - New Title', 'body' => 'Fourth Article Body', 'published' => 'N'));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$expected = array('Article' => array(
-			'id' => '5', 'user_id' => '4', 'title' => 'Fifth Article', 'body' => 'Fifth Article Body', 'published' => 'Y'
-		));
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article' => array('id' => '5', 'title' => 'Fifth Article - New Title 5'));
-		$result = ($TestModel->set($data) && $TestModel->save());
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$expected = array('Article' => array('id' => '5', 'user_id' => '4', 'title' => 'Fifth Article - New Title 5', 'body' => 'Fifth Article Body', 'published' => 'Y'));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'title' => 'First Article' )),
-			array('Article' => array('id' => 2, 'title' => 'Second Article' )),
-			array('Article' => array('id' => 3, 'title' => 'Third Article' )),
-			array('Article' => array('id' => 4, 'title' => 'Fourth Article - New Title' )),
-			array('Article' => array('id' => 5, 'title' => 'Fifth Article - New Title 5' ))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveWithNonExistentFields method
- *
- * @access public
- * @return void
- */
-	function testSaveWithNonExistentFields() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-		$TestModel->recursive = -1;
-
-		$data = array(
-			'non_existent' => 'This field does not exist',
-			'user_id' => '1',
-			'title' => 'Fourth Article - New Title',
-			'body' => 'Fourth Article Body',
-			'published' => 'N'
-		);
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$expected = array('Article' => array(
-			'id' => '4',
-			'user_id' => '1',
-			'title' => 'Fourth Article - New Title',
-			'body' => 'Fourth Article Body',
-			'published' => 'N'
-		));
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'user_id' => '1',
-			'non_existent' => 'This field does not exist',
-			'title' => 'Fiveth Article - New Title',
-			'body' => 'Fiveth Article Body',
-			'published' => 'N'
-		);
-		$result = $TestModel->create() && $TestModel->save($data);
-		$this->assertTrue($result);
-
-		$expected = array('Article' => array(
-			'id' => '5',
-			'user_id' => '1',
-			'title' => 'Fiveth Article - New Title',
-			'body' => 'Fiveth Article Body',
-			'published' => 'N'
-		));
-		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveFromXml method
- *
- * @access public
- * @return void
- */
-	function testSaveFromXml() {
-		$this->loadFixtures('Article');
-		App::import('Core', 'Xml');
-
-		$Article = new Article();
-		$Article->save(new Xml('
    '));
-		$this->assertTrue($Article->save(new Xml('
    ')));
-
-		$results = $Article->find(array('Article.title' => 'test xml'));
-		$this->assertTrue($results);
-	}
-/**
- * testSaveHabtm method
- *
- * @access public
- * @return void
- */
-	function testSaveHabtm() {
-		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
-		$TestModel =& new Article();
-
-		$result = $TestModel->findById(2);
-		$expected = array(
-			'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-			'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-			'Comment' => array(
-				array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
-				array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
-			),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Article' => array('id' => '2', 'title' => 'New Second Article'),
-			'Tag' => array('Tag' => array(1, 2))
-		);
-
-		$this->assertTrue($TestModel->set($data));
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
-		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Article' => array('id' => '2'), 'Tag' => array('Tag' => array(2, 3)));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'),
-			'Tag' => array(
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(1, 2, 3)));
-
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array()));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$data = array('Tag' => array('Tag' => ''));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'),
-			'Tag' => array()
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(2, 3)));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(1, 2)), 'Article' => array('id' => '2', 'title' => 'New Second Article'));
-		$this->assertTrue($TestModel->set($data));
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2', 'user_id' => '3', 'title' => 'New Second Article', 'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(1, 2)), 'Article' => array('id' => '2', 'title' => 'New Second Article Title'));
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2', 'user_id' => '3', 'title' => 'New Second Article Title', 'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array('Tag' => array('Tag' => array(2, 3)), 'Article' => array('id' => '2', 'title' => 'Changed Second Article'));
-		$this->assertTrue($TestModel->set($data));
-		$this->assertTrue($TestModel->save());
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2', 'user_id' => '3', 'title' => 'Changed Second Article', 'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Tag' => array(
-				'Tag' => array( 1, 3 )
-			),
-			'Article' => array('id' => '2' ),
-		);
-
-		$result = $TestModel->set($data);
-		$this->assertTrue($result);
-
-		$result = $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array(
-			'belongsTo' => array('User'),
-			'hasMany' => array('Comment')
-		));
-		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
-		$expected = array(
-			'Article' => array(
-				'id' => '2', 'user_id' => '3', 'title' => 'Changed Second Article', 'body' => 'Second Article Body'
-			),
-			'Tag' => array(
-				array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			'Article' => array('id' => 10, 'user_id' => '2', 'title' => 'New Article With Tags and fieldList', 'body' => 'New Article Body with Tags and fieldList', 'created' => '2007-03-18 14:55:23', 'updated' => '2007-03-18 14:57:31'),
-			'Tag' => array('Tag' => array(1, 2, 3))
-		);
-		$result = $TestModel->create() && $TestModel->save($data, true, array('user_id', 'title', 'published'));
-		$this->assertTrue($result);
-
-		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
-		$result = $TestModel->read();
-		$expected = array(
-			'Article' => array('id' => 4, 'user_id' => 2, 'title' => 'New Article With Tags and fieldList', 'body' => '', 'published' => 'N', 'created' => '', 'updated' => ''),
-			'Tag' => array(
-				0 => array('id' => 1, 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-				1 => array('id' => 2, 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-				2 => array('id' => 3, 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-
-		$this->loadFixtures('JoinA', 'JoinC', 'JoinAC', 'JoinB', 'JoinAB');
-		$TestModel = new JoinA();
-		$TestModel->hasBelongsToMany['JoinC']['unique'] = true;
-		$data = array(
-			'JoinA' => array(
-				'id' => 1,
-				'name' => 'Join A 1',
-				'body' => 'Join A 1 Body',
-			),
-			'JoinC' => array(
-				'JoinC' => array(
-					array('join_c_id' => 2, 'other' => 'new record'),
-					array('join_c_id' => 3, 'other' => 'new record')
-				)
-			)
-		);
-		$TestModel->save($data);
-		$result = $TestModel->read(null, 1);
-		$time = date('Y-M-D H:i:s');
-		$expected = array(4, 5);
-		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
-		$expected = array('new record', 'new record');
-		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
-	}
-/**
- * testSaveHabtmCustomKeys method
- *
- * @access public
- * @return void
- */
-	function testSaveHabtmCustomKeys() {
-		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
-		$Story =& new Story();
-
-		$data = array('Story' => array('story' => '1'), 'Tag' => array('Tag' => array(2, 3)));
-		$result = $Story->set($data);
-		$this->assertTrue($result);
-
-		$result = $Story->save();
-		$this->assertTrue($result);
-
-		$result = $Story->find('all');
-		$expected = array(
-			array(
-				'Story' => array('story' => 1, 'title' => 'First Story'),
-				'Tag' => array(
-					array('id' => 2, 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-					array('id' => 3, 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-				)
-			),
-			array(
-				'Story' => array('story' => 2, 'title' => 'Second Story'),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testHabtmSaveKeyResolution method
- *
- * @access public
- * @return void
- */
-	function testHabtmSaveKeyResolution() {
-		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
-		$ThePaper =& new ThePaper();
-
-		$ThePaper->id = 1;
-		$ThePaper->save(array('Monkey' => array(2, 3)));
-
-		$result = $ThePaper->findById(1);
-		$expected = array(
-			array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper->id = 2;
-		$ThePaper->save(array('Monkey' => array(1, 2, 3)));
-
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array('id' => '1', 'device_type_id' => '1', 'name' => 'Device 1', 'typ' => '1'),
-			array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2'),
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper->id = 2;
-		$ThePaper->save(array('Monkey' => array(1, 3)));
-
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array('id' => '1', 'device_type_id' => '1', 'name' => 'Device 1', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$result = $ThePaper->findById(1);
-		$expected = array(
-			array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-	}
-/**
- * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
- *
- * @access public
- * @return void
- */
-	function testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable() {
-
-		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
-		$ThePaper =& new ThePaper();
-		$ThePaper->id = 1;
-		$ThePaper->save(array('Monkey' => array(2, 3)));
-
-		$result = $ThePaper->findById(1);
-		$expected = array(
-			array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper =& new ThePaper();
-		$ThePaper->id = 2;
-		$ThePaper->save(array('Monkey' => array(2, 3)));
-
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-
-		$ThePaper->delete(1);
-		$result = $ThePaper->findById(2);
-		$expected = array(
-			array('id' => '2', 'device_type_id' => '1', 'name' => 'Device 2', 'typ' => '1'),
-			array('id' => '3', 'device_type_id' => '1', 'name' => 'Device 3', 'typ' => '2')
-		);
-		$this->assertEqual($result['Monkey'], $expected);
-	}
-/**
- * test that Caches are getting cleared on save().
- * ensure that both inflections of controller names are getting cleared
- * as url for controller could be either overallFavorites/index or overall_favorites/index
- *
- * @return void
- **/
-	function testCacheClearOnSave() {
-		$_back = array(
-			'check' => Configure::read('Cache.check'),
-			'disable' => Configure::read('Cache.disable'),
-		);
-		Configure::write('Cache.check', true);
-		Configure::write('Cache.disable', false);
-
-		$this->loadFixtures('OverallFavorite');
-		$OverallFavorite =& new OverallFavorite();
-
-		touch(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php');
-		touch(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php');
-
-		$data = array(
-			'OverallFavorite' => array(
-		 		'model_type' => '8-track',
-				'model_id' => '3',
-				'priority' => '1'
-			)
-		);
-		$OverallFavorite->create($data);
-		$OverallFavorite->save();
-
-		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php'));
-		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php'));
-
-		Configure::write('Cache.check', $_back['check']);
-		Configure::write('Cache.disable', $_back['disable']);
-	}
-/**
- * testSaveAll method
- *
- * @access public
- * @return void
- */
-	function testSaveAll() {
-		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
-		$TestModel =& new Post();
-
-		$result = $TestModel->find('all');
-		$this->assertEqual(count($result), 3);
-		$this->assertFalse(isset($result[3]));
-		$ts = date('Y-m-d H:i:s');
-
-		$TestModel->saveAll(array(
-			'Post' => array('title' => 'Post with Author', 'body' => 'This post will be saved with an author'),
-			'Author' => array('user' => 'bob', 'password' => '5f4dcc3b5aa765d61d8327deb882cf90')
-		));
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			'Post' => array('id' => '4', 'author_id' => '5', 'title' => 'Post with Author', 'body' => 'This post will be saved with an author', 'published' => 'N', 'created' => $ts, 'updated' => $ts),
-			'Author' => array('id' => '5', 'user' => 'bob', 'password' => '5f4dcc3b5aa765d61d8327deb882cf90', 'created' => $ts, 'updated' => $ts, 'test' => 'working')
-		);
-		$this->assertEqual($result[3], $expected);
-		$this->assertEqual(count($result), 4);
-
-		$TestModel->deleteAll(true);
-		$this->assertEqual($TestModel->find('all'), array());
-
-		// SQLite seems to reset the PK counter when that happens, so we need this to make the tests pass
-		$this->db->truncate($TestModel);
-
-		$ts = date('Y-m-d H:i:s');
-		$TestModel->saveAll(array(
-			array('title' => 'Multi-record post 1', 'body' => 'First multi-record post', 'author_id' => 2),
-			array('title' => 'Multi-record post 2', 'body' => 'Second multi-record post', 'author_id' => 2)
-		));
-
-		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => '2', 'title' => 'Multi-record post 1', 'body' => 'First multi-record post', 'published' => 'N', 'created' => $ts, 'updated' => $ts)),
-			array('Post' => array('id' => '2', 'author_id' => '2', 'title' => 'Multi-record post 2', 'body' => 'Second multi-record post', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel =& new Comment();
-		$ts = date('Y-m-d H:i:s');
-		$result = $TestModel->saveAll(array(
-			'Comment' => array('article_id' => 2, 'user_id' => 2, 'comment' => 'New comment with attachment', 'published' => 'Y'),
-			'Attachment' => array('attachment' => 'some_file.tgz')
-		));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array('id' => '7', 'article_id' => '2', 'user_id' => '2', 'comment' => 'New comment with attachment', 'published' => 'Y', 'created' => $ts, 'updated' => $ts);
-		$this->assertEqual($result[6]['Comment'], $expected);
-
-		$expected = array('id' => '7', 'article_id' => '2', 'user_id' => '2', 'comment' => 'New comment with attachment', 'published' => 'Y', 'created' => $ts, 'updated' => $ts);
-		$this->assertEqual($result[6]['Comment'], $expected);
-
-		$expected = array('id' => '2', 'comment_id' => '7', 'attachment' => 'some_file.tgz', 'created' => $ts, 'updated' => $ts);
-		$this->assertEqual($result[6]['Attachment'], $expected);
-	}
-/**
- * Test SaveAll with Habtm relations
- *
- * @access public
- * @return void
- */
-	function testSaveAllHabtm() {
-		$this->loadFixtures('Article', 'Tag', 'Comment', 'User');
-		$data = array(
-			'Article' => array(
-				'user_id' => 1, 'title' => 'Article Has and belongs to Many Tags'
-			),
-			'Tag' => array(
-				'Tag' => array(
-					1, 2
-				)
-			),
-			'Comment' => array(
-				array('comment' => 'Article comment', 'user_id' => 1),
-			),
-		);
-		$Article =& new Article();
-		$result = $Article->saveAll($data);
-		$this->assertTrue($result);
-
-		$result = $Article->read();
-		$this->assertEqual(count($result['Tag']), 2);
-		$this->assertEqual($result['Tag'][0]['tag'], 'tag1');
-		$this->assertEqual(count($result['Comment']), 1);
-		$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
-	}
-/**
- * Test SaveAll with Habtm relations and extra join table fields
- *
- * @access public
- * @return void
- */
-	function testSaveAllHabtmWithExtraJoinTableFields() {
-		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
-
-		$data = array(
-			'Something' => array(
-				'id' => 4,
-				'title' => 'Extra Fields',
-				'body' => 'Extra Fields Body',
-				'published' => '1'
-			),
-			'SomethingElse' => array(
-				array('something_else_id' => 1, 'doomed' => '1'),
-				array('something_else_id' => 2, 'doomed' => '0'),
-				array('something_else_id' => 3, 'doomed' => '1')
-			)
-		);
-
-		$Something =& new Something();
-		$result = $Something->saveAll($data);
-		$this->assertTrue($result);
-		$result = $Something->read();
-
-		$this->assertEqual(count($result['SomethingElse']), 3);
-		$this->assertTrue(Set::matches('/Something[id=4]', $result));
-
-		$this->assertTrue(Set::matches('/SomethingElse[id=1]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[something_else_id=1]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[doomed=1]', $result));
-
-		$this->assertTrue(Set::matches('/SomethingElse[id=2]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[something_else_id=2]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[doomed=0]', $result));
-
-		$this->assertTrue(Set::matches('/SomethingElse[id=3]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
-		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
-	}
-
-/**
- * testSaveAllHasOne method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasOne() {
-		$model = new Comment();
-		$model->deleteAll(true);
-		$this->assertEqual($model->find('all'), array());
-
-		$model->Attachment->deleteAll(true);
-		$this->assertEqual($model->Attachment->find('all'), array());
-
-		$this->assertTrue($model->saveAll(array(
-			'Comment' => array('comment' => 'Comment with attachment', 'article_id' => 1, 'user_id' => 1),
-			'Attachment' => array('attachment' => 'some_file.zip')
-		)));
-		$result = $model->find('all', array('fields' => array(
-			'Comment.id', 'Comment.comment', 'Attachment.id', 'Attachment.comment_id', 'Attachment.attachment'
-		)));
-		$expected = array(array(
-			'Comment' => array('id' => '1', 'comment' => 'Comment with attachment'),
-			'Attachment' => array('id' => '1', 'comment_id' => '1', 'attachment' => 'some_file.zip')
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllBelongsTo method
- *
- * @access public
- * @return void
- */
-	function testSaveAllBelongsTo() {
-		$model = new Comment();
-		$model->deleteAll(true);
-		$this->assertEqual($model->find('all'), array());
-
-		$model->Article->deleteAll(true);
-		$this->assertEqual($model->Article->find('all'), array());
-
-		$this->assertTrue($model->saveAll(array(
-			'Comment' => array('comment' => 'Article comment', 'article_id' => 1, 'user_id' => 1),
-			'Article' => array('title' => 'Model Associations 101', 'user_id' => 1)
-		)));
-		$result = $model->find('all', array('fields' => array(
-			'Comment.id', 'Comment.comment', 'Comment.article_id', 'Article.id', 'Article.title'
-		)));
-		$expected = array(array(
-			'Comment' => array('id' => '1', 'article_id' => '1', 'comment' => 'Article comment'),
-			'Article' => array('id' => '1', 'title' => 'Model Associations 101')
-		));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllHasOneValidation method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasOneValidation() {
-		$model = new Comment();
-		$model->deleteAll(true);
-		$this->assertEqual($model->find('all'), array());
-
-		$model->Attachment->deleteAll(true);
-		$this->assertEqual($model->Attachment->find('all'), array());
-
-		$model->validate = array('comment' => 'notEmpty');
-		$model->Attachment->validate = array('attachment' => 'notEmpty');
-		$model->Attachment->bind('Comment');
-
-		$this->assertFalse($model->saveAll(
-			array(
-				'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
-				'Attachment' => array('attachment' => '')
-			),
-			array('validate' => 'first')
-		));
-		$expected = array(
-			'Comment' => array('comment' => 'This field cannot be left blank'),
-			'Attachment' => array('attachment' => 'This field cannot be left blank')
-		);
-		$this->assertEqual($model->validationErrors, $expected['Comment']);
-		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
-
-		$this->assertFalse($model->saveAll(
-			array(
-				'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
-				'Attachment' => array('attachment' => '')
-			),
-			array('validate' => 'only')
-		));
-		$this->assertEqual($model->validationErrors, $expected['Comment']);
-		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
-	}
-/**
- * testSaveAllAtomic method
- *
- * @access public
- * @return void
- */
-	function testSaveAllAtomic() {
-		$this->loadFixtures('Article', 'User');
-		$TestModel =& new Article();
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('title' => 'Post with Author', 'body' => 'This post will be saved with an author', 'user_id' => 2),
-			'Comment' => array(array('comment' => 'First new comment', 'user_id' => 2))
-		), array('atomic' => false));
-		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true)));
-
-		$result = $TestModel->saveAll(array(
-			array('id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'),
-			array('id' => '2', 'title' => 'Just update the title'),
-			array('title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'user_id' => 2)
-		), array('atomic' => false));
-		$this->assertIdentical($result, array(true, true, true));
-
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
-		$result = $TestModel->saveAll(array(
-			array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		), array('atomic' => false));
-		$this->assertIdentical($result, array(true, false));
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array('comment' => 'First new comment', 'published' => 'Y', 'user_id' => 1),
-				array('comment' => 'Second new comment', 'published' => 'Y', 'user_id' => 2)
-			)
-		), array('atomic' => false));
-		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
-	}
-/**
- * testSaveAllHasMany method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasMany() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array('comment' => 'First new comment', 'published' => 'Y', 'user_id' => 1),
-				array('comment' => 'Second new comment', 'published' => 'Y', 'user_id' => 2)
-			)
-		));
-		$this->assertTrue($result);
-
-		$result = $TestModel->findById(2);
-		$expected = array('First Comment for Second Article', 'Second Comment for Second Article', 'First new comment', 'Second new comment');
-		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
-
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array('comment' => 'Third new comment', 'published' => 'Y', 'user_id' => 1),
-				)
-			),
-			array('atomic' => false)
-		);
-		$this->assertTrue($result);
-
-		$result = $TestModel->findById(2);
-		$expected = array('First Comment for Second Article', 'Second Comment for Second Article', 'First new comment', 'Second new comment', 'Third new comment');
-		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
-
-		$TestModel->beforeSaveReturn = false;
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array('comment' => 'Fourth new comment', 'published' => 'Y', 'user_id' => 1),
-				)
-			),
-			array('atomic' => false)
-		);
-		$this->assertEqual($result, array('Article' => false));
-
-		$result = $TestModel->findById(2);
-		$expected = array('First Comment for Second Article', 'Second Comment for Second Article', 'First new comment', 'Second new comment', 'Third new comment');
-		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
-	}
-/**
- * testSaveAllHasManyValidation method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasManyValidation() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array('comment' => '', 'published' => 'Y', 'user_id' => 1),
-			)
-		));
-		$expected = array('Comment' => array(false));
-		$this->assertEqual($result, $expected);
-
-		$expected = array('Comment' => array(
-			array('comment' => 'This field cannot be left blank')
-		));
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$expected = array(
-			array('comment' => 'This field cannot be left blank')
-		);
-		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
-
-		$result = $TestModel->saveAll(array(
-			'Article' => array('id' => 2),
-			'Comment' => array(
-				array('comment' => '', 'published' => 'Y', 'user_id' => 1),
-			)
-		), array('validate' => 'only'));
-	}
-/**
- * testSaveAllTransaction method
- *
- * @access public
- * @return void
- */
-	function testSaveAllTransaction() {
-		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
-		$TestModel =& new Post();
-
-		$TestModel->validate = array('title' => 'notEmpty');
-		$data = array(
-			array('author_id' => 1, 'title' => 'New Fourth Post'),
-			array('author_id' => 1, 'title' => 'New Fifth Post'),
-			array('author_id' => 1, 'title' => '')
-		);
-		$ts = date('Y-m-d H:i:s');
-		$this->assertFalse($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')),
-			array('Post' => array('id' => '2', 'author_id' => 3, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')),
-			array('Post' => array('id' => '3', 'author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'))
-		);
-		if (count($result) != 3) {
-			// Database doesn't support transactions
-			$expected[] = array('Post' => array('id' => '4', 'author_id' => 1, 'title' => 'New Fourth Post', 'body' => null, 'published' => 'N', 'created' => $ts, 'updated' => $ts));
-			$expected[] = array('Post' => array('id' => '5', 'author_id' => 1, 'title' => 'New Fifth Post', 'body' => null, 'published' => 'N', 'created' => $ts, 'updated' => $ts));
-			$this->assertEqual($result, $expected);
-			// Skip the rest of the transactional tests
-			return;
-		}
-
-		$this->assertEqual($result, $expected);
-
-		$data = array(
-			array('author_id' => 1, 'title' => 'New Fourth Post'),
-			array('author_id' => 1, 'title' => ''),
-			array('author_id' => 1, 'title' => 'New Sixth Post')
-		);
-		$ts = date('Y-m-d H:i:s');
-		$this->assertFalse($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')),
-			array('Post' => array('id' => '2', 'author_id' => 3, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')),
-			array('Post' => array('id' => '3', 'author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'))
-		);
-		if (count($result) != 3) {
-			// Database doesn't support transactions
-			$expected[] = array('Post' => array('id' => '4', 'author_id' => 1, 'title' => 'New Fourth Post', 'body' => 'Third Post Body', 'published' => 'N', 'created' => $ts, 'updated' => $ts));
-			$expected[] = array('Post' => array('id' => '5', 'author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'N', 'created' => $ts, 'updated' => $ts));
-		}
-		$this->assertEqual($result, $expected);
-
-		$TestModel->validate = array('title' => 'notEmpty');
-		$data = array(
-			array('author_id' => 1, 'title' => 'New Fourth Post'),
-			array('author_id' => 1, 'title' => 'New Fifth Post'),
-			array('author_id' => 1, 'title' => 'New Sixth Post')
-		);
-		$this->assertTrue($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1, 'fields' => array('author_id', 'title','body','published')));
-		$expected = array(
-			array('Post' => array('author_id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y')),
-			array('Post' => array('author_id' => 3, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y')),
-			array('Post' => array('author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y')),
-			array('Post' => array('author_id' => 1, 'title' => 'New Fourth Post', 'body' => '', 'published' => 'N')),
-			array('Post' => array('author_id' => 1, 'title' => 'New Fifth Post', 'body' => '', 'published' => 'N')),
-			array('Post' => array('author_id' => 1, 'title' => 'New Sixth Post', 'body' => '', 'published' => 'N'))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllValidation method
- *
- * @access public
- * @return void
- */
-	function testSaveAllValidation() {
-		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
-		$TestModel =& new Post();
-
-		$data = array(
-			array('id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'),
-			array('id' => '2', 'title' => 'Just update the title'),
-			array('title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'author_id' => 2)
-		);
-		$this->assertTrue($TestModel->saveAll($data));
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$ts = date('Y-m-d H:i:s');
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N', 'created' => '2007-03-18 10:39:23', 'updated' => $ts)),
-			array('Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Just update the title', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => $ts)),
-			array('Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
-			array('Post' => array('id' => '4', 'author_id' => '2', 'title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
-		$data = array(
-			array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		);
-		$result = $TestModel->saveAll($data);
-		$this->assertEqual($result, false);
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$errors = array(1 => array('title' => 'This field cannot be left blank'));
-		$transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result);
-		if (!$transactionWorked) {
-			$this->assertTrue(Set::matches('/Post[1][title=Un-Baleeted First Post]', $result));
-			$this->assertTrue(Set::matches('/Post[2][title=Just update the title]', $result));
-		}
-
-		$this->assertEqual($TestModel->validationErrors, $errors);
-
-		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
-		$data = array(
-			array('id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		);
-		$result = $TestModel->saveAll($data, array('atomic' => false));
-		$this->assertEqual($result, array(true, false));
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$errors = array(1 => array('title' => 'This field cannot be left blank'));
-		$newTs = date('Y-m-d H:i:s');
-		$expected = array(
-			array('Post' => array('id' => '1', 'author_id' => '1', 'title' => 'Un-Baleeted First Post', 'body' => 'Not Baleeted!', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => $newTs)),
-			array('Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Just update the title', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => $ts)),
-			array('Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')),
-			array('Post' => array('id' => '4', 'author_id' => '2', 'title' => 'Creating a fourth post', 'body' => 'Fourth post body', 'published' => 'N', 'created' => $ts, 'updated' => $ts))
-		);
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->validationErrors, $errors);
-
-		$data = array(
-			array('id' => '1', 'title' => 'Re-Baleeted First Post', 'body' => 'Baleeted!', 'published' => 'N'),
-			array('id' => '2', 'title' => '', 'body' => 'Trying to get away with an empty title'),
-		);
-		$this->assertFalse($TestModel->saveAll($data, array('validate' => 'first')));
-
-		$result = $TestModel->find('all', array('recursive' => -1));
-		$this->assertEqual($result, $expected);
-		$this->assertEqual($TestModel->validationErrors, $errors);
-
-		$data = array(
-			array('title' => 'First new post', 'body' => 'Woohoo!', 'published' => 'Y'),
-			array('title' => 'Empty body', 'body' => '')
-		);
-		$TestModel->validate['body'] = 'notEmpty';
-	}
-/**
- * testSaveAllValidationOnly method
- *
- * @access public
- * @return void
- */
-	function testSaveAllValidationOnly() {
-		$TestModel =& new Comment();
-		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
-
-		$data = array(
-			'Comment' => array(
-				'comment' => 'This is the comment'
-			),
-			'Attachment' => array(
-				'attachment' => ''
-			)
-		);
-
-		$result = $TestModel->saveAll($data, array('validate' => 'only'));
-		$this->assertFalse($result);
-
-		$TestModel =& new Article();
-		$TestModel->validate = array('title' => 'notEmpty');
-		$result = $TestModel->saveAll(
-			array(
-				0 => array('title' => ''),
-				1 => array('title' => 'title 1'),
-				2 => array('title' => 'title 2'),
-			),
-			array('validate'=>'only')
-		);
-		$this->assertFalse($result);
-		$expected = array(
-			0 => array('title' => 'This field cannot be left blank'),
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-
-		$result = $TestModel->saveAll(
-			array(
-				0 => array('title' => 'title 0'),
-				1 => array('title' => ''),
-				2 => array('title' => 'title 2'),
-			),
-			array('validate'=>'only')
-		);
-		$this->assertFalse($result);
-		$expected = array(
-			1 => array('title' => 'This field cannot be left blank'),
-		);
-		$this->assertEqual($TestModel->validationErrors, $expected);
-	}
-/**
- * testSaveAllValidateFirst method
- *
- * @access public
- * @return void
- */
-	function testSaveAllValidateFirst() {
-		$model =& new Article();
-		$model->deleteAll(true);
-
-		$model->Comment->validate = array('comment' => 'notEmpty');
-		$result = $model->saveAll(array(
-			'Article' => array('title' => 'Post with Author', 'body' => 'This post will be saved  author'),
-			'Comment' => array(
-				array('comment' => 'First new comment'),
-				array('comment' => '')
-			)
-		), array('validate' => 'first'));
-		$this->assertFalse($result);
-
-		$result = $model->find('all');
-		$this->assertEqual($result, array());
-		$expected = array('Comment' => array(1 => array('comment' => 'This field cannot be left blank')));
-
-		$this->assertEqual($model->Comment->validationErrors, $expected['Comment']);
-
-		$this->assertIdentical($model->Comment->find('count'), 0);
-
-		$result = $model->saveAll(
-			array(
-				'Article' => array('title' => 'Post with Author', 'body' => 'This post will be saved with an author', 'user_id' => 2),
-				'Comment' => array(array('comment' => 'Only new comment', 'user_id' => 2))
-			),
-			array('validate' => 'first')
-		);
-		$this->assertIdentical($result, true);
-
-		$result = $model->Comment->find('all');
-		$this->assertIdentical(count($result), 1);
-		$result = Set::extract('/Comment/article_id', $result);
-		$this->assertTrue($result[0] === 1 || $result[0] === '1');
-
-
-		$model->deleteAll(true);
-		$data = array(
-			'Article' => array(
-				'title' => 'Post with Author saveAlled from comment',
-				'body' => 'This post will be saved with an author',
-				'user_id' => 2
-			),
-			'Comment' => array(
-				'comment' => 'Only new comment', 'user_id' => 2
-			)
-		);
-		$result = $model->Comment->saveAll($data, array('validate' => 'first'));
-		$this->assertTrue($result);
-
-		$result = $model->find('all');
-		$this->assertEqual($result[0]['Article']['title'], 'Post with Author saveAlled from comment');
-		$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
-	}
-/**
- * testSaveWithCounterCache method
- *
- * @access public
- * @return void
- */
-	function testSaveWithCounterCache() {
-		$this->loadFixtures('Syfile', 'Item');
-		$TestModel =& new Syfile();
-		$TestModel2 =& new Item();
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], null);
-
-		$TestModel2->save(array('name' => 'Item 7', 'syfile_id' => 1, 'published' => false));
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '2');
-
-		$TestModel2->delete(1);
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '1');
-
-		$TestModel2->id = 2;
-		$TestModel2->saveField('syfile_id', 1);
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '2');
-
-		$result = $TestModel->findById(2);
-		$this->assertIdentical($result['Syfile']['item_count'], '0');
-	}
-/**
- * Tests that counter caches are updated when records are added
- *
- * @access public
- * @return void
- */
-	function testCounterCacheIncrease() {
-		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
-		$User = new CounterCacheUser();
-		$Post = new CounterCachePost();
-		$data = array('Post' => array('title' => 'New Post', 'user_id' => 66));
-
-		$Post->save($data);
-		$user = $User->find('first', array(
-			'conditions' => array('id' => 66),'recursive' => -1
-		));
-
-		$result = $user[$User->alias]['post_count'];
-		$expected = 3;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * Tests that counter caches are updated when records are deleted
- *
- * @access public
- * @return void
- */
-	function testCounterCacheDecrease() {
-		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
-		$User = new CounterCacheUser();
-		$Post = new CounterCachePost();
-
-		$Post->del(2);
-		$user = $User->find('first', array(
-			'conditions' => array('id' => 66),'recursive' => -1
-		));
-
-		$result = $user[$User->alias]['post_count'];
-		$expected = 1;
-		$this->assertEqual($result, $expected);
-	}
-/**
- * Tests that counter caches are updated when foreign keys of counted records change
- *
- * @access public
- * @return void
- */
-	function testCounterCacheUpdated() {
-		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
-		$User = new CounterCacheUser();
-		$Post = new CounterCachePost();
-
-		$data = $Post->find('first', array(
-			'conditions' => array('id' => 1),'recursive' => -1
-		));
-		$data[$Post->alias]['user_id'] = 301;
-		$Post->save($data);
-
-		$users = $User->find('all',array('order' => 'User.id'));
-		$this->assertEqual($users[0]['User']['post_count'], 1);
-		$this->assertEqual($users[1]['User']['post_count'], 2);
-	}
-/**
- * Test counter cache with models that use a non-standard (i.e. not using 'id')
- * as their primary key.
- *
- * @access public
- * @return void
- */
-    function testCounterCacheWithNonstandardPrimaryKey() {
-        $this->loadFixtures(
-			'CounterCacheUserNonstandardPrimaryKey',
-			'CounterCachePostNonstandardPrimaryKey'
-		);
-
-        $User = new CounterCacheUserNonstandardPrimaryKey();
-        $Post = new CounterCachePostNonstandardPrimaryKey();
-
-		$data = $Post->find('first', array(
-			'conditions' => array('pid' => 1),'recursive' => -1
-		));
-		$data[$Post->alias]['uid'] = 301;
-		$Post->save($data);
-
-		$users = $User->find('all',array('order' => 'User.uid'));
-		$this->assertEqual($users[0]['User']['post_count'], 1);
-		$this->assertEqual($users[1]['User']['post_count'], 2);
-    }
-/**
- * test Counter Cache With Self Joining table
- *
- * @return void
- * @access public
- */
-	function testCounterCacheWithSelfJoin() {
-		$this->loadFixtures('CategoryThread');
-		$this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD column child_count INT(11) DEFAULT '0'");
-		$Category =& new CategoryThread();
-		$result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5));
-		$this->assertTrue($result);
-
-		$Category =& new CategoryThread();
-		$Category->belongsTo['ParentCategory']['counterCache'] = 'child_count';
-		$Category->updateCounterCache(array('parent_id' => 5));
-		$result = Set::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count');
-		$expected = array_fill(0, 1, 1);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveWithCounterCacheScope method
- *
- * @access public
- * @return void
- */
-	function testSaveWithCounterCacheScope() {
-		$this->loadFixtures('Syfile', 'Item');
-		$TestModel =& new Syfile();
-		$TestModel2 =& new Item();
-		$TestModel2->belongsTo['Syfile']['counterCache'] = true;
-		$TestModel2->belongsTo['Syfile']['counterScope'] = array('published' => true);
-
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], null);
-
-		$TestModel2->save(array('name' => 'Item 7', 'syfile_id' => 1, 'published'=> true));
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '1');
-
-		$TestModel2->id = 1;
-		$TestModel2->saveField('published', true);
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '2');
-
-		$TestModel2->save(array('id' => 1, 'syfile_id' => 1, 'published'=> false));
-		$result = $TestModel->findById(1);
-		$this->assertIdentical($result['Syfile']['item_count'], '1');
-	}
-/**
- * testDel method
- *
- * @access public
- * @return void
- */
-	function testDel() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		$result = $TestModel->del(2);
-		$this->assertTrue($result);
-
-		$result = $TestModel->read(null, 2);
-		$this->assertFalse($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'title' => 'First Article' )),
-			array('Article' => array('id' => 3, 'title' => 'Third Article' ))
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->del(3);
-		$this->assertTrue($result);
-
-		$result = $TestModel->read(null, 3);
-		$this->assertFalse($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'title' => 'First Article' ))
-		);
-		$this->assertEqual($result, $expected);
-
-
-		// make sure deleting a non-existent record doesn't break save()
-		// ticket #6293
-		$this->loadFixtures('Uuid');
-		$Uuid =& new Uuid();
-		$data = array(
-			'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3',
-			'52C8865C-10EE-4302-AE6C-6E7D8E12E2C8',
-			'8208C7FE-E89C-47C5-B378-DED6C271F9B8');
-		foreach ($data as $id) {
-			$Uuid->save(array('id' => $id));
-		}
-		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
-		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
-		foreach ($data as $id) {
-			$Uuid->save(array('id' => $id));
-		}
-		$result = $Uuid->find('all', array(
-			'conditions' => array('id' => $data),
-			'fields' => array('id'),
-			'order' => 'id'));
-		$expected = array(
-			array('Uuid' => array(
-				'id' => '52C8865C-10EE-4302-AE6C-6E7D8E12E2C8')),
-			array('Uuid' => array(
-				'id' => '8208C7FE-E89C-47C5-B378-DED6C271F9B8')),
-			array('Uuid' => array(
-				'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testDeleteAll method
- *
- * @access public
- * @return void
- */
-	function testDeleteAll() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-
-		$data = array('Article' => array('user_id' => 2, 'id' => 4, 'title' => 'Fourth Article', 'published' => 'N'));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$data = array('Article' => array('user_id' => 2, 'id' => 5, 'title' => 'Fifth Article', 'published' => 'Y'));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$data = array('Article' => array('user_id' => 1, 'id' => 6, 'title' => 'Sixth Article', 'published' => 'N'));
-		$result = $TestModel->set($data) && $TestModel->save();
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'user_id', 'title', 'published')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 4, 'user_id' => 2, 'title' => 'Fourth Article', 'published' => 'N' )),
-			array('Article' => array('id' => 5, 'user_id' => 2, 'title' => 'Fifth Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 6, 'user_id' => 1, 'title' => 'Sixth Article', 'published' => 'N' ))
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->deleteAll(array('Article.published' => 'N'));
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'user_id', 'title', 'published')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 5, 'user_id' => 2, 'title' => 'Fifth Article', 'published' => 'Y' ))
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->deleteAll(array('Article.user_id' => array(2, 3)), true, true);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = -1;
-		$result = $TestModel->find('all', array('fields' => array('id', 'user_id', 'title', 'published')));
-		$expected = array(
-			array('Article' => array('id' => 1, 'user_id' => 1, 'title' => 'First Article', 'published' => 'Y' )),
-			array('Article' => array('id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'published' => 'Y' ))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testRecursiveDel method
- *
- * @access public
- * @return void
- */
-	function testRecursiveDel() {
-		$this->loadFixtures('Article', 'Comment', 'Attachment');
-		$TestModel =& new Article();
-
-		$result = $TestModel->del(2);
-		$this->assertTrue($result);
-
-		$TestModel->recursive = 2;
-		$result = $TestModel->read(null, 2);
-		$this->assertFalse($result);
-
-		$result = $TestModel->Comment->read(null, 5);
-		$this->assertFalse($result);
-
-		$result = $TestModel->Comment->read(null, 6);
-		$this->assertFalse($result);
-
-		$result = $TestModel->Comment->Attachment->read(null, 1);
-		$this->assertFalse($result);
-
-		$result = $TestModel->find('count');
-		$this->assertEqual($result, 2);
-
-		$result = $TestModel->Comment->find('count');
-		$this->assertEqual($result, 4);
-
-		$result = $TestModel->Comment->Attachment->find('count');
-		$this->assertEqual($result, 0);
-	}
-/**
- * testDependentExclusiveDelete method
- *
- * @access public
- * @return void
- */
-	function testDependentExclusiveDelete() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article10();
-
-		$result = $TestModel->find('all');
-		$this->assertEqual(count($result[0]['Comment']), 4);
-		$this->assertEqual(count($result[1]['Comment']), 2);
-		$this->assertEqual($TestModel->Comment->find('count'), 6);
-
-		$TestModel->delete(1);
-		$this->assertEqual($TestModel->Comment->find('count'), 2);
-	}
-/**
- * testDeleteLinks method
- *
- * @access public
- * @return void
- */
-	function testDeleteLinks() {
-		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
-		$TestModel =& new Article();
-
-		$result = $TestModel->ArticlesTag->find('all');
-		$expected = array(
-			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '2')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->delete(1);
-		$result = $TestModel->ArticlesTag->find('all');
-
-		$expected = array(
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllThreaded method
- *
- * @access public
- * @return void
- */
-	function testFindAllThreaded() {
-		$this->loadFixtures('Category');
-		$TestModel =& new Category();
-
-		$result = $TestModel->find('threaded');
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '2',
-							'parent_id' => '1',
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))
-					),
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => '4',
-					'parent_id' => '0',
-					'name' => 'Category 2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('conditions' => array('Category.name LIKE' => 'Category 1%')));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '2',
-							'parent_id' => '1',
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))
-					),
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('fields' => 'id, parent_id, name'));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '2',
-							'parent_id' => '1',
-							'name' => 'Category 1.1'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2'),
-								'children' => array()))
-					),
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => '4',
-					'parent_id' => '0',
-					'name' => 'Category 2'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('order' => 'id DESC'));
-
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => 5,
-					'parent_id' => 0,
-					'name' => 'Category 3',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => 6,
-							'parent_id' => 5,
-							'name' => 'Category 3.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => 4,
-					'parent_id' => 0,
-					'name' => 'Category 2',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => 1,
-					'parent_id' => 0,
-					'name' => 'Category 1',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => 3,
-							'parent_id' => 1,
-							'name' => 'Category 1.2',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					),
-					array(
-						'Category' => array(
-							'id' => 2,
-							'parent_id' => 1,
-							'name' => 'Category 1.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array(
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('conditions' => array('Category.name LIKE' => 'Category 3%')));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3',
-					'created' => '2007-03-18 15:30:23',
-					'updated' => '2007-03-18 15:32:31'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1',
-							'created' => '2007-03-18 15:30:23',
-							'updated' => '2007-03-18 15:32:31'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('conditions' => array('Category.name LIKE' => 'Category 1.1%')));
-		$expected = array(
-				array('Category' =>
-					array(
-						'id' => '2',
-						'parent_id' => '1',
-						'name' => 'Category 1.1',
-						'created' => '2007-03-18 15:30:23',
-						'updated' => '2007-03-18 15:32:31'),
-						'children' => array(
-							array('Category' => array(
-								'id' => '7',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.1',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()),
-							array('Category' => array(
-								'id' => '8',
-								'parent_id' => '2',
-								'name' => 'Category 1.1.2',
-								'created' => '2007-03-18 15:30:23',
-								'updated' => '2007-03-18 15:32:31'),
-								'children' => array()))));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('fields' => 'id, parent_id, name', 'conditions' => array('Category.id !=' => 2)));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '1',
-					'parent_id' => '0',
-					'name' => 'Category 1'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '3',
-							'parent_id' => '1',
-							'name' => 'Category 1.2'
-						),
-						'children' => array()
-					)
-				)
-			),
-			array(
-				'Category' => array(
-					'id' => '4',
-					'parent_id' => '0',
-					'name' => 'Category 2'
-				),
-				'children' => array()
-			),
-			array(
-				'Category' => array(
-					'id' => '5',
-					'parent_id' => '0',
-					'name' => 'Category 3'
-				),
-				'children' => array(
-					array(
-						'Category' => array(
-							'id' => '6',
-							'parent_id' => '5',
-							'name' => 'Category 3.1'
-						),
-						'children' => array()
-					)
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('all', array('fields' => 'id, name, parent_id', 'conditions' => array('Category.id !=' => 1)));
-		$expected = array (
-			array ('Category' => array('id' => '2', 'name' => 'Category 1.1', 'parent_id' => '1' )),
-			array ('Category' => array('id' => '3', 'name' => 'Category 1.2', 'parent_id' => '1' )),
-			array ('Category' => array('id' => '4', 'name' => 'Category 2', 'parent_id' => '0' )),
-			array ('Category' => array('id' => '5', 'name' => 'Category 3', 'parent_id' => '0' )),
-			array ('Category' => array('id' => '6', 'name' => 'Category 3.1', 'parent_id' => '5' )),
-			array ('Category' => array('id' => '7', 'name' => 'Category 1.1.1', 'parent_id' => '2' )),
-			array ('Category' => array('id' => '8', 'name' => 'Category 1.1.2', 'parent_id' => '2' )),
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->find('threaded', array('fields' => 'id, parent_id, name', 'conditions' => array('Category.id !=' => 1)));
-		$expected = array(
-			array(
-				'Category' => array(
-					'id' => '2',
-					'parent_id' => '1',
-					'name' => 'Category 1.1'
-				),
-				'children' => array(
-					array('Category' => array(
-						'id' => '7',
-						'parent_id' => '2',
-						'name' => 'Category 1.1.1'),
-						'children' => array()),
-					array('Category' => array(
-						'id' => '8',
-						'parent_id' => '2',
-						'name' => 'Category 1.1.2'),
-						'children' => array()))
-			),
-			array(
-				'Category' => array(
-					'id' => '3',
-					'parent_id' => '1',
-					'name' => 'Category 1.2'
-				),
-				'children' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * test find('neighbors')
- *
- * @return void
- * @access public
- */
-	function testFindNeighbors() {
-		$this->loadFixtures('User', 'Article');
-		$TestModel =& new Article();
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors', array('fields' => array('id')));
-		$expected = array('prev' => null, 'next' => array('Article' => array('id' => 2)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors', array('fields' => array('id')));
-		$expected = array('prev' => array('Article' => array('id' => 1)), 'next' => array('Article' => array('id' => 3)));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors', array('fields' => array('id')));
-		$expected = array('prev' => array('Article' => array('id' => 2)), 'next' => null);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors', array('recursive' => -1));
-		$expected = array(
-			'prev' => null,
-			'next' => array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors', array('recursive' => -1));
-		$expected = array(
-			'prev' => array(
-				'Article' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				)
-			),
-			'next' => array(
-				'Article' => array(
-					'id' => 3,
-					'user_id' => 1,
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors', array('recursive' => -1));
-		$expected = array(
-			'prev' => array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			),
-			'next' => null
-		);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 0;
-		$TestModel->id = 1;
-		$one = $TestModel->read();
-		$TestModel->id = 2;
-		$two = $TestModel->read();
-		$TestModel->id = 3;
-		$three = $TestModel->read();
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors');
-		$expected = array('prev' => null, 'next' => $two);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors');
-		$expected = array('prev' => $one, 'next' => $three);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors');
-		$expected = array('prev' => $two, 'next' => null);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->recursive = 2;
-		$TestModel->id = 1;
-		$one = $TestModel->read();
-		$TestModel->id = 2;
-		$two = $TestModel->read();
-		$TestModel->id = 3;
-		$three = $TestModel->read();
-
-		$TestModel->id = 1;
-		$result = $TestModel->find('neighbors', array('recursive' => 2));
-		$expected = array('prev' => null, 'next' => $two);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 2;
-		$result = $TestModel->find('neighbors', array('recursive' => 2));
-		$expected = array('prev' => $one, 'next' => $three);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->id = 3;
-		$result = $TestModel->find('neighbors', array('recursive' => 2));
-		$expected = array('prev' => $two, 'next' => null);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * test findNeighbours() method
- *
- * @return void
- * @access public
- */
-	function testFindNeighboursLegacy() {
-		$this->loadFixtures('User', 'Article');
-		$TestModel =& new Article();
-
-		$result = $TestModel->findNeighbours(null, 'Article.id', '2');
-		$expected = array('prev' => array('Article' => array('id' => 1)), 'next' => array('Article' => array('id' => 3)));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->findNeighbours(null, 'Article.id', '3');
-		$expected = array('prev' => array('Article' => array('id' => 2)), 'next' => array());
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->findNeighbours(array('User.id' => 1), array('Article.id', 'Article.title'), 2);
-		$expected = array(
-			'prev' => array('Article' => array('id' => 1, 'title' => 'First Article')),
-			'next' => array('Article' => array('id' => 3, 'title' => 'Third Article')),
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindCombinedRelations method
- *
- * @access public
- * @return void
- */
-	function testFindCombinedRelations() {
-		$this->loadFixtures('Apple', 'Sample');
-		$TestModel =& new Apple();
-
-		$result = $TestModel->find('all');
-
-		$expected = array(
-			array('Apple' => array(
-				'id' => '1', 'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => null, 'apple_id' => null, 'name' => null),
-					'Child' => array(array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '1', 'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => '2', 'apple_id' => '2', 'name' => 'sample2' ),
-					'Child' => array(array('id' => '1',	'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						array('id' => '3', 'apple_id' => '2', 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-						array('id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => '3', 'apple_id' => '2', 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => '1', 'apple_id' => '3', 'name' => 'sample1'),
-					'Child' => array()),
-			array('Apple' => array(
-				'id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => '3', 'apple_id' => '4', 'name' => 'sample3'),
-					'Child' => array(array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => '4', 'apple_id' => '5', 'name' => 'sample4'),
-					'Child' => array(array('id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => null, 'apple_id' => null, 'name' => null),
-					'Child' => array(array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Sample' => array('id' => null, 'apple_id' => null, 'name' => null),
-					'Child' => array()));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveEmpty method
- *
- * @access public
- * @return void
- */
-	function testSaveEmpty() {
-		$this->loadFixtures('Thread');
-		$TestModel =& new Thread();
-		$data = array();
-		$expected = $TestModel->save($data);
-		$this->assertFalse($expected);
-	}
-	// function testBasicValidation() {
-	// 	$TestModel =& new ValidationTest1();
-	// 	$TestModel->testing = true;
-	// 	$TestModel->set(array('title' => '', 'published' => 1));
-	// 	$this->assertEqual($TestModel->invalidFields(), array('title' => 'This field cannot be left blank'));
-	//
-	// 	$TestModel->create();
-	// 	$TestModel->set(array('title' => 'Hello', 'published' => 0));
-	// 	$this->assertEqual($TestModel->invalidFields(), array('published' => 'This field cannot be left blank'));
-	//
-	// 	$TestModel->create();
-	// 	$TestModel->set(array('title' => 'Hello', 'published' => 1, 'body' => ''));
-	// 	$this->assertEqual($TestModel->invalidFields(), array('body' => 'This field cannot be left blank'));
-	// }
-/**
- * testFindAllWithConditionInChildQuery
- *
- * @todo external conditions like this are going to need to be revisited at some point
- * @access public
- * @return void
- */
-	function testFindAllWithConditionInChildQuery() {
-		$this->loadFixtures('Basket', 'FilmFile');
-
-		$TestModel =& new Basket();
-		$recursive = 3;
-		$result = $TestModel->find('all', compact('conditions', 'recursive'));
-		$expected = array(
-			array(
-				'Basket' => array(
-					'id' => 1,
-					'type' => 'nonfile',
-					'name' => 'basket1',
-					'object_id' => 1,
-					'user_id' => 1,
-				),
-				'FilmFile' => array(
-					'id' => '',
-					'name' => '',
-				)
-			),
-			array(
-				'Basket' => array(
-					'id' => 2,
-					'type' => 'file',
-					'name' => 'basket2',
-					'object_id' => 2,
-					'user_id' => 1,
-				),
-				'FilmFile' => array(
-					'id' => 2,
-					'name' => 'two',
-				)
-			),
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testFindAllWithConditionsHavingMixedDataTypes method
- *
- * @access public
- * @return void
- */
-	function testFindAllWithConditionsHavingMixedDataTypes() {
-		$this->loadFixtures('Article');
-		$TestModel =& new Article();
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				)
-			),
-			array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			)
-		);
-		$conditions = array('id' => array('1', 2));
-		$recursive = -1;
-		$result = $TestModel->find('all', compact('conditions', 'recursive'));
-		$this->assertEqual($result, $expected);
-
-
-		$conditions = array('id' => array('1', 2, '3.0'));
-		$result = $TestModel->find('all', compact('recursive', 'conditions'));
-		$expected = array(
-			array(
-				'Article' => array(
-					'id' => 1,
-					'user_id' => 1,
-					'title' => 'First Article',
-					'body' => 'First Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:39:23',
-					'updated' => '2007-03-18 10:41:31'
-				)
-			),
-			array(
-				'Article' => array(
-					'id' => 2,
-					'user_id' => 3,
-					'title' => 'Second Article',
-					'body' => 'Second Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:41:23',
-					'updated' => '2007-03-18 10:43:31'
-				)
-			),
-			array(
-				'Article' => array(
-					'id' => 3,
-					'user_id' => 1,
-					'title' => 'Third Article',
-					'body' => 'Third Article Body',
-					'published' => 'Y',
-					'created' => '2007-03-18 10:43:23',
-					'updated' => '2007-03-18 10:45:31'
-				)
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testMultipleValidation method
- *
- * @access public
- * @return void
- */
-	function testMultipleValidation() {
-		$TestModel =& new ValidationTest1();
-	}
-/**
- * Tests validation parameter order in custom validation methods
- *
- * @access public
- * @return void
- */
-	function testValidationParams() {
-		$TestModel =& new ValidationTest1();
-		$TestModel->validate['title'] = array('rule' => 'customValidatorWithParams', 'required' => true);
-		$TestModel->create(array('title' => 'foo'));
-		$TestModel->invalidFields();
-
-		$expected = array(
-			'data' => array('title' => 'foo'),
-			'validator' => array(
-				'rule' => 'customValidatorWithParams', 'on' => null,
-				'last' => false, 'allowEmpty' => false, 'required' => true
-			),
-			'or' => true,
-			'ignore_on_same' => 'id'
-		);
-		$this->assertEqual($TestModel->validatorParams, $expected);
-
-		$TestModel->validate['title'] = array('rule' => 'customValidatorWithMessage', 'required' => true);
-		$expected = array('title' => 'This field will *never* validate! Muhahaha!');
-		$this->assertEqual($TestModel->invalidFields(), $expected);
-	}
-/**
- * Tests validation parameter fieldList in invalidFields
- *
- * @access public
- * @return void
- */
-	function testInvalidFieldsWithFieldListParams() {
-		$TestModel =& new ValidationTest1();
-		$TestModel->validate = $validate = array(
-			'title' => array('rule' => 'customValidator', 'required' => true),
-			'name' => array('rule' => 'allowEmpty', 'required' => true),
-		);
-		$TestModel->invalidFields(array('fieldList' => array('title')));
-		$expected = array('title' => 'This field cannot be left blank');
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$TestModel->invalidFields(array('fieldList' => array('name')));
-		$expected = array('name' => 'This field cannot be left blank');
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$TestModel->invalidFields(array('fieldList' => array('name', 'title')));
-		$expected = array('name' => 'This field cannot be left blank', 'title' => 'This field cannot be left blank');
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$TestModel->whitelist = array('name');
-		$TestModel->invalidFields();
-		$expected = array('name' => 'This field cannot be left blank');
-		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
-
-		$this->assertEqual($TestModel->validate, $validate);
-	}
-/**
- * Tests validation parameter order in custom validation methods
- *
- * @access public
- * @return void
- */
-	function testAllowSimulatedFields() {
-		$TestModel =& new ValidationTest1();
-
-		$TestModel->create(array('title' => 'foo', 'bar' => 'baz'));
-		$expected = array('ValidationTest1' => array('title' => 'foo', 'bar' => 'baz'));
-		$this->assertEqual($TestModel->data, $expected);
-	}
-/**
- * Tests validation parameter order in custom validation methods
- *
- * @access public
- * @return void
- */
-	function testInvalidAssociation() {
-		$TestModel =& new ValidationTest1();
-		$this->assertNull($TestModel->getAssociated('Foo'));
-	}
-/**
- * testLoadModelSecondIteration method
- *
- * @access public
- * @return void
- */
-	function testLoadModelSecondIteration() {
-		$model = new ModelA();
-		$this->assertIsA($model,'ModelA');
-
-		$this->assertIsA($model->ModelB, 'ModelB');
-		$this->assertIsA($model->ModelB->ModelD, 'ModelD');
-
-		$this->assertIsA($model->ModelC, 'ModelC');
-		$this->assertIsA($model->ModelC->ModelD, 'ModelD');
-	}
-/**
- * testRecursiveUnbind method
- *
- * @access public
- * @return void
- */
-	function testRecursiveUnbind() {
-		$this->loadFixtures('Apple', 'Sample');
-		$TestModel =& new Apple();
-		$TestModel->recursive = 2;
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array('Apple' => array (
-				'id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' =>'', 'apple_id' => '', 'name' => ''),
-					'Child' => array(
-						array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-								'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-								'Child' => array(
-									array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-									array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-									array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Sample' => array(),
-						'Child' => array(
-							array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2',
-						'Apple' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17')),
-					'Child' => array(
-						array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-							'Sample' => array(),
-							'Child' => array(
-								array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-						array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-							'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1')),
-
-						array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-							'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3'),
-							'Child' => array(
-								array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1',
-						'Apple' => array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17')),
-					'Child' => array()),
-			array('Apple' => array(
-				'id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3',
-						'Apple' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17')),
-					'Child' => array(
-						array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-							'Sample' => array(),
-							'Child' => array(
-								array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4'),
-						'Child' => array(
-							array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4',
-						'Apple' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17')),
-					'Child' => array(
-						array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-							'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4'),
-							'Child' => array(
-								array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3'),
-						'Child' => array(
-							array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => ''),
-					'Child' => array(
-						array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-							'Sample' => array()))),
-			array('Apple' => array(
-				'id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-						'Sample' => array(),
-						'Child' => array(
-							array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => ''),
-					'Child' => array()));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array('Apple' => array(
-				'id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' =>'', 'apple_id' => '', 'name' => ''),
-					'Child' => array(
-						array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-								'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-								'Child' => array(
-									array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-									array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-									array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2',
-						'Apple' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17')),
-					'Child' => array(
-						array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-							'Sample' => array(),
-							'Child' => array(
-								array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-						array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-							'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1')),
-
-						array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-							'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3'),
-							'Child' => array(
-								array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1',
-						'Apple' => array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17')),
-					'Child' => array()),
-			array('Apple' => array(
-				'id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3',
-						'Apple' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17')),
-					'Child' => array(
-						array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-							'Sample' => array(),
-							'Child' => array(
-								array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4',
-						'Apple' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17')),
-					'Child' => array(
-						array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-							'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4'),
-							'Child' => array(
-								array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))))),
-			array('Apple' => array(
-				'id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => ''),
-					'Child' => array(
-						array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17',
-							'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-							'Sample' => array()))),
-			array('Apple' => array(
-				'id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => ''),
-					'Child' => array()));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(array('Apple' => array (
-				'id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' =>'', 'apple_id' => '', 'name' => '')),
-			array('Apple' => array(
-				'id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2',
-						'Apple' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1',
-						'Apple' => array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3',
-						'Apple' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4',
-						'Apple' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => '')),
-			array('Apple' => array(
-				'id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-						'Child' => array(
-							array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => '')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->Sample->unbindModel(array('belongsTo' => array('Apple')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(
-			array('Apple' => array(
-				'id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' =>'', 'apple_id' => '', 'name' => '')),
-			array('Apple' => array(
-				'id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Sample' => array(),
-						'Child' => array(
-							array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2')),
-			array('Apple' => array(
-				'id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1')),
-			array('Apple' => array(
-				'id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3')),
-			array('Apple' => array(
-				'id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4'),
-						'Child' => array(
-							array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4')),
-			array('Apple' => array(
-				'id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-						'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3'),
-						'Child' => array(
-							array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => '')),
-			array('Apple' => array(
-				'id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-						'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-						'Sample' => array(),
-						'Child' => array(
-							array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => '')));
-		$this->assertEqual($result, $expected);
-
-		$result = $TestModel->Parent->unbindModel(array('belongsTo' => array('Parent')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
-		$this->assertTrue($result);
-
-		$result = $TestModel->find('all');
-		$expected = array(array('Apple' => array (
-				'id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' =>'', 'apple_id' => '', 'name' => '')),
-			array('Apple' => array(
-				'id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17',
-						'Sample' => array(),
-						'Child' => array(
-							array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2',
-						'Apple' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 1, 'apple_id' => 3, 'name' => 'sample1',
-						'Apple' => array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 2, 'apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17',
-						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
-						'Child' => array(
-							array('id' => 1, 'apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
-							array('id' => 3, 'apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
-							array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3',
-						'Apple' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17',
-						'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4'),
-						'Child' => array(
-							array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => 4, 'apple_id' => 5, 'name' => 'sample4',
-						'Apple' => array('id' => 5, 'apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'))),
-			array('Apple' => array(
-				'id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 4, 'apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17',
-						'Sample' => array('id' => 3, 'apple_id' => 4, 'name' => 'sample3'),
-						'Child' => array(
-							array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => '')),
-			array('Apple' => array(
-				'id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'),
-					'Parent' => array('id' => 6, 'apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17',
-						'Sample' => array(),
-						'Child' => array(
-							array('id' => 7, 'apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17'))),
-					'Sample' => array('id' => '', 'apple_id' => '', 'name' => '')));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSelfAssociationAfterFind method
- *
- * @access public
- * @return void
- */
-	function testSelfAssociationAfterFind() {
-		$this->loadFixtures('Apple');
-		$afterFindModel = new NodeAfterFind();
-		$afterFindModel->recursive = 3;
-		$afterFindData = $afterFindModel->find('all');
-
-		$duplicateModel = new NodeAfterFind();
-		$duplicateModel->recursive = 3;
-		$duplicateModelData = $duplicateModel->find('all');
-
-		$noAfterFindModel = new NodeNoAfterFind();
-		$noAfterFindModel->recursive = 3;
-		$noAfterFindData = $noAfterFindModel->find('all');
-
-		$this->assertFalse($afterFindModel == $noAfterFindModel);
-		// Limitation of PHP 4 and PHP 5 > 5.1.6 when comparing recursive objects
-		if (PHP_VERSION === '5.1.6') {
-			$this->assertFalse($afterFindModel != $duplicateModel);
-		}
-		$this->assertEqual($afterFindData, $noAfterFindData);
-	}
-/**
- * testAutoSaveUuid method
- *
- * @access public
- * @return void
- */
-	function testAutoSaveUuid() {
-		// SQLite does not support non-integer primary keys, and SQL Server
-		// is still having problems with custom PK's
-		if ($this->db->config['driver'] == 'sqlite' || $this->db->config['driver'] == 'mssql') {
-			return;
-		}
-
-		$this->loadFixtures('Uuid');
-		$TestModel =& new Uuid();
-
-		$TestModel->save(array('title' => 'Test record'));
-		$result = $TestModel->findByTitle('Test record');
-		$this->assertEqual(array_keys($result['Uuid']), array('id', 'title', 'count', 'created', 'updated'));
-		$this->assertEqual(strlen($result['Uuid']['id']), 36);
-	}
-/**
- * testZeroDefaultFieldValue method
- *
- * @access public
- * @return void
- */
-	function testZeroDefaultFieldValue() {
-		$this->skipIf(
-			$this->db->config['driver'] == 'sqlite',
-			'%s SQLite uses loose typing, this operation is unsupported'
-		);
-		$this->loadFixtures('DataTest');
-		$TestModel =& new DataTest();
-
-		$TestModel->create(array());
-		$TestModel->save();
-		$result = $TestModel->findById($TestModel->id);
-		$this->assertIdentical($result['DataTest']['count'], '0');
-		$this->assertIdentical($result['DataTest']['float'], '0');
-	}
-/**
- * testNonNumericHabtmJoinKey method
- *
- * @access public
- * @return void
- */
-	function testNonNumericHabtmJoinKey() {
-		$this->loadFixtures('Post', 'Tag', 'PostsTag');
-		$Post =& new Post();
-		$Post->bind('Tag', array('type' => 'hasAndBelongsToMany'));
-		$Post->Tag->primaryKey = 'tag';
-
-		$result = $Post->find('all');
-		$expected = array(
-			array(
-				'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'Author' => array('id' => null, 'user' => null, 'password' => null, 'created' => null, 'updated' => null, 'test' => 'working'),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
-				)
-			),
-			array(
-				'Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'Author' => array('id' => null, 'user' => null, 'password' => null, 'created' => null, 'updated' => null, 'test' => 'working'),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-				)
-			),
-			array(
-				'Post' => array('id' => '3', 'author_id' => '1', 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'Author' => array('id' => null, 'user' => null, 'password' => null, 'created' => null, 'updated' => null, 'test' => 'working'),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testDeconstructFields method
- *
- * @access public
- * @return void
- */
-	function testDeconstructFields() {
-		$this->loadFixtures('Apple');
-		$TestModel =& new Apple();
-
-		//test null/empty values first
-		$data['Apple']['created']['year'] = '';
-		$data['Apple']['created']['month'] = '';
-		$data['Apple']['created']['day'] = '';
-		$data['Apple']['created']['hour'] = '';
-		$data['Apple']['created']['min'] = '';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['date']['year'] = '';
-		$data['Apple']['date']['month'] = '';
-		$data['Apple']['date']['day'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('date'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '';
-		$data['Apple']['mytime']['min'] = '';
-		$data['Apple']['mytime']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('mytime'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		//test other data variations
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '08';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '';
-		$data['Apple']['created']['min'] = '';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '2007-08-20 00:00:00'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '08';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '10';
-		$data['Apple']['created']['min'] = '12';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '2007-08-20 10:12:00'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '';
-		$data['Apple']['created']['day'] = '12';
-		$data['Apple']['created']['hour'] = '20';
-		$data['Apple']['created']['min'] = '';
-		$data['Apple']['created']['sec'] = '';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['hour'] = '20';
-		$data['Apple']['created']['min'] = '33';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['hour'] = '20';
-		$data['Apple']['created']['min'] = '33';
-		$data['Apple']['created']['sec'] = '33';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['hour'] = '13';
-		$data['Apple']['created']['min'] = '00';
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '', 'date'=> '2006-12-25'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '08';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '10';
-		$data['Apple']['created']['min'] = '12';
-		$data['Apple']['created']['sec'] = '09';
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '2007-08-20 10:12:09', 'date'=> '2006-12-25'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '--';
-		$data['Apple']['created']['month'] = '--';
-		$data['Apple']['created']['day'] = '--';
-		$data['Apple']['created']['hour'] = '--';
-		$data['Apple']['created']['min'] = '--';
-		$data['Apple']['created']['sec'] = '--';
-		$data['Apple']['date']['year'] = '--';
-		$data['Apple']['date']['month'] = '--';
-		$data['Apple']['date']['day'] = '--';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '', 'date'=> ''));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['created']['year'] = '2007';
-		$data['Apple']['created']['month'] = '--';
-		$data['Apple']['created']['day'] = '20';
-		$data['Apple']['created']['hour'] = '10';
-		$data['Apple']['created']['min'] = '12';
-		$data['Apple']['created']['sec'] = '09';
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('created'=> '', 'date'=> '2006-12-25'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['date']['year'] = '2006';
-		$data['Apple']['date']['month'] = '12';
-		$data['Apple']['date']['day'] = '25';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('date'=> '2006-12-25'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '03';
-		$data['Apple']['mytime']['min'] = '04';
-		$data['Apple']['mytime']['sec'] = '04';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '3';
-		$data['Apple']['mytime']['min'] = '4';
-		$data['Apple']['mytime']['sec'] = '4';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple' => array('mytime'=> '03:04:04'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$data = array();
-		$data['Apple']['mytime']['hour'] = '03';
-		$data['Apple']['mytime']['min'] = '4';
-		$data['Apple']['mytime']['sec'] = '4';
-
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
-		$this->assertEqual($TestModel->data, $expected);
-
-		$db = ConnectionManager::getDataSource('test_suite');
-		$data = array();
-		$data['Apple']['modified'] = $db->expression('NOW()');
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$this->assertEqual($TestModel->data, $data);
-
-		$data = array();
-		$data['Apple']['mytime'] = $db->expression('NOW()');
-		$TestModel->data = null;
-		$TestModel->set($data);
-		$this->assertEqual($TestModel->data, $data);
-	}
-/**
- * testTablePrefixSwitching method
- *
- * @access public
- * @return void
- */
-	function testTablePrefixSwitching() {
-		ConnectionManager::create('database1', array_merge($this->db->config, array('prefix' => 'aaa_')));
-		ConnectionManager::create('database2', array_merge($this->db->config, array('prefix' => 'bbb_')));
-
-		$db1 = ConnectionManager::getDataSource('database1');
-		$db2 = ConnectionManager::getDataSource('database2');
-
-		$TestModel = new Apple();
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
-
-		$TestModel->setDataSource('database2');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'bbb_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'bbb_apples');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'bbb_apples');
-
-		$TestModel = new Apple();
-		$TestModel->tablePrefix = 'custom_';
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'custom_apples');
-
-		$TestModel = new Apple();
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
-		$TestModel->tablePrefix = '';
-		$TestModel->setDataSource('database2');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
-
-		$TestModel->tablePrefix = null;
-		$TestModel->setDataSource('database1');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
-
-		$TestModel->tablePrefix = false;
-		$TestModel->setDataSource('database2');
-		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
-		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
-	}
-/**
- * testDynamicBehaviorAttachment method
- *
- * @access public
- * @return void
- */
-	function testDynamicBehaviorAttachment() {
-		$this->loadFixtures('Apple');
-		$TestModel =& new Apple();
-		$this->assertEqual($TestModel->Behaviors->attached(), array());
-
-		$TestModel->Behaviors->attach('Tree', array('left' => 'left_field', 'right' => 'right_field'));
-		$this->assertTrue(is_object($TestModel->Behaviors->Tree));
-		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
-
-		$expected = array(
-			'parent' => 'parent_id', 'left' => 'left_field', 'right' => 'right_field', 'scope' => '1 = 1',
-			'type' => 'nested', '__parentChange' => false, 'recursive' => -1
-		);
-		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
-
-		$expected['enabled'] = false;
-		$TestModel->Behaviors->attach('Tree', array('enabled' => false));
-		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
-		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
-
-		$TestModel->Behaviors->detach('Tree');
-		$this->assertEqual($TestModel->Behaviors->attached(), array());
-		$this->assertFalse(isset($TestModel->Behaviors->Tree));
-	}
-/**
- * Tests cross database joins.  Requires $test and $test2 to both be set in DATABASE_CONFIG
- * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
- * or one connection will step on the other.
- */
-	function testCrossDatabaseJoins() {
-		$config = new DATABASE_CONFIG();
-
-		if (!isset($config->test) || !isset($config->test2)) {
-			echo "
    Primary and secondary test databases not configured, skipping cross-database join tests
    ";
-			echo "To run these tests, you must define \$test and \$test2 in your database configuration.
    ";
-			return;
-		}
-		$this->loadFixtures('Article', 'Tag', 'ArticlesTag', 'User', 'Comment');
-		$TestModel =& new Article();
-
-		$expected = array(
-			array(
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Comment' => array(
-					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-					array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
-					array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-					array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31')
-				),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
-				)
-			),
-			array(
-				'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
-				'User' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
-				'Comment' => array(
-					array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
-					array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
-				),
-				'Tag' => array(
-					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
-					array('id' => '3', 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
-				)
-			),
-			array(
-				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Comment' => array(),
-				'Tag' => array()
-			)
-		);
-		$this->assertEqual($TestModel->find('all'), $expected);
-
-		$db2 =& ConnectionManager::getDataSource('test2');
-
-		foreach (array('User', 'Comment') as $class) {
-			$this->_fixtures[$this->_fixtureClassMap[$class]]->create($db2);
-			$this->_fixtures[$this->_fixtureClassMap[$class]]->insert($db2);
-			$this->db->truncate(Inflector::pluralize(Inflector::underscore($class)));
-		}
-
-		$this->assertEqual($TestModel->User->find('all'), array());
-		$this->assertEqual($TestModel->Comment->find('all'), array());
-		$this->assertEqual($TestModel->find('count'), 3);
-
-		$TestModel->User->setDataSource('test2');
-		$TestModel->Comment->setDataSource('test2');
-
-		$result = Set::extract($TestModel->User->find('all'), '{n}.User.id');
-		$this->assertEqual($result, array('1', '2', '3', '4'));
-		$this->assertEqual($TestModel->find('all'), $expected);
-
-		$TestModel->Comment->unbindModel(array('hasOne' => array('Attachment')));
-		$expected = array(
-			array(
-				'Comment' => array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
-				'User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')
-			),
-			array(
-				'Comment' => array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
-				'User' => array('id' => '4', 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')
-			),
-			array(
-				'Comment' => array('id' => '3', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')
-			),
-			array(
-				'Comment' => array('id' => '4', 'article_id' => '1', 'user_id' => '1', 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31')
-			),
-			array(
-				'Comment' => array('id' => '5', 'article_id' => '2', 'user_id' => '1', 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
-				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
-				'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')
-			),
-			array(
-				'Comment' => array('id' => '6', 'article_id' => '2', 'user_id' => '2', 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'),
-				'User' => array('id' => '2', 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
-				'Article' => array('id' => '2', 'user_id' => '3', 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')
-			)
-		);
-		$this->assertEqual($TestModel->Comment->find('all'), $expected);
-
-		foreach (array('User', 'Comment') as $class) {
-			$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
-		}
-	}
-/**
- * testDisplayField method
- *
- * @access public
- * @return void
- */
-	function testDisplayField() {
-		$this->loadFixtures('Post', 'Comment', 'Person');
-		$Post = new Post();
-		$Comment = new Comment();
-		$Person = new Person();
-
-		$this->assertEqual($Post->displayField, 'title');
-		$this->assertEqual($Person->displayField, 'name');
-		$this->assertEqual($Comment->displayField, 'id');
-	}
-/**
- * testSchema method
- *
- * @access public
- * @return void
- */
-	function testSchema() {
-		$Post = new Post();
-
-		$result = $Post->schema();
-		$columns = array('id', 'author_id', 'title', 'body', 'published', 'created', 'updated');
-		$this->assertEqual(array_keys($result), $columns);
-
-		$types = array('integer', 'integer', 'string', 'text', 'string', 'datetime', 'datetime');
-		$this->assertEqual(Set::extract(array_values($result), '{n}.type'), $types);
-
-		$result = $Post->schema('body');
-		$this->assertEqual($result['type'], 'text');
-		$this->assertNull($Post->schema('foo'));
-
-		$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
-	}
-/**
- * testOldQuery method
- *
- * @access public
- * @return void
- */
-	function testOldQuery() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-
-		$query = 'SELECT title FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.id IN (1,2)';
-		$results = $Article->query($query);
-		$this->assertTrue(is_array($results));
-		$this->assertEqual(count($results), 2);
-
-		$query = 'SELECT title, body FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.id = 1';
-		$results = $Article->query($query, false);
-		$this->assertTrue(!isset($this->db->_queryCache[$query]));
-		$this->assertTrue(is_array($results));
-
-		$query = 'SELECT title, id FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.published = ' . $this->db->value('Y');
-		$results = $Article->query($query, true);
-		$this->assertTrue(isset($this->db->_queryCache[$query]));
-		$this->assertTrue(is_array($results));
-	}
-/**
- * testPreparedQuery method
- *
- * @access public
- * @return void
- */
-	function testPreparedQuery() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-		$this->db->_queryCache = array();
-
-		$finalQuery = 'SELECT title, published FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.id = ' . $this->db->value(1) . ' AND ' . $this->db->fullTableName('articles') . '.published = ' . $this->db->value('Y');
-
-		$query = 'SELECT title, published FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.id = ? AND ' . $this->db->fullTableName('articles') . '.published = ?';
-
-		$params = array(1, 'Y');
-		$result = $Article->query($query, $params);
-		$expected = array('0' => array($this->db->fullTableName('articles', false) => array('title' => 'First Article', 'published' => 'Y')));
-		if (isset($result[0][0])) {
-			$expected[0][0] = $expected[0][$this->db->fullTableName('articles', false)];
-			unset($expected[0][$this->db->fullTableName('articles', false)]);
-		}
-		$this->assertEqual($result, $expected);
-		$this->assertTrue(isset($this->db->_queryCache[$finalQuery]));
-
-		$finalQuery = 'SELECT id, created FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.title = ' . $this->db->value('First Article');
-		$query = 'SELECT id, created FROM ' . $this->db->fullTableName('articles') . '  WHERE ' . $this->db->fullTableName('articles') . '.title = ?';
-		$params = array('First Article');
-		$result = $Article->query($query, $params, false);
-		$this->assertTrue(is_array($result));
-		$this->assertTrue(isset($result[0][$this->db->fullTableName('articles', false)]) || isset($result[0][0]));
-		$this->assertFalse(isset($this->db->_queryCache[$finalQuery]));
-
-		$query = 'SELECT title FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.title LIKE ?';
-		$params = array('%First%');
-		$result = $Article->query($query, $params);
-		$this->assertTrue(is_array($result));
-		$this->assertTrue(
-			isset($result[0][$this->db->fullTableName('articles', false)]['title']) ||
-			isset($result[0][0]['title'])
-		);
-
-		//related to ticket #5035
-		$query = 'SELECT title FROM ' . $this->db->fullTableName('articles') . ' WHERE title = ? AND published = ?';
-		$params = array('First? Article', 'Y');
-		$Article->query($query, $params);
-		$expected = 'SELECT title FROM ' . $this->db->fullTableName('articles') . " WHERE title = 'First? Article' AND published = 'Y'";
-		$this->assertTrue(isset($this->db->_queryCache[$expected]));
-
-	}
-/**
- * testParameterMismatch method
- *
- * @access public
- * @return void
- */
-	function testParameterMismatch() {
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-
-		$query = 'SELECT * FROM ' . $this->db->fullTableName('articles') . ' WHERE ' . $this->db->fullTableName('articles') . '.published = ? AND ' . $this->db->fullTableName('articles') . '.user_id = ?';
-		$params = array('Y');
-		$this->expectError();
-		ob_start();
-		$result = $Article->query($query, $params);
-		ob_end_clean();
-		$this->assertEqual($result, null);
-	}
-/**
- * testVeryStrangeUseCase method
- *
- * @access public
- * @return void
- */
-	function testVeryStrangeUseCase() {
-		if ($this->db->config['driver'] == 'mssql') {
-			return;
-		}
-
-		$this->loadFixtures('Article');
-		$Article =& new Article();
-
-		$query = 'SELECT * FROM ? WHERE ? = ? AND ? = ?';
-		$param = array($this->db->fullTableName('articles'), $this->db->fullTableName('articles') . '.user_id', '3', $this->db->fullTableName('articles') . '.published', 'Y');
-		$this->expectError();
-		ob_start();
-		$result = $Article->query($query, $param);
-		ob_end_clean();
-	}
-/**
- * testUnderscoreFieldSave method
- *
- * @access public
- * @return void
- */
-	function testUnderscoreFieldSave() {
-		$this->loadFixtures('UnderscoreField');
-		$UnderscoreField =& new UnderscoreField();
-
-		$currentCount = $UnderscoreField->find('count');
-		$this->assertEqual($currentCount, 3);
-		$data = array('UnderscoreField' => array(
-			'user_id' => '1',
-			'my_model_has_a_field' => 'Content here',
-			'body' => 'Body',
-			'published' => 'Y',
-			'another_field' => 4
-		));
-		$ret = $UnderscoreField->save($data);
-		$this->assertTrue($ret);
-
-		$currentCount = $UnderscoreField->find('count');
-		$this->assertEqual($currentCount, 4);
-	}
-/**
- * testGroupBy method
- *
- * These tests will never pass with Postgres or Oracle as all fields in a select must be
- * part of an aggregate function or in the GROUP BY statement.
- *
- * @access public
- * @return void
- */
-	function testGroupBy() {
-		$db = ConnectionManager::getDataSource('test_suite');
-		$isStrictGroupBy = in_array($db->config['driver'], array('postgres', 'oracle'));
-		if ($this->skipIf($isStrictGroupBy, '%s Postgresql and Oracle have strict GROUP BY and are incompatible with this test.')) {
-			return;
-		}
-
-		$this->loadFixtures('Project', 'Product', 'Thread', 'Message', 'Bid');
-		$Thread =& new Thread();
-		$Product =& new Product();
-
-		$result = $Thread->find('all', array(
-			'group' => 'Thread.project_id'
-		));
-
-		$expected = array(
-			array(
-				'Thread' => array('id' => 1, 'project_id' => 1, 'name' => 'Project 1, Thread 1'),
-				'Project' => array('id' => 1, 'name' => 'Project 1'),
-				'Message' => array(array('id' => 1, 'thread_id' => 1, 'name' => 'Thread 1, Message 1')),
-			),
-			array(
-				'Thread' => array('id' => 3, 'project_id' => 2, 'name' => 'Project 2, Thread 1'),
-				'Project' => array('id' => 2, 'name' => 'Project 2'),
-				'Message' => array(array('id' => 3, 'thread_id' => 3, 'name' => 'Thread 3, Message 1')),
-			),
-		);
-		$this->assertEqual($result, $expected);
-
-		$rows = $Thread->find('all', array(
-			'group' => 'Thread.project_id', 'fields' => array('Thread.project_id', 'COUNT(*) AS total')
-		));
-		$result = array();
-		foreach($rows as $row) {
-			$result[$row['Thread']['project_id']] = $row[0]['total'];
-		}
-		$expected = array(
-			1 => 2,
-			2 => 1
-		);
-		$this->assertEqual($result, $expected);
-
-		$rows = $Thread->find('all', array(
-			'group' => 'Thread.project_id', 'fields' => array('Thread.project_id', 'COUNT(*) AS total'), 'order'=> 'Thread.project_id'
-		));
-		$result = array();
-		foreach($rows as $row) {
-			$result[$row['Thread']['project_id']] = $row[0]['total'];
-		}
-		$expected = array(
-			1 => 2,
-			2 => 1
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1), 'group' => 'Thread.project_id')
-		);
-		$expected = array(
-			array(
-				'Thread' => array('id' => 1, 'project_id' => 1, 'name' => 'Project 1, Thread 1'),
-				'Project' => array('id' => 1, 'name' => 'Project 1'),
-				'Message' => array(array('id' => 1, 'thread_id' => 1, 'name' => 'Thread 1, Message 1')),
-			)
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1), 'group' => 'Thread.project_id, Project.id')
-		);
-		$this->assertEqual($result, $expected);
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1), 'group' => 'project_id')
-		);
-		$this->assertEqual($result, $expected);
-
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1), 'group' => array('project_id'))
-		);
-		$this->assertEqual($result, $expected);
-
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1), 'group' => array('project_id', 'Project.id'))
-		);
-		$this->assertEqual($result, $expected);
-
-
-		$result = $Thread->find('all', array(
-			'conditions' => array('Thread.project_id' => 1), 'group' => array('Thread.project_id', 'Project.id'))
-		);
-		$this->assertEqual($result, $expected);
-
-
-		$expected = array(
-			array('Product' => array('type' => 'Clothing'), array('price' => 32)),
-			array('Product' => array('type' => 'Food'), array('price' => 9)),
-			array('Product' => array('type' => 'Music'), array( 'price' => 4)),
-			array('Product' => array('type' => 'Toy'), array('price' => 3))
-		);
-		$result = $Product->find('all',array('fields'=>array('Product.type','MIN(Product.price) as price'), 'group'=> 'Product.type'));
-		$this->assertEqual($result, $expected);
-
-		$result = $Product->find('all', array('fields'=>array('Product.type','MIN(Product.price) as price'), 'group'=> array('Product.type')));
-		$this->assertEqual($result, $expected);
-	}
-	/**
- * testSaveDateAsFirstEntry method
- *
- * @access public
- * @return void
- */
-	function testSaveDateAsFirstEntry() {
-		$this->loadFixtures('Article');
-
-		$Article =& new Article();
-
-		$data = array('Article' => array(
-			'created' => array(
-				'day' => '1', 'month' => '1', 'year' => '2008'
-			),
-			'title' => 'Test Title',
-			// schreck - Jul 30, 2008 - should this be set to something else?
-			'user_id' => 1
-		));
-		$Article->create();
-		$this->assertTrue($Article->save($data));
-
-		$testResult = $Article->find(array('Article.title' => 'Test Title'));
-
-		$this->assertEqual($testResult['Article']['title'], $data['Article']['title']);
-		$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
-
-	}
-/**
- * testDeleteDependentWithConditions method
- *
- * @access public
- * @return void
- */
-	function testDeleteDependentWithConditions() {
-		$this->loadFixtures('Cd','Book','OverallFavorite');
-
-		$Cd =& new Cd();
-		$OverallFavorite =& new OverallFavorite();
-
-		$Cd->del(1);
-
-		$result = $OverallFavorite->find('all', array('fields' => array('model_type', 'model_id', 'priority')));
-		$expected = array(array('OverallFavorite' => array('model_type' => 'Book', 'model_id' => 1, 'priority' => 2)));
-
-		$this->assertTrue(is_array($result));
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testSaveAllHasManyValidationOnly method
- *
- * @access public
- * @return void
- */
-	function testSaveAllHasManyValidationOnly() {
-		$this->loadFixtures('Article', 'Comment');
-		$TestModel =& new Article();
-		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
-		$TestModel->Comment->validate = array('comment' => 'notEmpty');
-
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array('id' => 1, 'comment' => '', 'published' => 'Y', 'user_id' => 1),
-					array('id' => 2, 'comment' => 'comment', 'published' => 'Y', 'user_id' => 1),
-				)
-			),
-			array('validate' => 'only')
-		);
-		$this->assertFalse($result);
-
-		$result = $TestModel->saveAll(
-			array(
-				'Article' => array('id' => 2),
-				'Comment' => array(
-					array('id' => 1, 'comment' => '', 'published' => 'Y', 'user_id' => 1),
-					array('id' => 2, 'comment' => 'comment', 'published' => 'Y', 'user_id' => 1),
-					array('id' => 3, 'comment' => '', 'published' => 'Y', 'user_id' => 1),
-				)
-			),
-			array('validate' => 'only', 'atomic' => false)
-		);
-		$expected = array('Article' => true, 'Comment' => array(false, true, false));
-		$this->assertIdentical($result, $expected);
-
-		$expected = array('Comment' => array(
-			0 => array('comment' => 'This field cannot be left blank'),
-			2 => array('comment' => 'This field cannot be left blank')
-		));
-		$this->assertEqual($TestModel->validationErrors, $expected);
-
-		$expected = array(
-			0 => array('comment' => 'This field cannot be left blank'),
-			2 => array('comment' => 'This field cannot be left blank')
-		);
-		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
-	}
-/**
- * testPkInHabtmLinkModel method
- *
- * @access public
-	 * @return void
- */
-	function testPkInHabtmLinkModel() {
-		//Test Nonconformant Models
-		$this->loadFixtures('Content', 'ContentAccount', 'Account');
-		$TestModel =& new Content();
-		$this->assertEqual($TestModel->ContentAccount->primaryKey, 'iContentAccountsId');
-
-		//test conformant models with no PK in the join table
-		$this->loadFixtures('Article', 'Tag');
-		$TestModel2 =& new Article();
-		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
-
-		//test conformant models with PK in join table
-		$this->loadFixtures('Item', 'Portfolio', 'ItemsPortfolio');
-		$TestModel3 =& new Portfolio();
-		$this->assertEqual($TestModel3->ItemsPortfolio->primaryKey, 'id');
-
-		//test conformant models with PK in join table - join table contains extra field
-		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
-		$TestModel4 =& new JoinA();
-		$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
-
-	}
-/**
- * testInsertAnotherHabtmRecordWithSameForeignKey method
- *
- * @access public
- * @return void
- */
-	function testInsertAnotherHabtmRecordWithSameForeignKey() {
-		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
-		$TestModel = new JoinA();
-
-		$result = $TestModel->JoinAsJoinB->findById(1);
-		$expected = array('JoinAsJoinB' => array('id' => 1, 'join_a_id' => 1, 'join_b_id' => 2, 'other' => 'Data for Join A 1 Join B 2', 'created' => '2008-01-03 10:56:33', 'updated' => '2008-01-03 10:56:33'));
-		$this->assertEqual($result, $expected);
-
-		$TestModel->JoinAsJoinB->create();
-		$result = $TestModel->JoinAsJoinB->save(array('join_a_id' => 1, 'join_b_id' => 1, 'other' => 'Data for Join A 1 Join B 1', 'created' => '2008-01-03 10:56:44', 'updated' => '2008-01-03 10:56:44'));
-		$this->assertTrue($result);
-		$lastInsertId = $TestModel->JoinAsJoinB->getLastInsertID();
-		$this->assertTrue($lastInsertId != null);
-
-		$result = $TestModel->JoinAsJoinB->findById(1);
-		$expected = array('JoinAsJoinB' => array('id' => 1, 'join_a_id' => 1, 'join_b_id' => 2, 'other' => 'Data for Join A 1 Join B 2', 'created' => '2008-01-03 10:56:33', 'updated' => '2008-01-03 10:56:33'));
-		$this->assertEqual($result, $expected);
-
-		$updatedValue = 'UPDATED Data for Join A 1 Join B 2';
-		$TestModel->JoinAsJoinB->id = 1;
-		$result = $TestModel->JoinAsJoinB->saveField('other', $updatedValue, false);
-		$this->assertTrue($result);
-
-		$result = $TestModel->JoinAsJoinB->findById(1);
-		$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
-	}
-/**
- * Tests that $cacheSources can only be disabled in the db using model settings, not enabled
- *
- * @access public
- * @return void
- */
-	function testCacheSourcesDisabling() {
-		$this->db->cacheSources = true;
-		$TestModel = new JoinA();
-		$TestModel->cacheSources = false;
-		$TestModel->setSource('join_as');
-		$this->assertFalse($this->db->cacheSources);
-
-		$this->db->cacheSources = false;
-		$TestModel = new JoinA();
-		$TestModel->cacheSources = true;
-		$TestModel->setSource('join_as');
-		$this->assertFalse($this->db->cacheSources);
-	}
-/**
- * testDeleteHabtmReferenceWithConditions method
- *
- * @access public
- * @return void
- */
-	function testDeleteHabtmReferenceWithConditions() {
-		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio');
-
-		$Portfolio =& new Portfolio();
-		$Portfolio->hasAndBelongsToMany['Item']['conditions'] = array('ItemsPortfolio.item_id >' => 1);
-
-		$result = $Portfolio->find('first', array('conditions' => array('Portfolio.id' => 1)));
-		$expected = array(
-			array('id' => 3, 'syfile_id' => 3, 'published' => 0, 'name' => 'Item 3', 'ItemsPortfolio' => array('id' => 3, 'item_id' => 3, 'portfolio_id' => 1)),
-			array('id' => 4, 'syfile_id' => 4, 'published' => 0, 'name' => 'Item 4', 'ItemsPortfolio' => array('id' => 4, 'item_id' => 4, 'portfolio_id' => 1)),
-			array('id' => 5, 'syfile_id' => 5, 'published' => 0, 'name' => 'Item 5', 'ItemsPortfolio' => array('id' => 5, 'item_id' => 5, 'portfolio_id' => 1)),
-		);
-		$this->assertEqual($result['Item'], $expected);
-
-		$result = $Portfolio->ItemsPortfolio->find('all', array('conditions' => array('ItemsPortfolio.portfolio_id' => 1)));
-		$expected = array(
-			array('ItemsPortfolio' => array('id' => 1, 'item_id' => 1, 'portfolio_id' => 1)),
-			array('ItemsPortfolio' => array('id' => 3, 'item_id' => 3, 'portfolio_id' => 1)),
-			array('ItemsPortfolio' => array('id' => 4, 'item_id' => 4, 'portfolio_id' => 1)),
-			array('ItemsPortfolio' => array('id' => 5, 'item_id' => 5, 'portfolio_id' => 1))
-		);
-		$this->assertEqual($result, $expected);
-
-		$Portfolio->delete(1);
-
-		$result = $Portfolio->find('first', array('conditions' => array('Portfolio.id' => 1)));
-		$this->assertFalse($result);
-
-		$result = $Portfolio->ItemsPortfolio->find('all', array('conditions' => array('ItemsPortfolio.portfolio_id' => 1)));
-		$this->assertFalse($result);
-	}
-/**
- * testDeleteArticleBLinks method
- *
- * @access public
- * @return void
- */
-	function testDeleteArticleBLinks() {
-		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
-		$TestModel =& new ArticleB();
-
-		$result = $TestModel->ArticlesTag->find('all');
-		$expected = array(
-			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '2')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
-			);
-		$this->assertEqual($result, $expected);
-
-		$TestModel->delete(1);
-		$result = $TestModel->ArticlesTag->find('all');
-
-		$expected = array(
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
-			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
-		);
-		$this->assertEqual($result, $expected);
-	}
-/**
- * testPkInHAbtmLinkModelArticleB
- *
- * @access public
- * @return void
- */
-	function testPkInHabtmLinkModelArticleB() {
-		$this->loadFixtures('Article', 'Tag');
-		$TestModel2 =& new ArticleB();
-		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
-	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/cake/tests/cases/libs/model/model_delete.test.php
new file mode 100644
index 000000000..6d30d2bdf
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_delete.test.php
@@ -0,0 +1,571 @@
+
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_delete.test.php';
+/**
+ * ModelDeleteTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelDeleteTest extends BaseModelTest {
+/**
+ * testDeleteHabtmReferenceWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteHabtmReferenceWithConditions() {
+		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio');
+
+		$Portfolio =& new Portfolio();
+		$Portfolio->hasAndBelongsToMany['Item']['conditions'] = array('ItemsPortfolio.item_id >' => 1);
+
+		$result = $Portfolio->find('first', array(
+			'conditions' => array('Portfolio.id' => 1)
+		));
+		$expected = array(
+			array(
+				'id' => 3,
+				'syfile_id' => 3,
+				'published' => 0,
+				'name' => 'Item 3',
+				'ItemsPortfolio' => array(
+					'id' => 3,
+					'item_id' => 3,
+					'portfolio_id' => 1
+			)),
+			array(
+				'id' => 4,
+				'syfile_id' => 4,
+				'published' => 0,
+				'name' => 'Item 4',
+				'ItemsPortfolio' => array(
+					'id' => 4,
+					'item_id' => 4,
+					'portfolio_id' => 1
+			)),
+			array(
+				'id' => 5,
+				'syfile_id' => 5,
+				'published' => 0,
+				'name' => 'Item 5',
+				'ItemsPortfolio' => array(
+					'id' => 5,
+					'item_id' => 5,
+					'portfolio_id' => 1
+		)));
+		$this->assertEqual($result['Item'], $expected);
+
+		$result = $Portfolio->ItemsPortfolio->find('all', array(
+			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
+		));
+		$expected = array(
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 1,
+					'item_id' => 1,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 3,
+					'item_id' => 3,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 4,
+					'item_id' => 4,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 5,
+					'item_id' => 5,
+					'portfolio_id' => 1
+		)));
+		$this->assertEqual($result, $expected);
+
+		$Portfolio->delete(1);
+
+		$result = $Portfolio->find('first', array(
+			'conditions' => array('Portfolio.id' => 1)
+		));
+		$this->assertFalse($result);
+
+		$result = $Portfolio->ItemsPortfolio->find('all', array(
+			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
+		));
+		$this->assertFalse($result);
+	}
+/**
+ * testDeleteArticleBLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteArticleBLinks() {
+		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
+		$TestModel =& new ArticleB();
+
+		$result = $TestModel->ArticlesTag->find('all');
+		$expected = array(
+			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '2')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
+			);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->delete(1);
+		$result = $TestModel->ArticlesTag->find('all');
+
+		$expected = array(
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDeleteDependentWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteDependentWithConditions() {
+		$this->loadFixtures('Cd','Book','OverallFavorite');
+
+		$Cd =& new Cd();
+		$OverallFavorite =& new OverallFavorite();
+
+		$Cd->del(1);
+
+		$result = $OverallFavorite->find('all', array(
+			'fields' => array('model_type', 'model_id', 'priority')
+		));
+		$expected = array(
+			array(
+				'OverallFavorite' => array(
+					'model_type' => 'Book',
+					'model_id' => 1,
+					'priority' => 2
+		)));
+
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testDel() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$result = $TestModel->del(2);
+		$this->assertTrue($result);
+
+		$result = $TestModel->read(null, 2);
+		$this->assertFalse($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'title')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->del(3);
+		$this->assertTrue($result);
+
+		$result = $TestModel->read(null, 3);
+		$this->assertFalse($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'title')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+
+		// make sure deleting a non-existent record doesn't break save()
+		// ticket #6293
+		$this->loadFixtures('Uuid');
+		$Uuid =& new Uuid();
+		$data = array(
+			'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3',
+			'52C8865C-10EE-4302-AE6C-6E7D8E12E2C8',
+			'8208C7FE-E89C-47C5-B378-DED6C271F9B8');
+		foreach ($data as $id) {
+			$Uuid->save(array('id' => $id));
+		}
+		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
+		$Uuid->del('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
+		foreach ($data as $id) {
+			$Uuid->save(array('id' => $id));
+		}
+		$result = $Uuid->find('all', array(
+			'conditions' => array('id' => $data),
+			'fields' => array('id'),
+			'order' => 'id'));
+		$expected = array(
+			array('Uuid' => array(
+				'id' => '52C8865C-10EE-4302-AE6C-6E7D8E12E2C8')),
+			array('Uuid' => array(
+				'id' => '8208C7FE-E89C-47C5-B378-DED6C271F9B8')),
+			array('Uuid' => array(
+				'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDeleteAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteAll() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$data = array('Article' => array(
+			'user_id' => 2,
+			'id' => 4,
+			'title' => 'Fourth Article',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Article' => array(
+			'user_id' => 2,
+			'id' => 5,
+			'title' => 'Fifth Article',
+			'published' => 'Y'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Article' => array(
+			'user_id' => 1,
+			'id' => 6,
+			'title' => 'Sixth Article',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y')),
+			array('Article' => array(
+				'id' => 4,
+				'user_id' => 2,
+				'title' => 'Fourth Article',
+				'published' => 'N'
+			)),
+			array('Article' => array(
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'Fifth Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 6,
+				'user_id' => 1,
+				'title' => 'Sixth Article',
+				'published' => 'N'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.published' => 'N'));
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'Fifth Article',
+				'published' => 'Y'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article.user_id' => array(2, 3));
+		$result = $TestModel->deleteAll($data, true, true);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
+	}
+/**
+ * testRecursiveDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveDel() {
+		$this->loadFixtures('Article', 'Comment', 'Attachment');
+		$TestModel =& new Article();
+
+		$result = $TestModel->del(2);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 2);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->read(null, 5);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->read(null, 6);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->Attachment->read(null, 1);
+		$this->assertFalse($result);
+
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 2);
+
+		$result = $TestModel->Comment->find('count');
+		$this->assertEqual($result, 4);
+
+		$result = $TestModel->Comment->Attachment->find('count');
+		$this->assertEqual($result, 0);
+	}
+/**
+ * testDependentExclusiveDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDependentExclusiveDelete() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article10();
+
+		$result = $TestModel->find('all');
+		$this->assertEqual(count($result[0]['Comment']), 4);
+		$this->assertEqual(count($result[1]['Comment']), 2);
+		$this->assertEqual($TestModel->Comment->find('count'), 6);
+
+		$TestModel->delete(1);
+		$this->assertEqual($TestModel->Comment->find('count'), 2);
+	}
+/**
+ * testDeleteLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteLinks() {
+		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
+		$TestModel =& new Article();
+
+		$result = $TestModel->ArticlesTag->find('all');
+		$expected = array(
+			array('ArticlesTag' => array(
+				'article_id' => '1',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '1',
+				'tag_id' => '2'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '3'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->delete(1);
+		$result = $TestModel->ArticlesTag->find('all');
+
+		$expected = array(
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '3'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
+	}
+/**
+ * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable() {
+
+		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
+		$ThePaper =& new ThePaper();
+		$ThePaper->id = 1;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper =& new ThePaper();
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->delete(1);
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/cake/tests/cases/libs/model/model_integration.test.php
new file mode 100644
index 000000000..e213187b6
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_integration.test.php
@@ -0,0 +1,1837 @@
+
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_integration.test.php';
+
+/**
+ * ModelIntegrationTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelIntegrationTest extends BaseModelTest {
+/**
+ * testPkInHAbtmLinkModelArticleB
+ *
+ * @access public
+ * @return void
+ */
+	function testPkInHabtmLinkModelArticleB() {
+		$this->loadFixtures('Article', 'Tag');
+		$TestModel2 =& new ArticleB();
+		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
+	}
+/**
+ * Tests that $cacheSources can only be disabled in the db using model settings, not enabled
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheSourcesDisabling() {
+		$this->db->cacheSources = true;
+		$TestModel = new JoinA();
+		$TestModel->cacheSources = false;
+		$TestModel->setSource('join_as');
+		$this->assertFalse($this->db->cacheSources);
+
+		$this->db->cacheSources = false;
+		$TestModel = new JoinA();
+		$TestModel->cacheSources = true;
+		$TestModel->setSource('join_as');
+		$this->assertFalse($this->db->cacheSources);
+	}
+/**
+ * testPkInHabtmLinkModel method
+ *
+ * @access public
+	 * @return void
+ */
+	function testPkInHabtmLinkModel() {
+		//Test Nonconformant Models
+		$this->loadFixtures('Content', 'ContentAccount', 'Account');
+		$TestModel =& new Content();
+		$this->assertEqual($TestModel->ContentAccount->primaryKey, 'iContentAccountsId');
+
+		//test conformant models with no PK in the join table
+		$this->loadFixtures('Article', 'Tag');
+		$TestModel2 =& new Article();
+		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
+
+		//test conformant models with PK in join table
+		$this->loadFixtures('Item', 'Portfolio', 'ItemsPortfolio');
+		$TestModel3 =& new Portfolio();
+		$this->assertEqual($TestModel3->ItemsPortfolio->primaryKey, 'id');
+
+		//test conformant models with PK in join table - join table contains extra field
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
+		$TestModel4 =& new JoinA();
+		$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
+
+	}
+/**
+ * testDynamicBehaviorAttachment method
+ *
+ * @access public
+ * @return void
+ */
+	function testDynamicBehaviorAttachment() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+		$this->assertEqual($TestModel->Behaviors->attached(), array());
+
+		$TestModel->Behaviors->attach('Tree', array('left' => 'left_field', 'right' => 'right_field'));
+		$this->assertTrue(is_object($TestModel->Behaviors->Tree));
+		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
+
+		$expected = array(
+			'parent' => 'parent_id',
+			'left' => 'left_field',
+			'right' => 'right_field',
+			'scope' => '1 = 1',
+			'type' => 'nested',
+			'__parentChange' => false,
+			'recursive' => -1
+		);
+
+		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
+
+		$expected['enabled'] = false;
+		$TestModel->Behaviors->attach('Tree', array('enabled' => false));
+		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
+		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
+
+		$TestModel->Behaviors->detach('Tree');
+		$this->assertEqual($TestModel->Behaviors->attached(), array());
+		$this->assertFalse(isset($TestModel->Behaviors->Tree));
+	}
+/**
+ * Tests cross database joins.  Requires $test and $test2 to both be set in DATABASE_CONFIG
+ * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
+ * or one connection will step on the other.
+ */
+	function testCrossDatabaseJoins() {
+		$config = new DATABASE_CONFIG();
+
+		$skip = $this->skipIf(
+			!isset($config->test) || !isset($config->test2),
+			 '%s Primary and secondary test databases not configured, skipping cross-database '
+			.'join tests.'
+			.' To run these tests, you must define $test and $test2 in your database configuration.'
+		);
+
+		if ($skip) {
+			return;
+		}
+
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag', 'User', 'Comment');
+		$TestModel =& new Article();
+
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+				)),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+				)),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+		));
+		$this->assertEqual($TestModel->find('all'), $expected);
+
+		$db2 =& ConnectionManager::getDataSource('test2');
+
+		foreach (array('User', 'Comment') as $class) {
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->create($db2);
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->insert($db2);
+			$this->db->truncate(Inflector::pluralize(Inflector::underscore($class)));
+		}
+
+		$this->assertEqual($TestModel->User->find('all'), array());
+		$this->assertEqual($TestModel->Comment->find('all'), array());
+		$this->assertEqual($TestModel->find('count'), 3);
+
+		$TestModel->User->setDataSource('test2');
+		$TestModel->Comment->setDataSource('test2');
+
+		foreach ($expected as $key => $value) {
+			unset($value['Comment'], $value['Tag']);
+			$expected[$key] = $value;
+		}
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->find('all');
+		$this->assertEqual($result, $expected);
+
+		foreach ($expected as $key => $value) {
+			unset($value['Comment'], $value['Tag']);
+			$expected[$key] = $value;
+		}
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->find('all');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->User->find('all'), '{n}.User.id');
+		$this->assertEqual($result, array('1', '2', '3', '4'));
+		$this->assertEqual($TestModel->find('all'), $expected);
+
+		$TestModel->Comment->unbindModel(array('hasOne' => array('Attachment')));
+		$expected = array(
+			array(
+				'Comment' => array(
+					'id' => '1',
+					'article_id' => '1',
+					'user_id' => '2',
+					'comment' => 'First Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:45:23',
+					'updated' => '2007-03-18 10:47:31'
+				),
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '2',
+					'article_id' => '1',
+					'user_id' => '4',
+					'comment' => 'Second Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:47:23',
+					'updated' => '2007-03-18 10:49:31'
+				),
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '3',
+					'article_id' => '1',
+					'user_id' => '1',
+					'comment' => 'Third Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:49:23',
+					'updated' => '2007-03-18 10:51:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '4',
+					'article_id' => '1',
+					'user_id' => '1',
+					'comment' => 'Fourth Comment for First Article',
+					'published' => 'N',
+					'created' => '2007-03-18 10:51:23',
+					'updated' => '2007-03-18 10:53:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+				),
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+		)));
+		$this->assertEqual($TestModel->Comment->find('all'), $expected);
+
+		foreach (array('User', 'Comment') as $class) {
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
+		}
+	}
+/**
+ * testDisplayField method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisplayField() {
+		$this->loadFixtures('Post', 'Comment', 'Person');
+		$Post = new Post();
+		$Comment = new Comment();
+		$Person = new Person();
+
+		$this->assertEqual($Post->displayField, 'title');
+		$this->assertEqual($Person->displayField, 'name');
+		$this->assertEqual($Comment->displayField, 'id');
+	}
+/**
+ * testSchema method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchema() {
+		$Post = new Post();
+
+		$result = $Post->schema();
+		$columns = array('id', 'author_id', 'title', 'body', 'published', 'created', 'updated');
+		$this->assertEqual(array_keys($result), $columns);
+
+		$types = array('integer', 'integer', 'string', 'text', 'string', 'datetime', 'datetime');
+		$this->assertEqual(Set::extract(array_values($result), '{n}.type'), $types);
+
+		$result = $Post->schema('body');
+		$this->assertEqual($result['type'], 'text');
+		$this->assertNull($Post->schema('foo'));
+
+		$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
+	}
+/**
+ * test deconstruct() with time fields.
+ *
+ * @return void
+ **/
+	function testDeconstructFieldsTime() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '';
+		$data['Apple']['mytime']['min'] = '';
+		$data['Apple']['mytime']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '';
+		$data['Apple']['mytime']['min'] = '';
+		$data['Apple']['mytime']['meridan'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> ''));
+		$this->assertEqual($TestModel->data, $expected, 'Empty values are not returning properly. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '12';
+		$data['Apple']['mytime']['min'] = '0';
+		$data['Apple']['mytime']['meridian'] = 'am';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '00:00:00'));
+		$this->assertEqual($TestModel->data, $expected, 'Midnight is not returning proper values. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '00';
+		$data['Apple']['mytime']['min'] = '00';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '00:00:00'));
+		$this->assertEqual($TestModel->data, $expected, 'Midnight is not returning proper values. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '03';
+		$data['Apple']['mytime']['min'] = '04';
+		$data['Apple']['mytime']['sec'] = '04';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '3';
+		$data['Apple']['mytime']['min'] = '4';
+		$data['Apple']['mytime']['sec'] = '4';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple' => array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '03';
+		$data['Apple']['mytime']['min'] = '4';
+		$data['Apple']['mytime']['sec'] = '4';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$db = ConnectionManager::getDataSource('test_suite');
+		$data = array();
+		$data['Apple']['mytime'] = $db->expression('NOW()');
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$this->assertEqual($TestModel->data, $data);
+	}
+/**
+ * testDeconstructFields with datetime, timestamp, and date fields
+ *
+ * @access public
+ * @return void
+ */
+	function testDeconstructFieldsDateTime() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+
+		//test null/empty values first
+		$data['Apple']['created']['year'] = '';
+		$data['Apple']['created']['month'] = '';
+		$data['Apple']['created']['day'] = '';
+		$data['Apple']['created']['hour'] = '';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['date']['year'] = '';
+		$data['Apple']['date']['month'] = '';
+		$data['Apple']['date']['day'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('date'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '2007-08-20 00:00:00'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '2007-08-20 10:12:00'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '';
+		$data['Apple']['created']['day'] = '12';
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '33';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '33';
+		$data['Apple']['created']['sec'] = '33';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '13';
+		$data['Apple']['created']['min'] = '00';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array(
+			'Apple'=> array(
+			'created'=> '',
+			'date'=> '2006-12-25'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '09';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array(
+			'Apple'=> array(
+				'created'=> '2007-08-20 10:12:09',
+				'date'=> '2006-12-25'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '--';
+		$data['Apple']['created']['month'] = '--';
+		$data['Apple']['created']['day'] = '--';
+		$data['Apple']['created']['hour'] = '--';
+		$data['Apple']['created']['min'] = '--';
+		$data['Apple']['created']['sec'] = '--';
+		$data['Apple']['date']['year'] = '--';
+		$data['Apple']['date']['month'] = '--';
+		$data['Apple']['date']['day'] = '--';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '', 'date'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '--';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '09';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '', 'date'=> '2006-12-25'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('date'=> '2006-12-25'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$db = ConnectionManager::getDataSource('test_suite');
+		$data = array();
+		$data['Apple']['modified'] = $db->expression('NOW()');
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$this->assertEqual($TestModel->data, $data);
+	}
+/**
+ * testTablePrefixSwitching method
+ *
+ * @access public
+ * @return void
+ */
+	function testTablePrefixSwitching() {
+		ConnectionManager::create('database1',
+				array_merge($this->db->config, array('prefix' => 'aaa_')
+		));
+		ConnectionManager::create('database2',
+			array_merge($this->db->config, array('prefix' => 'bbb_')
+		));
+
+		$db1 = ConnectionManager::getDataSource('database1');
+		$db2 = ConnectionManager::getDataSource('database2');
+
+		$TestModel = new Apple();
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
+
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'bbb_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'bbb_apples');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'bbb_apples');
+
+		$TestModel = new Apple();
+		$TestModel->tablePrefix = 'custom_';
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'custom_apples');
+
+		$TestModel = new Apple();
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
+		$TestModel->tablePrefix = '';
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
+
+		$TestModel->tablePrefix = null;
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
+
+		$TestModel->tablePrefix = false;
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
+	}
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidAssociation() {
+		$TestModel =& new ValidationTest1();
+		$this->assertNull($TestModel->getAssociated('Foo'));
+	}
+/**
+ * testLoadModelSecondIteration method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadModelSecondIteration() {
+		$model = new ModelA();
+		$this->assertIsA($model,'ModelA');
+
+		$this->assertIsA($model->ModelB, 'ModelB');
+		$this->assertIsA($model->ModelB->ModelD, 'ModelD');
+
+		$this->assertIsA($model->ModelC, 'ModelC');
+		$this->assertIsA($model->ModelC->ModelD, 'ModelD');
+	}
+/**
+ * ensure that __exists is reset on create
+ *
+ * @return void
+ **/
+	function testResetOfExistsOnCreate() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$Article->id = 1;
+		$Article->saveField('title', 'Reset me');
+		$Article->delete();
+		$Article->id = 1;
+		$this->assertFalse($Article->exists());
+
+		$Article->create();
+		$this->assertFalse($Article->exists());
+		$Article->id = 2;
+		$Article->saveField('title', 'Staying alive');
+		$result = $Article->read(null, 2);
+		$this->assertEqual($result['Article']['title'], 'Staying alive');
+	}
+/**
+ * testPluginAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginAssociations() {
+		$this->loadFixtures('TestPluginArticle', 'User', 'TestPluginComment');
+		$TestModel =& new TestPluginArticle();
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'TestPluginArticle' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Plugin Article',
+					'body' => 'First Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:39:23',
+					'updated' => '2008-09-24 10:41:31'
+				),
+				'User' => array(
+					'id' => 1,
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'TestPluginComment' => array(
+					array(
+						'id' => 1,
+						'article_id' => 1,
+						'user_id' => 2,
+						'comment' => 'First Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:45:23',
+						'updated' => '2008-09-24 10:47:31'
+					),
+					array(
+						'id' => 2,
+						'article_id' => 1,
+						'user_id' => 4,
+						'comment' => 'Second Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:47:23',
+						'updated' => '2008-09-24 10:49:31'
+					),
+					array(
+						'id' => 3,
+						'article_id' => 1,
+						'user_id' => 1,
+						'comment' => 'Third Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:49:23',
+						'updated' => '2008-09-24 10:51:31'
+					),
+					array(
+						'id' => 4,
+						'article_id' => 1,
+						'user_id' => 1,
+						'comment' => 'Fourth Comment for First Plugin Article',
+						'published' => 'N',
+						'created' => '2008-09-24 10:51:23',
+						'updated' => '2008-09-24 10:53:31'
+			))),
+			array(
+				'TestPluginArticle' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Plugin Article',
+					'body' => 'Second Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:41:23',
+					'updated' => '2008-09-24 10:43:31'
+				),
+				'User' => array(
+					'id' => 3,
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'TestPluginComment' => array(
+					array(
+						'id' => 5,
+						'article_id' => 2,
+						'user_id' => 1,
+						'comment' => 'First Comment for Second Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:53:23',
+						'updated' => '2008-09-24 10:55:31'
+					),
+					array(
+						'id' => 6,
+						'article_id' => 2,
+						'user_id' => 2,
+						'comment' => 'Second Comment for Second Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:55:23',
+						'updated' => '2008-09-24 10:57:31'
+			))),
+			array(
+				'TestPluginArticle' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Plugin Article',
+					'body' => 'Third Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:43:23',
+					'updated' => '2008-09-24 10:45:31'
+				),
+				'User' => array(
+					'id' => 1,
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'TestPluginComment' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests getAssociated method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetAssociated() {
+		$this->loadFixtures('Article');
+		$Article = ClassRegistry::init('Article');
+
+		$assocTypes = array('hasMany', 'hasOne', 'belongsTo', 'hasAndBelongsToMany');
+		foreach ($assocTypes as $type) {
+			 $this->assertEqual($Article->getAssociated($type), array_keys($Article->{$type}));
+		}
+
+		$Article->bindModel(array('hasMany' => array('Category')));
+		$this->assertEqual($Article->getAssociated('hasMany'), array('Comment', 'Category'));
+
+		$results = $Article->getAssociated();
+		$this->assertEqual(sort(array_keys($results)), array('Category', 'Comment', 'Tag'));
+
+		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
+		$this->assertEqual($Article->getAssociated('hasAndBelongsToMany'), array());
+
+		$result = $Article->getAssociated('Category');
+		$expected = array(
+			'className' => 'Category',
+			'foreignKey' => 'article_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'dependent' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => '',
+			'association' => 'hasMany',
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAutoConstructAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoConstructAssociations() {
+		$this->loadFixtures('User', 'ArticleFeatured');
+		$TestModel =& new AssociationTest1();
+
+		$result = $TestModel->hasAndBelongsToMany;
+		$expected = array('AssociationTest2' => array(
+				'unique' => false,
+				'joinTable' => 'join_as_join_bs',
+				'foreignKey' => false,
+				'className' => 'AssociationTest2',
+				'with' => 'JoinAsJoinB',
+				'associationForeignKey' => 'join_b_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '',
+				'finderQuery' => '', 'deleteQuery' => '', 'insertQuery' => ''
+		));
+		$this->assertEqual($result, $expected);
+
+		// Tests related to ticket https://trac.cakephp.org/ticket/5594
+		$TestModel =& new ArticleFeatured();
+		$TestFakeModel =& new ArticleFeatured(array('table' => false));
+
+		$expected = array(
+			'User' => array(
+				'className' => 'User', 'foreignKey' => 'user_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
+			),
+			'Category' => array(
+				'className' => 'Category', 'foreignKey' => 'category_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
+			)
+		);
+		$this->assertIdentical($TestModel->belongsTo, $expected);
+		$this->assertIdentical($TestFakeModel->belongsTo, $expected);
+
+		$this->assertEqual($TestModel->User->name, 'User');
+		$this->assertEqual($TestFakeModel->User->name, 'User');
+		$this->assertEqual($TestModel->Category->name, 'Category');
+		$this->assertEqual($TestFakeModel->Category->name, 'Category');
+
+		$expected = array(
+			'Featured' => array(
+				'className' => 'Featured',
+				'foreignKey' => 'article_featured_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'dependent' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasOne, $expected);
+		$this->assertIdentical($TestFakeModel->hasOne, $expected);
+
+		$this->assertEqual($TestModel->Featured->name, 'Featured');
+		$this->assertEqual($TestFakeModel->Featured->name, 'Featured');
+
+		$expected = array(
+			'Comment' => array(
+				'className' => 'Comment',
+				'dependent' => true,
+				'foreignKey' => 'article_featured_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'limit' => '',
+				'offset' => '',
+				'exclusive' => '',
+				'finderQuery' => '',
+				'counterQuery' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasMany, $expected);
+		$this->assertIdentical($TestFakeModel->hasMany, $expected);
+
+		$this->assertEqual($TestModel->Comment->name, 'Comment');
+		$this->assertEqual($TestFakeModel->Comment->name, 'Comment');
+
+		$expected = array(
+			'Tag' => array(
+				'className' => 'Tag',
+				'joinTable' => 'article_featureds_tags',
+				'with' => 'ArticleFeaturedsTag',
+				'foreignKey' => 'article_featured_id',
+				'associationForeignKey' => 'tag_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'limit' => '',
+				'offset' => '',
+				'unique' => true,
+				'finderQuery' => '',
+				'deleteQuery' => '',
+				'insertQuery' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasAndBelongsToMany, $expected);
+		$this->assertIdentical($TestFakeModel->hasAndBelongsToMany, $expected);
+
+		$this->assertEqual($TestModel->Tag->name, 'Tag');
+		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
+	}
+/**
+ * test Model::__construct
+ *
+ * ensure that $actsAS and $_findMethods are merged.
+ *
+ * @return void
+ **/
+	function testConstruct() {
+		$this->loadFixtures('Post', 'Comment');
+
+		$TestModel =& ClassRegistry::init('MergeVarPluginPost');
+		$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
+		$this->assertTrue(isset($TestModel->Behaviors->Containable));
+		$this->assertTrue(isset($TestModel->Behaviors->Tree));
+
+		$TestModel =& ClassRegistry::init('MergeVarPluginComment');
+		$expected = array('Containable', 'Containable' => array('some_settings'));
+		$this->assertEqual($TestModel->actsAs, $expected);
+		$this->assertTrue(isset($TestModel->Behaviors->Containable));
+	}
+/**
+ * test Model::__construct
+ *
+ * ensure that $actsAS and $_findMethods are merged.
+ *
+ * @return void
+ **/
+	function testConstructWithAlternateDataSource() {
+		$TestModel =& ClassRegistry::init(array(
+			'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
+		));
+		$this->assertEqual('test_suite', $TestModel->useDbConfig);
+
+		//deprecated but test it anyway
+		$NewVoid =& new TheVoid(null, false, 'other');
+		$this->assertEqual('other', $NewVoid->useDbConfig);
+	}
+/**
+ * testColumnTypeFetching method
+ *
+ * @access public
+ * @return void
+ */
+	function testColumnTypeFetching() {
+		$model =& new Test();
+		$this->assertEqual($model->getColumnType('id'), 'integer');
+		$this->assertEqual($model->getColumnType('notes'), 'text');
+		$this->assertEqual($model->getColumnType('updated'), 'datetime');
+		$this->assertEqual($model->getColumnType('unknown'), null);
+
+		$model =& new Article();
+		$this->assertEqual($model->getColumnType('User.created'), 'datetime');
+		$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
+		$this->assertEqual($model->getColumnType('Article.id'), 'integer');
+	}
+/**
+ * testHabtmUniqueKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUniqueKey() {
+		$model =& new Item();
+		$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
+	}
+/**
+ * testIdentity method
+ *
+ * @access public
+ * @return void
+ */
+	function testIdentity() {
+		$TestModel =& new Test();
+		$result = $TestModel->alias;
+		$expected = 'Test';
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new TestAlias();
+		$result = $TestModel->alias;
+		$expected = 'TestAlias';
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Test(array('alias' => 'AnotherTest'));
+		$result = $TestModel->alias;
+		$expected = 'AnotherTest';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testWithAssociation method
+ *
+ * @access public
+ * @return void
+ */
+	function testWithAssociation() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+		$TestModel =& new Something();
+		$result = $TestModel->SomethingElse->find('all');
+
+		$expected = array(
+			array(
+				'SomethingElse' => array(
+					'id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'id' => '3',
+							'something_id' => '3',
+							'something_else_id' => '1',
+							'doomed' => '1',
+							'created' => '2007-03-18 10:43:23',
+							'updated' => '2007-03-18 10:45:31'
+			)))),
+			array(
+				'SomethingElse' => array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'id' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2',
+							'doomed' => '1',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+			)))),
+			array(
+				'SomethingElse' => array(
+					'id' => '3',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'id' => '2',
+							'something_id' => '2',
+							'something_else_id' => '3',
+							'doomed' => '0',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+		)))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Something' => array(
+					'id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2'
+			)))),
+			array(
+				'Something' => array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'doomed' => '0',
+							'something_id' => '2',
+							'something_else_id' => '3'
+			)))),
+			array(
+				'Something' => array(
+					'id' => '3',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '3',
+							'something_else_id' => '1'
+		)))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'Something' => array(
+				'id' => '1',
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			),
+			'SomethingElse' => array(
+				array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'JoinThing' => array(
+						'doomed' => '1',
+						'something_id' => '1',
+						'something_else_id' => '2'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$expected = $TestModel->findById(1);
+		$TestModel->set($expected);
+		$TestModel->save();
+		$result = $TestModel->findById(1);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false;
+		$TestModel->create(array(
+			'Something' => array('id' => 1),
+			'SomethingElse' => array(3, array(
+				'something_else_id' => 1,
+				'doomed' => '1'
+		))));
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->save();
+
+		$TestModel->hasAndBelongsToMany['SomethingElse']['order'] = 'SomethingElse.id ASC';
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'Something' => array(
+				'id' => '1',
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => $ts),
+				'SomethingElse' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '1'
+					)),
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2'
+					)),
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'doomed' => '0',
+							'something_id' => '1',
+							'something_else_id' => '3'
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindSelfAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindSelfAssociations() {
+		$this->loadFixtures('Person');
+
+		$TestModel =& new Person();
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'Person' => array(
+				'id' => 1,
+				'name' => 'person',
+				'mother_id' => 2,
+				'father_id' => 3
+			),
+			'Mother' => array(
+				'id' => 2,
+				'name' => 'mother',
+				'mother_id' => 4,
+				'father_id' => 5,
+				'Mother' => array(
+					'id' => 4,
+					'name' => 'mother - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0
+				),
+				'Father' => array(
+					'id' => 5,
+					'name' => 'mother - grand father',
+					'mother_id' => 0,
+					'father_id' => 0
+			)),
+			'Father' => array(
+				'id' => 3,
+				'name' => 'father',
+				'mother_id' => 6,
+				'father_id' => 7,
+				'Father' => array(
+					'id' => 7,
+					'name' => 'father - grand father',
+					'mother_id' => 0,
+					'father_id' => 0
+				),
+				'Mother' => array(
+					'id' => 6,
+					'name' => 'father - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 3;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'Person' => array(
+				'id' => 1,
+				'name' => 'person',
+				'mother_id' => 2,
+				'father_id' => 3
+			),
+			'Mother' => array(
+				'id' => 2,
+				'name' => 'mother',
+				'mother_id' => 4,
+				'father_id' => 5,
+				'Mother' => array(
+					'id' => 4,
+					'name' => 'mother - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Mother' => array(),
+					'Father' => array()),
+				'Father' => array(
+					'id' => 5,
+					'name' => 'mother - grand father',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Father' => array(),
+					'Mother' => array()
+			)),
+			'Father' => array(
+				'id' => 3,
+				'name' => 'father',
+				'mother_id' => 6,
+				'father_id' => 7,
+				'Father' => array(
+					'id' => 7,
+					'name' => 'father - grand father',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Father' => array(),
+					'Mother' => array()
+				),
+				'Mother' => array(
+					'id' => 6,
+					'name' => 'father - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Mother' => array(),
+					'Father' => array()
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testDynamicAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testDynamicAssociations() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = $TestModel->hasOne = array();
+		$TestModel->hasMany['Comment'] = array_merge($TestModel->hasMany['Comment'], array(
+			'foreignKey' => false,
+			'conditions' => array('Comment.user_id =' => '2')
+		));
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testCreation method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreation() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Test();
+		$result = $TestModel->create();
+		$expected = array('Test' => array('notes' => 'write some notes here'));
+		$this->assertEqual($result, $expected);
+		$TestModel =& new User();
+		$result = $TestModel->schema();
+
+		if (isset($this->db->columns['primary_key']['length'])) {
+			$intLength = $this->db->columns['primary_key']['length'];
+		} elseif (isset($this->db->columns['integer']['length'])) {
+			$intLength = $this->db->columns['integer']['length'];
+		} else {
+			$intLength = 11;
+		}
+		foreach (array('collate', 'charset') as $type) {
+			unset($result['user'][$type]);
+			unset($result['password'][$type]);
+		}
+
+		$expected = array(
+			'id' => array(
+				'type' => 'integer',
+				'null' => false,
+				'default' => null,
+				'length' => $intLength,
+				'key' => 'primary'
+			),
+			'user' => array(
+				'type' => 'string',
+				'null' => false,
+				'default' => '',
+				'length' => 255
+			),
+			'password' => array(
+				'type' => 'string',
+				'null' => false,
+				'default' => '',
+				'length' => 255
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+			),
+			'updated'=> array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Article();
+		$result = $TestModel->create();
+		$expected = array('Article' => array('published' => 'N'));
+		$this->assertEqual($result, $expected);
+
+		$FeaturedModel =& new Featured();
+		$data = array(
+			'article_featured_id' => 1,
+			'category_id' => 1,
+			'published_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 11
+			),
+			'end_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 20
+		));
+
+		$expected = array(
+			'Featured' => array(
+				'article_featured_id' => 1,
+				'category_id' => 1,
+				'published_date' => '2008-6-11 00:00:00',
+				'end_date' => '2008-6-20 00:00:00'
+		));
+
+		$this->assertEqual($FeaturedModel->create($data), $expected);
+
+		$data = array(
+			'published_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 11
+			),
+			'end_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 20
+			),
+			'article_featured_id' => 1,
+			'category_id' => 1
+		);
+
+		$expected = array(
+			'Featured' => array(
+				'published_date' => '2008-6-11 00:00:00',
+				'end_date' => '2008-6-20 00:00:00',
+				'article_featured_id' => 1,
+				'category_id' => 1
+		));
+
+		$this->assertEqual($FeaturedModel->create($data), $expected);
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/cake/tests/cases/libs/model/model_read.test.php
new file mode 100644
index 000000000..a2fd76f82
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_read.test.php
@@ -0,0 +1,7151 @@
+
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_read.test.php';
+/**
+ * ModelReadTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelReadTest extends BaseModelTest {
+/**
+ * testFetchingNonUniqueFKJoinTableRecords()
+ *
+ * Tests if the results are properly returned in the case there are non-unique FK's
+ * in the join table but another fields value is different. For example:
+ * something_id | something_else_id | doomed = 1
+ * something_id | something_else_id | doomed = 0
+ * Should return both records and not just one.
+ *
+ * @access public
+ * @return void
+ */
+	function testFetchingNonUniqueFKJoinTableRecords() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+		$Something = new Something();
+
+		$joinThingData = array(
+			'JoinThing' => array(
+				'something_id' => 1,
+				'something_else_id' => 2,
+				'doomed' => '0',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$Something->JoinThing->create($joinThingData);
+		$Something->JoinThing->save();
+
+		$result = $Something->JoinThing->find('all', array('conditions' => array('something_else_id' => 2)));
+		$this->assertEqual($result[0]['JoinThing']['doomed'], 1);
+		$this->assertEqual($result[1]['JoinThing']['doomed'], 0);
+
+		$result = $Something->find('first');
+		$this->assertEqual(count($result['SomethingElse']), 2);
+		$this->assertEqual($result['SomethingElse'][0]['JoinThing']['doomed'], 1);
+		$this->assertEqual($result['SomethingElse'][1]['JoinThing']['doomed'], 0);
+	}
+/**
+ * testGroupBy method
+ *
+ * These tests will never pass with Postgres or Oracle as all fields in a select must be
+ * part of an aggregate function or in the GROUP BY statement.
+ *
+ * @access public
+ * @return void
+ */
+	function testGroupBy() {
+		$db = ConnectionManager::getDataSource('test_suite');
+		$isStrictGroupBy = in_array($db->config['driver'], array('postgres', 'oracle'));
+		$message = '%s Postgresql and Oracle have strict GROUP BY and are incompatible with this test.';
+
+		if ($this->skipIf($isStrictGroupBy, $message )) {
+			return;
+		}
+
+		$this->loadFixtures('Project', 'Product', 'Thread', 'Message', 'Bid');
+		$Thread =& new Thread();
+		$Product =& new Product();
+
+		$result = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'order' => 'Thread.id ASC'
+		));
+
+		$expected = array(
+			array(
+				'Thread' => array(
+					'id' => 1,
+					'project_id' => 1,
+					'name' => 'Project 1, Thread 1'
+				),
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Message' => array(
+					array(
+						'id' => 1,
+						'thread_id' => 1,
+						'name' => 'Thread 1, Message 1'
+			))),
+			array(
+				'Thread' => array(
+					'id' => 3,
+					'project_id' => 2,
+					'name' => 'Project 2, Thread 1'
+				),
+				'Project' => array(
+					'id' => 2,
+					'name' => 'Project 2'
+				),
+				'Message' => array(
+					array(
+						'id' => 3,
+						'thread_id' => 3,
+						'name' => 'Thread 3, Message 1'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$rows = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'fields' => array('Thread.project_id', 'COUNT(*) AS total')
+		));
+		$result = array();
+		foreach($rows as $row) {
+			$result[$row['Thread']['project_id']] = $row[0]['total'];
+		}
+		$expected = array(
+			1 => 2,
+			2 => 1
+		);
+		$this->assertEqual($result, $expected);
+
+		$rows = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
+			'order'=> 'Thread.project_id'
+		));
+		$result = array();
+		foreach($rows as $row) {
+			$result[$row['Thread']['project_id']] = $row[0]['total'];
+		}
+		$expected = array(
+			1 => 2,
+			2 => 1
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'Thread.project_id'
+		));
+		$expected = array(
+			array(
+				'Thread' => array(
+					'id' => 1,
+					'project_id' => 1,
+					'name' => 'Project 1, Thread 1'
+				),
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Message' => array(
+					array(
+						'id' => 1,
+						'thread_id' => 1,
+						'name' => 'Thread 1, Message 1'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'Thread.project_id, Project.id'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'project_id'
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('project_id')
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('project_id', 'Project.id')
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('Thread.project_id', 'Project.id')
+		));
+		$this->assertEqual($result, $expected);
+
+
+		$expected = array(
+			array('Product' => array('type' => 'Clothing'), array('price' => 32)),
+			array('Product' => array('type' => 'Food'), array('price' => 9)),
+			array('Product' => array('type' => 'Music'), array( 'price' => 4)),
+			array('Product' => array('type' => 'Toy'), array('price' => 3))
+		);
+		$result = $Product->find('all',array(
+			'fields'=>array('Product.type','MIN(Product.price) as price'),
+			'group'=> 'Product.type',
+			'order' => 'Product.type ASC'
+			));
+		$this->assertEqual($result, $expected);
+
+		$result = $Product->find('all', array(
+			'fields'=>array('Product.type','MIN(Product.price) as price'),
+			'group'=> array('Product.type'),
+			'order' => 'Product.type ASC'));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testOldQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testOldQuery() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id IN (1,2)';
+
+		$results = $Article->query($query);
+		$this->assertTrue(is_array($results));
+		$this->assertEqual(count($results), 2);
+
+		$query  = 'SELECT title, body FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id = 1';
+
+		$results = $Article->query($query, false);
+		$this->assertTrue(!isset($this->db->_queryCache[$query]));
+		$this->assertTrue(is_array($results));
+
+		$query  = 'SELECT title, id FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.published = ' . $this->db->value('Y');
+
+		$results = $Article->query($query, true);
+		$this->assertTrue(isset($this->db->_queryCache[$query]));
+		$this->assertTrue(is_array($results));
+	}
+/**
+ * testPreparedQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testPreparedQuery() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$this->db->_queryCache = array();
+
+		$finalQuery = 'SELECT title, published FROM ';
+		$finalQuery .= $this->db->fullTableName('articles');
+		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.id = ' . $this->db->value(1);
+		$finalQuery .= ' AND ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.published = ' . $this->db->value('Y');
+
+		$query = 'SELECT title, published FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.id = ? AND ' . $this->db->fullTableName('articles') . '.published = ?';
+
+		$params = array(1, 'Y');
+		$result = $Article->query($query, $params);
+		$expected = array(
+			'0' => array(
+				$this->db->fullTableName('articles', false) => array(
+					'title' => 'First Article', 'published' => 'Y')
+		));
+
+		if (isset($result[0][0])) {
+			$expected[0][0] = $expected[0][$this->db->fullTableName('articles', false)];
+			unset($expected[0][$this->db->fullTableName('articles', false)]);
+		}
+
+		$this->assertEqual($result, $expected);
+		$this->assertTrue(isset($this->db->_queryCache[$finalQuery]));
+
+		$finalQuery = 'SELECT id, created FROM ';
+		$finalQuery .= $this->db->fullTableName('articles');
+		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.title = ' . $this->db->value('First Article');
+
+		$query  = 'SELECT id, created FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= '  WHERE ' . $this->db->fullTableName('articles') . '.title = ?';
+
+		$params = array('First Article');
+		$result = $Article->query($query, $params, false);
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(
+			   isset($result[0][$this->db->fullTableName('articles', false)])
+			|| isset($result[0][0])
+		);
+		$this->assertFalse(isset($this->db->_queryCache[$finalQuery]));
+
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.title LIKE ?';
+
+		$params = array('%First%');
+		$result = $Article->query($query, $params);
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(
+			   isset($result[0][$this->db->fullTableName('articles', false)]['title'])
+			|| isset($result[0][0]['title'])
+		);
+
+		//related to ticket #5035
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles') . ' WHERE title = ? AND published = ?';
+		$params = array('First? Article', 'Y');
+		$Article->query($query, $params);
+
+		$expected  = 'SELECT title FROM ';
+		$expected .= $this->db->fullTableName('articles');
+		$expected .= " WHERE title = 'First? Article' AND published = 'Y'";
+		$this->assertTrue(isset($this->db->_queryCache[$expected]));
+
+	}
+/**
+ * testParameterMismatch method
+ *
+ * @access public
+ * @return void
+ */
+	function testParameterMismatch() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query  = 'SELECT * FROM ' . $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.published = ? AND ' . $this->db->fullTableName('articles') . '.user_id = ?';
+		$params = array('Y');
+		$this->expectError();
+
+		ob_start();
+		$result = $Article->query($query, $params);
+		ob_end_clean();
+		$this->assertEqual($result, null);
+	}
+/**
+ * testVeryStrangeUseCase method
+ *
+ * @access public
+ * @return void
+ */
+	function testVeryStrangeUseCase() {
+		$message = "%s skipping SELECT * FROM ? WHERE ? = ? AND ? = ?; prepared query.";
+		$message .= " MSSQL is incompatible with this test.";
+
+		if ($this->skipIf($this->db->config['driver'] == 'mssql', $message)) {
+			return;
+		}
+
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query = 'SELECT * FROM ? WHERE ? = ? AND ? = ?';
+		$param = array(
+			$this->db->fullTableName('articles'),
+			$this->db->fullTableName('articles') . '.user_id', '3',
+			$this->db->fullTableName('articles') . '.published', 'Y'
+		);
+		$this->expectError();
+
+		ob_start();
+		$result = $Article->query($query, $param);
+		ob_end_clean();
+	}
+/**
+ * testRecursiveUnbind method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveUnbind() {
+		$this->loadFixtures('Apple', 'Sample');
+		$TestModel =& new Apple();
+		$TestModel->recursive = 2;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array (
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' =>'',
+						'apple_id' => '',
+						'name' => ''
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 2,
+								'apple_id' => 2,
+								'name' => 'sample2'
+							),
+							'Child' => array(
+								array(
+									'id' => 1,
+									'apple_id' => 2,
+									'color' => 'Red 1',
+									'name' => 'Red Apple 1',
+									'created' => '2006-11-22 10:38:58',
+									'date' => '1951-01-04',
+									'modified' => '2006-12-01 13:31:26',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 3,
+									'apple_id' => 2,
+									'color' => 'blue green',
+									'name' => 'green blue',
+									'created' => '2006-12-25 05:13:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:24',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 4,
+									'apple_id' => 2,
+									'color' => 'Blue Green',
+									'name' => 'Test Name',
+									'created' => '2006-12-25 05:23:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:36',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2',
+						'Apple' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+					)),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(),
+							'Child' => array(
+								array(
+									'id' => 2,
+									'apple_id' => 1,
+									'color' => 'Bright Red 1',
+									'name' => 'Bright Red Apple',
+									'created' => '2006-11-22 10:43:13',
+									'date' => '2014-01-01',
+									'modified' => '2006-11-30 18:38:10',
+									'mytime' => '22:57:17'
+						))),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 1,
+								'apple_id' => 3,
+								'name' => 'sample1'
+						)),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 3,
+								'apple_id' => 4,
+								'name' => 'sample3'
+							),
+							'Child' => array(
+								array(
+									'id' => 6,
+									'apple_id' => 4,
+									'color' => 'My new appleOrange',
+									'name' => 'My new apple',
+									'created' => '2006-12-25 05:29:39',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:29:39',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
+						'Child' => array(
+							array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 3,
+								'apple_id' => 2,
+								'color' => 'blue green',
+								'name' => 'green blue',
+								'created' => '2006-12-25 05:13:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:24',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 4,
+								'apple_id' => 2,
+								'color' => 'Blue Green',
+								'name' => 'Test Name',
+								'created' => '2006-12-25 05:23:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:36',
+								'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 7,
+								'apple_id' => 6,
+								'color' => 'Some wierd color',
+								'name' => 'Some odd color',
+								'created' => '2006-12-25 05:34:21',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:34:21',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					)),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 5,
+								'apple_id' => 5,
+								'color' => 'Green',
+								'name' => 'Blue Green',
+								'created' => '2006-12-25 05:24:06',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:16',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 4,
+								'apple_id' => 5,
+								'name' => 'sample4'
+							),
+							'Child' => array(
+								array(
+									'id' => 5,
+									'apple_id' => 5,
+									'color' => 'Green',
+									'name' => 'Blue Green',
+									'created' => '2006-12-25 05:24:06',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:29:16',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 3,
+						'apple_id' => 4,
+						'name' => 'sample3'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array()
+			))),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' =>
+					'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array()));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'),
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						'Child' => array(
+							array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 3,
+								'apple_id' => 2,
+								'color' => 'blue green',
+								'name' => 'green blue',
+								'created' => '2006-12-25 05:13:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:24',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 4,
+								'apple_id' => 2,
+								'color' => 'Blue Green',
+								'name' => 'Test Name',
+								'created' => '2006-12-25 05:23:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:36',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' =>'',
+						'apple_id' => '',
+						'name' => ''
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 2,
+								'apple_id' => 2,
+								'name' => 'sample2'
+							),
+							'Child' => array(
+								array(
+									'id' => 1,
+									'apple_id' => 2,
+									'color' => 'Red 1',
+									'name' => 'Red Apple 1',
+									'created' => '2006-11-22 10:38:58',
+									'date' => '1951-01-04',
+									'modified' => '2006-12-01 13:31:26',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 3,
+									'apple_id' => 2,
+									'color' => 'blue green',
+									'name' => 'green blue',
+									'created' => '2006-12-25 05:13:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:24',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 4,
+									'apple_id' => 2,
+									'color' => 'Blue Green',
+									'name' => 'Test Name',
+									'created' => '2006-12-25 05:23:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:36',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01', 'modified' =>
+								'2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+					))),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 1,
+							'apple_id' => 3,
+							'name' => 'sample1'
+					)),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 3,
+							'apple_id' => 4,
+							'name' => 'sample3'
+						),
+						'Child' => array(
+							array(
+								'id' => 6,
+								'apple_id' => 4,
+								'color' => 'My new appleOrange',
+								'name' => 'My new apple',
+								'created' => '2006-12-25 05:29:39',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:39',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+							'Child' => array(
+								array(
+									'id' => 7,
+									'apple_id' => 6,
+									'color' => 'Some wierd color',
+									'name' => 'Some odd color',
+									'created' => '2006-12-25 05:34:21',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:34:21',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 4,
+							'apple_id' => 5,
+							'name' => 'sample4'
+						),
+						'Child' => array(
+							array(
+								'id' => 5,
+								'apple_id' => 5,
+								'color' => 'Green',
+								'name' => 'Blue Green',
+								'created' => '2006-12-25 05:24:06',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:16',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array()
+			))),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array (
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+				'id' => 3,
+				'apple_id' => 2,
+				'color' => 'blue green',
+				'name' => 'green blue',
+				'created' => '2006-12-25 05:13:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:24',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 2,
+				'apple_id' => 1,
+				'color' => 'Bright Red 1',
+				'name' => 'Bright Red Apple',
+				'created' => '2006-11-22 10:43:13',
+				'date' => '2014-01-01',
+				'modified' => '2006-11-30 18:38:10',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 1,
+				'apple_id' => 3,
+				'name' => 'sample1',
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 4,
+				'apple_id' => 2,
+				'color' => 'Blue Green',
+				'name' => 'Test Name',
+				'created' => '2006-12-25 05:23:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:36',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 2,
+				'apple_id' => 1,
+				'color' => 'Bright Red 1',
+				'name' => 'Bright Red Apple',
+				'created' => '2006-11-22 10:43:13',
+				'date' => '2014-01-01',
+				'modified' => '2006-11-30 18:38:10',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 3,
+				'apple_id' => 4,
+				'name' => 'sample3',
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 5,
+				'apple_id' => 5,
+				'color' => 'Green',
+				'name' => 'Blue Green',
+				'created' => '2006-12-25 05:24:06',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:16',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 5,
+				'apple_id' => 5,
+				'color' => 'Green',
+				'name' => 'Blue Green',
+				'created' => '2006-12-25 05:24:06',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:16',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 4,
+				'apple_id' => 5,
+				'name' => 'sample4',
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 6,
+				'apple_id' => 4,
+				'color' => 'My new appleOrange',
+				'name' => 'My new apple',
+				'created' => '2006-12-25 05:29:39',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:39',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 4,
+				'apple_id' => 2,
+				'color' => 'Blue Green',
+				'name' => 'Test Name',
+				'created' => '2006-12-25 05:23:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:36',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => '',
+				'apple_id' => '',
+				'name' => ''
+		)),
+		array(
+			'Apple' => array(
+				'id' => 7,
+				'apple_id' => 6,
+				'color' => 'Some wierd color',
+				'name' => 'Some odd color',
+				'created' => '2006-12-25 05:34:21',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:34:21',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 6,
+				'apple_id' => 4,
+				'color' => 'My new appleOrange',
+				'name' => 'My new apple',
+				'created' => '2006-12-25 05:29:39',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:39',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => '',
+				'apple_id' => '',
+				'name' => ''
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->Sample->unbindModel(array('belongsTo' => array('Apple')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 3,
+						'apple_id' => 4,
+						'name' => 'sample3'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('belongsTo' => array('Parent')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' =>
+					'2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'),
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17',
+						'Sample' => array(
+							'id' => 3,
+							'apple_id' => 4,
+							'name' => 'sample3'
+						),
+						'Child' => array(
+							array(
+								'id' => 6,
+								'apple_id' => 4,
+								'color' => 'My new appleOrange',
+								'name' => 'My new apple',
+								'created' => '2006-12-25 05:29:39',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:39',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' => '',
+						'apple_id' => '',
+						'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25', 'modified' =>
+							'2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSelfAssociationAfterFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testSelfAssociationAfterFind() {
+		$this->loadFixtures('Apple');
+		$afterFindModel = new NodeAfterFind();
+		$afterFindModel->recursive = 3;
+		$afterFindData = $afterFindModel->find('all');
+
+		$duplicateModel = new NodeAfterFind();
+		$duplicateModel->recursive = 3;
+		$duplicateModelData = $duplicateModel->find('all');
+
+		$noAfterFindModel = new NodeNoAfterFind();
+		$noAfterFindModel->recursive = 3;
+		$noAfterFindData = $noAfterFindModel->find('all');
+
+		$this->assertFalse($afterFindModel == $noAfterFindModel);
+		// Limitation of PHP 4 and PHP 5 > 5.1.6 when comparing recursive objects
+		if (PHP_VERSION === '5.1.6') {
+			$this->assertFalse($afterFindModel != $duplicateModel);
+		}
+		$this->assertEqual($afterFindData, $noAfterFindData);
+	}
+/**
+ * testFindAllThreaded method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllThreaded() {
+		$this->loadFixtures('Category');
+		$TestModel =& new Category();
+
+		$result = $TestModel->find('threaded');
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 1%')
+		));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name'
+		));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array('order' => 'id DESC'));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => 5,
+					'parent_id' => 0,
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => 6,
+							'parent_id' => 5,
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => 4,
+					'parent_id' => 0,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => 1,
+					'parent_id' => 0,
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => 3,
+							'parent_id' => 1,
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					),
+					array(
+						'Category' => array(
+							'id' => 2,
+							'parent_id' => 1,
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 3%')
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 1.1%')
+		));
+		$expected = array(
+				array('Category' =>
+					array(
+						'id' => '2',
+						'parent_id' => '1',
+						'name' => 'Category 1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31'),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name',
+			'conditions' => array('Category.id !=' => 2)
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'id, name, parent_id',
+			'conditions' => array('Category.id !=' => 1)
+		));
+		$expected = array (
+			array ('Category' => array(
+				'id' => '2',
+				'name' => 'Category 1.1',
+				'parent_id' => '1'
+			)),
+			array ('Category' => array(
+				'id' => '3',
+				'name' => 'Category 1.2',
+				'parent_id' => '1'
+			)),
+			array ('Category' => array(
+				'id' => '4',
+				'name' => 'Category 2',
+				'parent_id' => '0'
+			)),
+			array ('Category' => array(
+				'id' => '5',
+				'name' => 'Category 3',
+				'parent_id' => '0'
+			)),
+			array ('Category' => array(
+				'id' => '6',
+				'name' => 'Category 3.1',
+				'parent_id' => '5'
+			)),
+			array ('Category' => array(
+				'id' => '7',
+				'name' => 'Category 1.1.1',
+				'parent_id' => '2'
+			)),
+			array ('Category' => array(
+				'id' => '8',
+				'name' => 'Category 1.1.2',
+				'parent_id' => '2'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name',
+			'conditions' => array('Category.id !=' => 1)
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '2',
+					'parent_id' => '1',
+					'name' => 'Category 1.1'
+				),
+				'children' => array(
+					array('Category' => array(
+						'id' => '7',
+						'parent_id' => '2',
+						'name' => 'Category 1.1.1'),
+						'children' => array()),
+					array('Category' => array(
+						'id' => '8',
+						'parent_id' => '2',
+						'name' => 'Category 1.1.2'),
+						'children' => array()))
+			),
+			array(
+				'Category' => array(
+					'id' => '3',
+					'parent_id' => '1',
+					'name' => 'Category 1.2'
+				),
+				'children' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test find('neighbors')
+ *
+ * @return void
+ * @access public
+ */
+	function testFindNeighbors() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new Article();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('fields' => array('id')));
+		$expected = array(
+			'prev' => null,
+			'next' => array(
+				'Article' => array('id' => 2)
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array(
+			'fields' => array('id')
+		));
+
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1
+			)),
+			'next' => array(
+				'Article' => array(
+					'id' => 3
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('fields' => array('id')));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2
+			)),
+			'next' => null
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => null,
+			'next' => array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			'next' => array(
+				'Article' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			'next' => null
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 0;
+		$TestModel->id = 1;
+		$one = $TestModel->read();
+		$TestModel->id = 2;
+		$two = $TestModel->read();
+		$TestModel->id = 3;
+		$three = $TestModel->read();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => null, 'next' => $two);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => $one, 'next' => $three);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => $two, 'next' => null);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 2;
+		$TestModel->id = 1;
+		$one = $TestModel->read();
+		$TestModel->id = 2;
+		$two = $TestModel->read();
+		$TestModel->id = 3;
+		$three = $TestModel->read();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => null, 'next' => $two);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => $one, 'next' => $three);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => $two, 'next' => null);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test findNeighbours() method
+ *
+ * @return void
+ * @access public
+ */
+	function testFindNeighboursLegacy() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new Article();
+
+		$result = $TestModel->findNeighbours(null, 'Article.id', '2');
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1
+			)),
+			'next' => array(
+				'Article' => array(
+					'id' => 3
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findNeighbours(null, 'Article.id', '3');
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2
+			)),
+			'next' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findNeighbours(
+			array('User.id' => 1),
+			array('Article.id', 'Article.title'),
+			2
+		);
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1,
+					'title' => 'First Article'
+				)),
+			'next' => array(
+				'Article' => array(
+					'id' => 3,
+					'title' => 'Third Article'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindCombinedRelations method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCombinedRelations() {
+		$this->loadFixtures('Apple', 'Sample');
+		$TestModel =& new Apple();
+
+		$result = $TestModel->find('all');
+
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => '1',
+					'apple_id' => '2',
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array(
+					array(
+						'id' => '2',
+						'apple_id' => '1',
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '1',
+					'apple_id' => '2',
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '2',
+					'apple_id' => '2',
+					'name' => 'sample2'
+				),
+				'Child' => array(
+					array(
+						'id' => '1',
+						'apple_id' => '2',
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => '3',
+						'apple_id' => '2',
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => '4',
+						'apple_id' => '2',
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '3',
+					'apple_id' => '2',
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '1',
+					'apple_id' => '3',
+					'name' => 'sample1'
+				),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => '4',
+					'apple_id' => '2',
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '3',
+					'apple_id' => '4',
+					'name' => 'sample3'
+				),
+				'Child' => array(
+					array(
+						'id' => '6',
+						'apple_id' => '4',
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '5',
+					'apple_id' => '5',
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '5',
+					'apple_id' => '5',
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '4',
+					'apple_id' => '5',
+					'name' => 'sample4'
+				),
+				'Child' => array(
+					array(
+						'id' => '5',
+						'apple_id' => '5',
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '6',
+					'apple_id' => '4',
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '4',
+					'apple_id' => '2',
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array(
+					array(
+						'id' => '7',
+						'apple_id' => '6',
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '7',
+					'apple_id' => '6',
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '6',
+					'apple_id' => '4',
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveEmpty method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveEmpty() {
+		$this->loadFixtures('Thread');
+		$TestModel =& new Thread();
+		$data = array();
+		$expected = $TestModel->save($data);
+		$this->assertFalse($expected);
+	}
+	// function testBasicValidation() {
+	// 	$TestModel =& new ValidationTest1();
+	// 	$TestModel->testing = true;
+	// 	$TestModel->set(array('title' => '', 'published' => 1));
+	// 	$this->assertEqual($TestModel->invalidFields(), array('title' => 'This field cannot be left blank'));
+	//
+	// 	$TestModel->create();
+	// 	$TestModel->set(array('title' => 'Hello', 'published' => 0));
+	// 	$this->assertEqual($TestModel->invalidFields(), array('published' => 'This field cannot be left blank'));
+	//
+	// 	$TestModel->create();
+	// 	$TestModel->set(array('title' => 'Hello', 'published' => 1, 'body' => ''));
+	// 	$this->assertEqual($TestModel->invalidFields(), array('body' => 'This field cannot be left blank'));
+	// }
+
+/**
+ * testFindAllWithConditionInChildQuery
+ *
+ * @todo external conditions like this are going to need to be revisited at some point
+ * @access public
+ * @return void
+ */
+	function testFindAllWithConditionInChildQuery() {
+		$this->loadFixtures('Basket', 'FilmFile');
+
+		$TestModel =& new Basket();
+		$recursive = 3;
+		$result = $TestModel->find('all', compact('conditions', 'recursive'));
+
+		$expected = array(
+			array(
+				'Basket' => array(
+					'id' => 1,
+					'type' => 'nonfile',
+					'name' => 'basket1',
+					'object_id' => 1,
+					'user_id' => 1,
+				),
+				'FilmFile' => array(
+					'id' => '',
+					'name' => '',
+				)
+			),
+			array(
+				'Basket' => array(
+					'id' => 2,
+					'type' => 'file',
+					'name' => 'basket2',
+					'object_id' => 2,
+					'user_id' => 1,
+				),
+				'FilmFile' => array(
+					'id' => 2,
+					'name' => 'two',
+				)
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindAllWithConditionsHavingMixedDataTypes method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllWithConditionsHavingMixedDataTypes() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			)
+		);
+		$conditions = array('id' => array('1', 2));
+		$recursive = -1;
+		$order = 'Article.id ASC';
+		$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
+		$this->assertEqual($result, $expected);
+
+
+		$conditions = array('id' => array('1', 2, '3.0'));
+		$order = 'Article.id ASC';
+		$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testBindUnbind method
+ *
+ * @access public
+ * @return void
+ */
+	function testBindUnbind() {
+		$this->loadFixtures('User', 'Comment', 'FeatureSet');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Comment')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->resetAssociations();
+		$result = $TestModel->hasMany;
+		$this->assertEqual($result, array());
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Comment')), false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->hasMany;
+		$expected = array(
+			'Comment' => array(
+				'className' => 'Comment',
+				'foreignKey' => 'user_id',
+				'conditions' => null,
+				'fields' => null,
+				'order' => null,
+				'limit' => null,
+				'offset' => null,
+				'dependent' => null,
+				'exclusive' => null,
+				'finderQuery' => null,
+				'counterQuery' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array('User' => array('id' => '1', 'user' => 'mariano')),
+			array('User' => array('id' => '2', 'user' => 'nate')),
+			array('User' => array('id' => '3', 'user' => 'larry')),
+			array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' =>
+						'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')), false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+			array('User' => array('id' => '1', 'user' => 'mariano')),
+			array('User' => array('id' => '2', 'user' => 'nate')),
+			array('User' => array('id' => '3', 'user' => 'larry')),
+			array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array(
+			'Comment' => array('className' => 'Comment', 'conditions' => 'Comment.published = \'Y\'')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel2 =& new DeviceType();
+
+		$expected = array(
+			'className' => 'FeatureSet',
+			'foreignKey' => 'feature_set_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'counterCache' => ''
+		);
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bind('FeatureSet', array(
+			'conditions' => array('active' => true)
+		));
+		$expected['conditions'] = array('active' => true);
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bind('FeatureSet', array(
+			'foreignKey' => false,
+			'conditions' => array('Feature.name' => 'DeviceType.name')
+		));
+		$expected['conditions'] = array('Feature.name' => 'DeviceType.name');
+		$expected['foreignKey'] = false;
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bind('NewFeatureSet', array(
+			'type' => 'hasMany',
+			'className' => 'FeatureSet',
+			'conditions' => array('active' => true)
+		));
+		$expected = array(
+			'className' => 'FeatureSet',
+			'conditions' => array('active' => true),
+			'foreignKey' => 'device_type_id',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'dependent' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		);
+		$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
+		$this->assertTrue(is_object($TestModel2->NewFeatureSet));
+	}
+/**
+ * testBindMultipleTimes method
+ *
+ * @access public
+ * @return void
+ */
+	function testBindMultipleTimes() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array(
+				'Items' => array('className' => 'Comment')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Items' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Items' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Items' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4', 'user' => 'garrett'),
+					'Items' => array(
+						array(
+							'id' => '2',
+							'article_id' => '1',
+							'user_id' => '4',
+							'comment' => 'Second Comment for First Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:47:23',
+							'updated' => '2007-03-18 10:49:31'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array(
+				'Items' => array('className' => 'Article')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Items' => array(
+					array(
+						'id' => 1,
+						'user_id' => 1,
+						'title' => 'First Article',
+						'body' => 'First Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3,
+						'user_id' => 1,
+						'title' => 'Third Article',
+						'body' => 'Third Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Items' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Items' => array(
+					array(
+						'id' => 2,
+						'user_id' => 3,
+						'title' => 'Second Article',
+						'body' => 'Second Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Items' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that bindModel behaves with Custom primary Key associations
+ *
+ * @return void
+ **/
+	function bindWithCustomPrimaryKey() {
+		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
+		$Model =& ClassRegistry::init('StoriesTag');
+		$Model->bindModel(array(
+			'belongsTo' => array(
+				'Tag' => array(
+					'className' => 'Tag',
+					'foreignKey' => 'story'
+		))));
+
+		$result = $Model->find('all');
+		$this->assertFalse(empty($result));
+	}
+
+/**
+ * testAssociationAfterFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testAssociationAfterFind() {
+		$this->loadFixtures('Post', 'Author', 'Comment');
+		$TestModel =& new Post();
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Author' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31',
+					'test' => 'working'
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Author' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31',
+					'test' => 'working'
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Author' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31',
+					'test' => 'working'
+		)));
+		$this->assertEqual($result, $expected);
+		unset($TestModel);
+
+		$Author =& new Author();
+		$Author->Post->bindModel(array(
+			'hasMany' => array(
+				'Comment' => array(
+					'className' => 'ModifiedComment',
+					'foreignKey' => 'article_id',
+				)
+		)));
+		$result = $Author->find('all', array(
+			'conditions' => array('Author.id' => 1),
+			'recursive' => 2
+		));
+		$expected = array(
+			'id' => 1,
+			'article_id' => 1,
+			'user_id' => 2,
+			'comment' => 'First Comment for First Article',
+			'published' => 'Y',
+			'created' => '2007-03-18 10:45:23',
+			'updated' => '2007-03-18 10:47:31',
+			'callback' => 'Fire'
+		);
+		$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
+	}
+/**
+ * Tests that callbacks can be properly disabled
+ *
+ * @access public
+ * @return void
+ */
+	function testCallbackDisabling() {
+		$this->loadFixtures('Author');
+		$TestModel = new ModifiedAuthor();
+
+		$result = Set::extract($TestModel->find('all'), '/Author/user');
+		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => 'after')), '/Author/user');
+		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => 'before')), '/Author/user');
+		$expected = array('mariano', 'nate', 'larry', 'garrett');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => false)), '/Author/user');
+		$expected = array('mariano', 'nate', 'larry', 'garrett');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testMultipleBelongsToWithSameClass method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleBelongsToWithSameClass() {
+		$this->loadFixtures(
+			'DeviceType',
+			'DeviceTypeCategory',
+			'FeatureSet',
+			'ExteriorTypeCategory',
+			'Document',
+			'Device',
+			'DocumentDirectory'
+		);
+
+		$DeviceType =& new DeviceType();
+
+		$DeviceType->recursive = 2;
+		$result = $DeviceType->read(null, 1);
+
+		$expected = array(
+			'DeviceType' => array(
+				'id' => 1,
+				'device_type_category_id' => 1,
+				'feature_set_id' => 1,
+				'exterior_type_category_id' => 1,
+				'image_id' => 1,
+				'extra1_id' => 1,
+				'extra2_id' => 1,
+				'name' => 'DeviceType 1',
+				'order' => 0
+			),
+			'Image' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'Extra1' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'Extra2' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'DeviceTypeCategory' => array(
+				'id' => 1,
+				'name' => 'DeviceTypeCategory 1'
+			),
+			'FeatureSet' => array(
+				'id' => 1,
+				'name' => 'FeatureSet 1'
+			),
+			'ExteriorTypeCategory' => array(
+				'id' => 1,
+				'image_id' => 1,
+				'name' => 'ExteriorTypeCategory 1',
+				'Image' => array(
+					'id' => 1,
+					'device_type_id' => 1,
+					'name' => 'Device 1',
+					'typ' => 1
+			)),
+			'Device' => array(
+				array(
+					'id' => 1,
+					'device_type_id' => 1,
+					'name' => 'Device 1',
+					'typ' => 1
+				),
+				array(
+					'id' => 2,
+					'device_type_id' => 1,
+					'name' => 'Device 2',
+					'typ' => 1
+				),
+				array(
+					'id' => 3,
+					'device_type_id' => 1,
+					'name' => 'Device 3',
+					'typ' => 2
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmRecursiveBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmRecursiveBelongsTo() {
+		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio', 'Syfile', 'Image');
+		$Portfolio =& new Portfolio();
+
+		$result = $Portfolio->find(array('id' => 2), null, null, 3);
+		$expected = array(
+			'Portfolio' => array(
+				'id' => 2,
+				'seller_id' => 1,
+				'name' => 'Portfolio 2'
+			),
+			'Item' => array(
+				array(
+					'id' => 2,
+					'syfile_id' => 2,
+					'published' => 0,
+					'name' => 'Item 2',
+					'ItemsPortfolio' => array(
+						'id' => 2,
+						'item_id' => 2,
+						'portfolio_id' => 2
+					),
+					'Syfile' => array(
+						'id' => 2,
+						'image_id' => 2,
+						'name' => 'Syfile 2',
+						'item_count' => null,
+						'Image' => array(
+							'id' => 2,
+							'name' => 'Image 2'
+						)
+				)),
+				array(
+					'id' => 6,
+					'syfile_id' => 6,
+					'published' => 0,
+					'name' => 'Item 6',
+					'ItemsPortfolio' => array(
+						'id' => 6,
+						'item_id' => 6,
+						'portfolio_id' => 2
+					),
+					'Syfile' => array(
+						'id' => 6,
+						'image_id' => null,
+						'name' => 'Syfile 6',
+						'item_count' => null,
+						'Image' => array()
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmFinderQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmFinderQuery() {
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
+		$Article =& new Article();
+
+		$sql = $this->db->buildStatement(
+			array(
+				'fields' => $this->db->fields($Article->Tag, null, array(
+					'Tag.id', 'Tag.tag', 'ArticlesTag.article_id', 'ArticlesTag.tag_id'
+				)),
+				'table' => $this->db->fullTableName('tags'),
+				'alias' => 'Tag',
+				'limit' => null,
+				'offset' => null,
+				'group' => null,
+				'joins' => array(array(
+					'alias' => 'ArticlesTag',
+					'table' => $this->db->fullTableName('articles_tags'),
+					'conditions' => array(
+						array("ArticlesTag.article_id" => '{$__cakeID__$}'),
+						array("ArticlesTag.tag_id" => $this->db->identifier('Tag.id'))
+					)
+				)),
+				'conditions' => array(),
+				'order' => null
+			),
+			$Article
+		);
+
+		$Article->hasAndBelongsToMany['Tag']['finderQuery'] = $sql;
+		$result = $Article->find('first');
+		$expected = array(
+			array(
+				'id' => '1',
+				'tag' => 'tag1'
+			),
+			array(
+				'id' => '2',
+				'tag' => 'tag2'
+		));
+
+		$this->assertEqual($result['Tag'], $expected);
+	}
+/**
+ * testHabtmLimitOptimization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmLimitOptimization() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
+		$TestModel =& new Article();
+
+		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 2;
+		$result = $TestModel->read(null, 2);
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:20:23',
+				'updated' => '2007-03-17 01:22:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+			)),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 1;
+		$result = $TestModel->read(null, 2);
+		unset($expected['Tag'][1]);
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHasManyLimitOptimization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHasManyLimitOptimization() {
+		$this->loadFixtures('Project', 'Thread', 'Message', 'Bid');
+		$Project =& new Project();
+		$Project->recursive = 3;
+
+		$result = $Project->find('all');
+		$expected = array(
+			array(
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Thread' => array(
+					array(
+						'id' => 1,
+						'project_id' => 1,
+						'name' => 'Project 1, Thread 1',
+						'Project' => array(
+							'id' => 1,
+							'name' => 'Project 1',
+							'Thread' => array(
+								array(
+									'id' => 1,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 1'
+								),
+								array(
+									'id' => 2,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 2'
+						))),
+						'Message' => array(
+							array(
+								'id' => 1,
+								'thread_id' => 1,
+								'name' => 'Thread 1, Message 1',
+								'Bid' => array(
+									'id' => 1,
+									'message_id' => 1,
+									'name' => 'Bid 1.1'
+					)))),
+					array(
+						'id' => 2,
+						'project_id' => 1,
+						'name' => 'Project 1, Thread 2',
+						'Project' => array(
+							'id' => 1,
+							'name' => 'Project 1',
+							'Thread' => array(
+								array(
+									'id' => 1,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 1'
+								),
+								array(
+									'id' => 2,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 2'
+						))),
+						'Message' => array(
+							array(
+								'id' => 2,
+								'thread_id' => 2,
+								'name' => 'Thread 2, Message 1',
+								'Bid' => array(
+									'id' => 4,
+									'message_id' => 2,
+									'name' => 'Bid 2.1'
+			)))))),
+			array(
+				'Project' => array(
+					'id' => 2,
+					'name' => 'Project 2'
+				),
+				'Thread' => array(
+					array(
+						'id' => 3,
+						'project_id' => 2,
+						'name' => 'Project 2, Thread 1',
+						'Project' => array(
+							'id' => 2,
+							'name' => 'Project 2',
+							'Thread' => array(
+								array(
+									'id' => 3,
+									'project_id' => 2,
+									'name' => 'Project 2, Thread 1'
+						))),
+						'Message' => array(
+							array(
+								'id' => 3,
+								'thread_id' => 3,
+								'name' => 'Thread 3, Message 1',
+								'Bid' => array(
+									'id' => 3,
+									'message_id' => 3,
+									'name' => 'Bid 3.1'
+			)))))),
+			array(
+				'Project' => array(
+					'id' => 3,
+					'name' => 'Project 3'
+				),
+				'Thread' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindAllRecursiveSelfJoin method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllRecursiveSelfJoin() {
+		$this->loadFixtures('Home', 'AnotherArticle', 'Advertisement');
+		$TestModel =& new Home();
+		$TestModel->recursive = 2;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Home' => array(
+					'id' => '1',
+					'another_article_id' => '1',
+					'advertisement_id' => '1',
+					'title' => 'First Home',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'AnotherArticle' => array(
+					'id' => '1',
+					'title' => 'First Article',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+				))),
+				'Advertisement' => array(
+					'id' => '1',
+					'title' => 'First Ad',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+			)))),
+			array(
+				'Home' => array(
+					'id' => '2',
+					'another_article_id' => '3',
+					'advertisement_id' => '1',
+					'title' => 'Second Home',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'AnotherArticle' => array(
+					'id' => '3',
+					'title' => 'Third Article',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31',
+					'Home' => array(
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+				))),
+				'Advertisement' => array(
+					'id' => '1',
+					'title' => 'First Ad',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+		)))));
+
+		$this->assertEqual($result, $expected);
+
+
+
+	}
+/**
+ * testFindAllRecursiveWithHabtm method
+ *
+ * @return void
+ * @access public
+ */
+	function testFindAllRecursiveWithHabtm() {
+		$this->loadFixtures(
+			'MyCategoriesMyUsers',
+			'MyCategoriesMyProducts',
+			'MyCategory',
+			'MyUser',
+			'MyProduct'
+		);
+
+		$MyUser =& new MyUser();
+		$MyUser->recursive = 2;
+
+		$result = $MyUser->find('all');
+		$expected = array(
+			array(
+				'MyUser' => array('id' => '1', 'firstname' => 'userA'),
+				'MyCategory' => array(
+					array(
+						'id' => '1',
+						'name' => 'A',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+					))),
+					array(
+						'id' => '3',
+						'name' => 'C',
+						'MyProduct' => array(
+							array(
+								'id' => '2',
+								'name' => 'computer'
+			))))),
+			array(
+				'MyUser' => array(
+					'id' => '2',
+					'firstname' => 'userB'
+				),
+				'MyCategory' => array(
+					array(
+						'id' => '1',
+						'name' => 'A',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+					))),
+					array(
+						'id' => '2',
+						'name' => 'B',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+							),
+							array(
+								'id' => '2',
+								'name' => 'computer'
+		))))));
+
+		$this->assertIdentical($result, $expected);
+	}
+/**
+ * testReadFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$TestModel->id = 7;
+		$result = $TestModel->read();
+		$expected = array(
+			'CategoryThread' => array(
+				'id' => 7,
+				'parent_id' => 6,
+				'name' => 'Category 2.1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+			),
+			'ParentCategory' => array(
+				'id' => 6,
+				'parent_id' => 5,
+				'name' => 'Category 2',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31',
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		)))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$result = $TestModel->find(array('CategoryThread.id' => 7));
+
+		$expected = array(
+			'CategoryThread' => array(
+				'id' => 7,
+				'parent_id' => 6,
+				'name' => 'Category 2.1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+			),
+			'ParentCategory' => array(
+				'id' => 6,
+				'parent_id' => 5,
+				'name' => 'Category 2',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31',
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		)))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindAllFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$result = $TestModel->find('all', null, null, 'CategoryThread.id ASC');
+		$expected = array(
+			array(
+				'CategoryThread' => array(
+				'id' => 1,
+				'parent_id' => 0,
+				'name' => 'Category 1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => null,
+					'parent_id' => null,
+					'name' => null,
+					'created' => null,
+					'updated' => null,
+					'ParentCategory' => array()
+			)),
+			array(
+				'CategoryThread' => array(
+					'id' => 2,
+					'parent_id' => 1,
+					'name' => 'Category 1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 1,
+					'parent_id' => 0,
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array()
+				)),
+			array(
+				'CategoryThread' => array(
+					'id' => 3,
+					'parent_id' => 2,
+					'name' => 'Category 1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 2,
+					'parent_id' => 1,
+					'name' => 'Category 1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 1,
+						'parent_id' => 0,
+						'name' => 'Category 1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array()
+			))),
+			array(
+				'CategoryThread' => array(
+					'id' => 4,
+					'parent_id' => 3,
+					'name' => 'Category 1.1.2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 3,
+					'parent_id' => 2,
+					'name' => 'Category 1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 2,
+						'parent_id' => 1,
+						'name' => 'Category 1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 1,
+							'parent_id' => 0,
+							'name' => 'Category 1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array()
+			)))),
+			array(
+				'CategoryThread' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 4,
+					'parent_id' => 3,
+					'name' => 'Category 1.1.2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 3,
+						'parent_id' => 2,
+						'name' => 'Category 1.1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 2,
+							'parent_id' => 1,
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 1,
+								'parent_id' => 0,
+								'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array()
+			))))),
+			array(
+				'CategoryThread' => array(
+					'id' => 6,
+					'parent_id' => 5,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31',
+									'ParentCategory' => array()
+			)))))),
+			array(
+				'CategoryThread' => array(
+					'id' => 7,
+					'parent_id' => 6,
+					'name' => 'Category 2.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 6,
+					'parent_id' => 5,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 5,
+						'parent_id' => 4,
+						'name' => 'Category 1.1.1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 4,
+							'parent_id' => 3,
+							'name' => 'Category 1.1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 3,
+								'parent_id' => 2,
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		))))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testConditionalNumerics method
+ *
+ * @access public
+ * @return void
+ */
+	function testConditionalNumerics() {
+		$this->loadFixtures('NumericArticle');
+		$NumericArticle =& new NumericArticle();
+		$data = array('title' => '12345abcde');
+		$result = $NumericArticle->find($data);
+		$this->assertTrue(!empty($result));
+
+		$data = array('title' => '12345');
+		$result = $NumericArticle->find($data);
+		$this->assertTrue(empty($result));
+	}
+
+/**
+ * test find('all') method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAll() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+		$TestModel->cacheQueries = false;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => 'User.id > 2'));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id !=' => '0', 'User.user LIKE' => '%arr%')
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => array('User.id' => '0')));
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('or' => array('User.id' => '0', 'User.user LIKE' => '%a%')
+		)));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+				array('User' => array('id' => '1', 'user' => 'mariano')),
+				array('User' => array('id' => '2', 'user' => 'nate')),
+				array('User' => array('id' => '3', 'user' => 'larry')),
+				array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user ASC'));
+		$expected = array(
+				array('User' => array('user' => 'garrett')),
+				array('User' => array('user' => 'larry')),
+				array('User' => array('user' => 'mariano')),
+				array('User' => array('user' => 'nate')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user DESC'));
+		$expected = array(
+				array('User' => array('user' => 'nate')),
+				array('User' => array('user' => 'mariano')),
+				array('User' => array('user' => 'larry')),
+				array('User' => array('user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('limit' => 3, 'page' => 1));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$ids = array(4 => 1, 5 => 3);
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id' => $ids),
+			'order' => 'User.id'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		// These tests are expected to fail on SQL Server since the LIMIT/OFFSET
+		// hack can't handle small record counts.
+		if ($this->db->config['driver'] != 'mssql') {
+			$result = $TestModel->find('all', array('limit' => 3, 'page' => 2));
+			$expected = array(
+				array(
+					'User' => array(
+						'id' => '4',
+						'user' => 'garrett',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:22:23',
+						'updated' => '2007-03-17 01:24:31'
+			)));
+			$this->assertEqual($result, $expected);
+
+			$result = $TestModel->find('all', array('limit' => 3, 'page' => 3));
+			$expected = array();
+			$this->assertEqual($result, $expected);
+		}
+	}
+/**
+ * test find('list') method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateFindList() {
+		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User');
+
+		$TestModel =& new Article();
+		$TestModel->displayField = 'title';
+
+		$result = $TestModel->find('list', array(
+			'order' => 'Article.title ASC'
+		));
+
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		if ($db->config['driver'] == 'mysql') {
+			$result = $TestModel->find('list', array(
+				'order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC')
+			));
+			$expected = array(
+				1 => 'First Article',
+				3 => 'Third Article',
+				2 => 'Second Article'
+			);
+			$this->assertEqual($result, $expected);
+		}
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC',
+				'fields' => array('id', 'title')
+			)),
+			'{n}.Article.id', '{n}.Article.title'
+		);
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC'
+			)),
+			'{n}.Article.id', '{n}.Article'
+		);
+		$expected = array(
+			1 => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'body' => 'First Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			),
+			2 => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			3 => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'body' => 'Third Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC'
+			)),
+			'{n}.Article.id', '{n}.Article', '{n}.Article.user_id'
+		);
+		$expected = array(
+			1 => array(
+				1 => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				3 => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)),
+			3 => array(
+				2 => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC',
+				'fields' => array('id', 'title', 'user_id')
+			)),
+			'{n}.Article.id', '{n}.Article.title', '{n}.Article.user_id'
+		);
+
+		$expected = array(
+			1 => array(
+				1 => 'First Article',
+				3 => 'Third Article'
+			),
+			3 => array(
+				2 => 'Second Article'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Apple();
+		$expected = array(
+			1 => 'Red Apple 1',
+			2 => 'Bright Red Apple',
+			3 => 'green blue',
+			4 => 'Test Name',
+			5 => 'Blue Green',
+			6 => 'My new apple',
+			7 => 'Some odd color'
+		);
+
+		$this->assertEqual($TestModel->find('list'), $expected);
+		$this->assertEqual($TestModel->Parent->find('list'), $expected);
+
+		$TestModel =& new Post();
+		$result = $TestModel->find('list', array(
+			'fields' => 'Post.title'
+		));
+		$expected = array(
+			1 => 'First Post',
+			2 => 'Second Post',
+			3 => 'Third Post'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => 'title'
+		));
+		$expected = array(
+			1 => 'First Post',
+			2 => 'Second Post',
+			3 => 'Third Post'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('title', 'id')
+		));
+		$expected = array(
+			'First Post' => '1',
+			'Second Post' => '2',
+			'Third Post' => '3'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('title', 'id', 'created')
+		));
+		$expected = array(
+			'2007-03-18 10:39:23' => array(
+				'First Post' => '1'
+			),
+			'2007-03-18 10:41:23' => array(
+				'Second Post' => '2'
+			),
+			'2007-03-18 10:43:23' => array(
+				'Third Post' => '3'
+			),
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.body')
+		));
+		$expected = array(
+			1 => 'First Post Body',
+			2 => 'Second Post Body',
+			3 => 'Third Post Body'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.title', 'Post.body')
+		));
+		$expected = array(
+			'First Post' => 'First Post Body',
+			'Second Post' => 'Second Post Body',
+			'Third Post' => 'Third Post Body'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.id', 'Post.title', 'Author.user'),
+			'recursive' => 1
+		));
+		$expected = array(
+			'mariano' => array(
+				1 => 'First Post',
+				3 => 'Third Post'
+			),
+			'larry' => array(
+				2 => 'Second Post'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new User();
+		$result = $TestModel->find('list', array(
+			'fields' => array('User.user', 'User.password')
+		));
+		$expected = array(
+			'mariano' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'nate' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'larry' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'garrett' => '5f4dcc3b5aa765d61d8327deb882cf99'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new ModifiedAuthor();
+		$result = $TestModel->find('list', array(
+			'fields' => array('Author.id', 'Author.user')
+		));
+		$expected = array(
+			1 => 'mariano (CakePHP)',
+			2 => 'nate (CakePHP)',
+			3 => 'larry (CakePHP)',
+			4 => 'garrett (CakePHP)'
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testFindField method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindField() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$TestModel->id = 1;
+		$result = $TestModel->field('user');
+		$this->assertEqual($result, 'mariano');
+
+		$result = $TestModel->field('User.user');
+		$this->assertEqual($result, 'mariano');
+
+		$TestModel->id = false;
+		$result = $TestModel->field('user', array(
+			'user' => 'mariano'
+		));
+		$this->assertEqual($result, 'mariano');
+
+		$result = $TestModel->field('COUNT(*) AS count', true);
+		$this->assertEqual($result, 4);
+
+		$result = $TestModel->field('COUNT(*)', true);
+		$this->assertEqual($result, 4);
+	}
+/**
+ * testFindUnique method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindUnique() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$this->assertFalse($TestModel->isUnique(array(
+			'user' => 'nate'
+		)));
+		$TestModel->id = 2;
+		$this->assertTrue($TestModel->isUnique(array(
+			'user' => 'nate'
+		)));
+		$this->assertFalse($TestModel->isUnique(array(
+			'user' => 'nate',
+			'password' => '5f4dcc3b5aa765d61d8327deb882cf99'
+		)));
+	}
+/**
+ * test find('count') method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCount() {
+		$this->loadFixtures('User', 'Project');
+
+		$TestModel =& new User();
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 4);
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->order = 'User.id';
+		$this->db->_queriesLog = array();
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 4);
+
+		$this->assertTrue(isset($this->db->_queriesLog[0]['query']));
+		$this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']);
+	}
+
+/**
+ * test find with COUNT(DISTINCT field)
+ *
+ * @return void
+ **/
+	function testFindCountDistinct() {
+		$skip = $this->skipIf(
+			$this->db->config['driver'] == 'sqlite',
+			'SELECT COUNT(DISTINCT field) is not compatible with SQLite'
+		);
+		if ($skip) {
+			return;
+		}
+		$this->loadFixtures('Project');
+		$TestModel =& new Project();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+
+		$result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
+		$this->assertEqual($result, 4);
+	}
+/**
+ * Test find(count) with Db::expression
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCountWithDbExpressions() {
+		if ($this->skipIf($this->db->config['driver'] == 'postgres', '%s testFindCountWithExpressions is not compatible with Postgres')) {
+			return;
+		}
+		$this->loadFixtures('Project');
+		$db = ConnectionManager::getDataSource('test_suite');
+		$TestModel =& new Project();
+
+		$result = $TestModel->find('count', array('conditions' => array(
+			$db->expression('Project.name = \'Project 3\'')
+		)));
+		$this->assertEqual($result, 1);
+
+		$result = $TestModel->find('count', array('conditions' => array(
+			'Project.name' => $db->expression('\'Project 3\'')
+		)));
+		$this->assertEqual($result, 1);
+	}
+/**
+ * testFindMagic method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindMagic() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$result = $TestModel->findByUser('mariano');
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:16:23',
+				'updated' => '2007-03-17 01:18:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findByPassword('5f4dcc3b5aa765d61d8327deb882cf99');
+		$expected = array('User' => array(
+			'id' => '1',
+			'user' => 'mariano',
+			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRead() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->read();
+		$this->assertFalse($result);
+
+		$TestModel->id = 2;
+		$result = $TestModel->read();
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->read(null, 2);
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->read(array('id', 'user'));
+		$expected = array('User' => array('id' => '2', 'user' => 'nate'));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->read('id, user', 2);
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Article')));
+		$this->assertTrue($result);
+
+		$TestModel->id = 1;
+		$result = $TestModel->read('id, user');
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano'
+			),
+			'Article' => array(
+				array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testRecursiveRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveRead() {
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Featured',
+			'ArticleFeatured'
+		);
+		$TestModel =& new User();
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Article')), false);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->read('id, user', 1);
+		$expected = array(
+			'User' => array('id' => '1', 'user' => 'mariano'),
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 1;
+		$result = $TestModel->read('id, user', 1);
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano'
+			),
+			'Article' => array(
+				array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read('id, user', 3);
+		$expected = array(
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry'
+			),
+			'Article' => array(
+				array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'User' => array(
+						'id' => '3',
+						'user' => 'larry',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23',
+						'updated' => '2007-03-17 01:22:31'
+					),
+					'Comment' => array(
+						array(
+							'id' => '5',
+							'article_id' => '2',
+							'user_id' => '1',
+							'comment' => 'First Comment for Second Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:53:23',
+							'updated' => '2007-03-18 10:55:31'
+						),
+						array(
+							'id' => '6',
+							'article_id' => '2',
+							'user_id' => '2',
+							'comment' => 'Second Comment for Second Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:55:23',
+							'updated' => '2007-03-18 10:57:31'
+					)),
+					'Tag' => array(
+						array(
+							'id' => '1',
+							'tag' => 'tag1',
+							'created' => '2007-03-18 12:22:23',
+							'updated' => '2007-03-18 12:24:31'
+						),
+						array(
+							'id' => '3',
+							'tag' => 'tag3',
+							'created' => '2007-03-18 12:26:23',
+							'updated' => '2007-03-18 12:28:31'
+		)))));
+		$this->assertEqual($result, $expected);
+	}
+
+	function testRecursiveFindAll() {
+		$this->db->truncate(new Featured());
+
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Attachment',
+			'ArticleFeatured',
+			'Featured',
+			'Category'
+		);
+		$TestModel =& new Article();
+
+		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 1)));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 3),
+			'limit' => 1,
+			'recursive' => 2
+		));
+
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '1',
+							'user' => 'mariano',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23',
+							'updated' => '2007-03-17 01:18:31'
+						),
+						'Attachment' => array(
+							'id' => '1',
+							'comment_id' => 5,
+							'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23',
+							'updated' => '2007-03-18 10:53:31'
+						)
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '2',
+							'user' => 'nate',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23',
+							'updated' => '2007-03-17 01:20:31'
+						),
+						'Attachment' => false
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$Featured = new Featured();
+
+		$Featured->recursive = 2;
+		$Featured->bindModel(array(
+			'belongsTo' => array(
+				'ArticleFeatured' => array(
+					'conditions' => "ArticleFeatured.published = 'Y'",
+					'fields' => 'id, title, user_id, published'
+				)
+			)
+		));
+
+		$Featured->ArticleFeatured->unbindModel(array(
+			'hasMany' => array('Attachment', 'Comment'),
+			'hasAndBelongsToMany' => array('Tag'))
+		);
+
+		$orderBy = 'ArticleFeatured.id ASC';
+		$result = $Featured->find('all', array(
+			'order' => $orderBy, 'limit' => 3
+		));
+
+		$expected = array(
+			array(
+				'Featured' => array(
+					'id' => '1',
+					'article_featured_id' => '1',
+					'category_id' => '1',
+					'published_date' => '2007-03-31 10:39:23',
+					'end_date' => '2007-05-15 10:39:23',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'ArticleFeatured' => array(
+					'id' => '1',
+					'title' => 'First Article',
+					'user_id' => '1',
+					'published' => 'Y',
+					'User' => array(
+						'id' => '1',
+						'user' => 'mariano',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23',
+						'updated' => '2007-03-17 01:18:31'
+					),
+					'Category' => array(),
+					'Featured' => array(
+						'id' => '1',
+						'article_featured_id' => '1',
+						'category_id' => '1',
+						'published_date' => '2007-03-31 10:39:23',
+						'end_date' => '2007-05-15 10:39:23',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+				)),
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				)),
+			array(
+				'Featured' => array(
+					'id' => '2',
+					'article_featured_id' => '2',
+					'category_id' => '1',
+					'published_date' => '2007-03-31 10:39:23',
+					'end_date' => '2007-05-15 10:39:23',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'ArticleFeatured' => array(
+					'id' => '2',
+					'title' => 'Second Article',
+					'user_id' => '3',
+					'published' => 'Y',
+					'User' => array(
+						'id' => '3',
+						'user' => 'larry',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23',
+						'updated' => '2007-03-17 01:22:31'
+					),
+					'Category' => array(),
+					'Featured' => array(
+						'id' => '2',
+						'article_featured_id' => '2',
+						'category_id' => '1',
+						'published_date' => '2007-03-31 10:39:23',
+						'end_date' => '2007-05-15 10:39:23',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+				)),
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testRecursiveFindAllWithLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveFindAllWithLimit() {
+		$this->loadFixtures('Article', 'User', 'Tag', 'ArticlesTag', 'Comment', 'Attachment');
+		$TestModel =& new Article();
+
+		$TestModel->hasMany['Comment']['limit'] = 2;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 1)
+		));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasMany['Comment']['limit'] = 1;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 3),
+			'limit' => 1,
+			'recursive' => 2
+		));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '1',
+							'user' => 'mariano',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23',
+							'updated' => '2007-03-17 01:18:31'
+						),
+						'Attachment' => array(
+							'id' => '1',
+							'comment_id' => 5,
+							'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23',
+							'updated' => '2007-03-18 10:53:31'
+						)
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
new file mode 100644
index 000000000..b4dcf22fd
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_validation.test.php
@@ -0,0 +1,126 @@
+
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_validation.test.php';
+/**
+ * ModelValidationTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelValidationTest extends BaseModelTest {
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testValidationParams() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate['title'] = array(
+			'rule' => 'customValidatorWithParams',
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'validator' => array(
+				'rule' => 'customValidatorWithParams',
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			),
+			'or' => true,
+			'ignore_on_same' => 'id'
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => 'customValidatorWithMessage',
+			'required' => true
+		);
+		$expected = array(
+			'title' => 'This field will *never* validate! Muhahaha!'
+		);
+
+		$this->assertEqual($TestModel->invalidFields(), $expected);
+	}
+/**
+ * Tests validation parameter fieldList in invalidFields
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidFieldsWithFieldListParams() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate = $validate = array(
+			'title' => array(
+				'rule' => 'customValidator',
+				'required' => true
+			),
+			'name' => array(
+				'rule' => 'allowEmpty',
+				'required' => true
+		));
+		$TestModel->invalidFields(array('fieldList' => array('title')));
+		$expected = array(
+			'title' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->invalidFields(array('fieldList' => array('name')));
+		$expected = array(
+			'name' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->invalidFields(array('fieldList' => array('name', 'title')));
+		$expected = array(
+			'name' => 'This field cannot be left blank',
+			'title' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->whitelist = array('name');
+		$TestModel->invalidFields();
+		$expected = array('name' => 'This field cannot be left blank');
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$this->assertEqual($TestModel->validate, $validate);
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
new file mode 100644
index 000000000..1b058d44e
--- /dev/null
+++ b/cake/tests/cases/libs/model/model_write.test.php
@@ -0,0 +1,3890 @@
+
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @version       $Revision: 8225 $
+ * @modifiedby    $LastChangedBy: mark_story $
+ * @lastmodified  $Date: 2009-07-07 23:25:30 -0400 (Tue, 07 Jul 2009) $
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'model_write.test.php';
+/**
+ * ModelWriteTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelWriteTest extends BaseModelTest {
+/**
+ * testInsertAnotherHabtmRecordWithSameForeignKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsertAnotherHabtmRecordWithSameForeignKey() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
+		$TestModel = new JoinA();
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$expected = array(
+			'JoinAsJoinB' => array(
+				'id' => 1,
+				'join_a_id' => 1,
+				'join_b_id' => 2,
+				'other' => 'Data for Join A 1 Join B 2',
+				'created' => '2008-01-03 10:56:33',
+				'updated' => '2008-01-03 10:56:33'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->JoinAsJoinB->create();
+		$result = $TestModel->JoinAsJoinB->save(array(
+			'join_a_id' => 1,
+			'join_b_id' => 1,
+			'other' => 'Data for Join A 1 Join B 1',
+			'created' => '2008-01-03 10:56:44',
+			'updated' => '2008-01-03 10:56:44'
+		));
+		$this->assertTrue($result);
+		$lastInsertId = $TestModel->JoinAsJoinB->getLastInsertID();
+		$this->assertTrue($lastInsertId != null);
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$expected = array(
+			'JoinAsJoinB' => array(
+				'id' => 1,
+				'join_a_id' => 1,
+				'join_b_id' => 2,
+				'other' => 'Data for Join A 1 Join B 2',
+				'created' => '2008-01-03 10:56:33',
+				'updated' => '2008-01-03 10:56:33'
+		));
+		$this->assertEqual($result, $expected);
+
+		$updatedValue = 'UPDATED Data for Join A 1 Join B 2';
+		$TestModel->JoinAsJoinB->id = 1;
+		$result = $TestModel->JoinAsJoinB->saveField('other', $updatedValue, false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
+	}
+/**
+ * testSaveDateAsFirstEntry method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveDateAsFirstEntry() {
+		$this->loadFixtures('Article');
+
+		$Article =& new Article();
+
+		$data = array(
+			'Article' => array(
+				'created' => array(
+					'day' => '1',
+					'month' => '1',
+					'year' => '2008'
+				),
+				'title' => 'Test Title',
+				'user_id' => 1
+		));
+		$Article->create();
+		$this->assertTrue($Article->save($data));
+
+		$testResult = $Article->find(array('Article.title' => 'Test Title'));
+
+		$this->assertEqual($testResult['Article']['title'], $data['Article']['title']);
+		$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
+
+	}
+/**
+ * testUnderscoreFieldSave method
+ *
+ * @access public
+ * @return void
+ */
+	function testUnderscoreFieldSave() {
+		$this->loadFixtures('UnderscoreField');
+		$UnderscoreField =& new UnderscoreField();
+
+		$currentCount = $UnderscoreField->find('count');
+		$this->assertEqual($currentCount, 3);
+		$data = array('UnderscoreField' => array(
+			'user_id' => '1',
+			'my_model_has_a_field' => 'Content here',
+			'body' => 'Body',
+			'published' => 'Y',
+			'another_field' => 4
+		));
+		$ret = $UnderscoreField->save($data);
+		$this->assertTrue($ret);
+
+		$currentCount = $UnderscoreField->find('count');
+		$this->assertEqual($currentCount, 4);
+	}
+/**
+ * testAutoSaveUuid method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoSaveUuid() {
+		// SQLite does not support non-integer primary keys
+		$this->skipIf($this->db->config['driver'] == 'sqlite');
+
+		$this->loadFixtures('Uuid');
+		$TestModel =& new Uuid();
+
+		$TestModel->save(array('title' => 'Test record'));
+		$result = $TestModel->findByTitle('Test record');
+		$this->assertEqual(
+			array_keys($result['Uuid']),
+			array('id', 'title', 'count', 'created', 'updated')
+		);
+		$this->assertEqual(strlen($result['Uuid']['id']), 36);
+	}
+/**
+ * testZeroDefaultFieldValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testZeroDefaultFieldValue() {
+		$this->skipIf(
+			$this->db->config['driver'] == 'sqlite',
+			'%s SQLite uses loose typing, this operation is unsupported'
+		);
+		$this->loadFixtures('DataTest');
+		$TestModel =& new DataTest();
+
+		$TestModel->create(array());
+		$TestModel->save();
+		$result = $TestModel->findById($TestModel->id);
+		$this->assertIdentical($result['DataTest']['count'], '0');
+		$this->assertIdentical($result['DataTest']['float'], '0');
+	}
+/**
+ * testNonNumericHabtmJoinKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testNonNumericHabtmJoinKey() {
+		$this->loadFixtures('Post', 'Tag', 'PostsTag');
+		$Post =& new Post();
+		$Post->bind('Tag', array('type' => 'hasAndBelongsToMany'));
+		$Post->Tag->primaryKey = 'tag';
+
+		$result = $Post->find('all');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+						),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testAllowSimulatedFields() {
+		$TestModel =& new ValidationTest1();
+
+		$TestModel->create(array(
+			'title' => 'foo',
+			'bar' => 'baz'
+		));
+		$expected = array(
+			'ValidationTest1' => array(
+				'title' => 'foo',
+				'bar' => 'baz'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+	}
+/**
+ * test that Caches are getting cleared on save().
+ * ensure that both inflections of controller names are getting cleared
+ * as url for controller could be either overallFavorites/index or overall_favorites/index
+ *
+ * @return void
+ **/
+	function testCacheClearOnSave() {
+		$_back = array(
+			'check' => Configure::read('Cache.check'),
+			'disable' => Configure::read('Cache.disable'),
+		);
+		Configure::write('Cache.check', true);
+		Configure::write('Cache.disable', false);
+
+		$this->loadFixtures('OverallFavorite');
+		$OverallFavorite =& new OverallFavorite();
+
+		touch(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php');
+		touch(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php');
+
+		$data = array(
+			'OverallFavorite' => array(
+		 		'model_type' => '8-track',
+				'model_id' => '3',
+				'priority' => '1'
+			)
+		);
+		$OverallFavorite->create($data);
+		$OverallFavorite->save();
+
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php'));
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php'));
+
+		Configure::write('Cache.check', $_back['check']);
+		Configure::write('Cache.disable', $_back['disable']);
+	}
+/**
+ * testSaveWithCounterCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCounterCache() {
+		$this->loadFixtures('Syfile', 'Item');
+		$TestModel =& new Syfile();
+		$TestModel2 =& new Item();
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], null);
+
+		$TestModel2->save(array(
+			'name' => 'Item 7',
+			'syfile_id' => 1,
+			'published' => false
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$TestModel2->delete(1);
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+
+		$TestModel2->id = 2;
+		$TestModel2->saveField('syfile_id', 1);
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$result = $TestModel->findById(2);
+		$this->assertIdentical($result['Syfile']['item_count'], '0');
+	}
+/**
+ * Tests that counter caches are updated when records are added
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheIncrease() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+		$data = array('Post' => array(
+			'title' => 'New Post',
+			'user_id' => 66
+		));
+
+		$Post->save($data);
+		$user = $User->find('first', array(
+			'conditions' => array('id' => 66),
+			'recursive' => -1
+		));
+
+		$result = $user[$User->alias]['post_count'];
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests that counter caches are updated when records are deleted
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheDecrease() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+
+		$Post->del(2);
+		$user = $User->find('first', array(
+			'conditions' => array('id' => 66),
+			'recursive' => -1
+		));
+
+		$result = $user[$User->alias]['post_count'];
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Tests that counter caches are updated when foreign keys of counted records change
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheUpdated() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+
+		$data = $Post->find('first', array(
+			'conditions' => array('id' => 1),
+			'recursive' => -1
+		));
+		$data[$Post->alias]['user_id'] = 301;
+		$Post->save($data);
+
+		$users = $User->find('all',array('order' => 'User.id'));
+		$this->assertEqual($users[0]['User']['post_count'], 1);
+		$this->assertEqual($users[1]['User']['post_count'], 2);
+	}
+/**
+ * Test counter cache with models that use a non-standard (i.e. not using 'id')
+ * as their primary key.
+ *
+ * @access public
+ * @return void
+ */
+    function testCounterCacheWithNonstandardPrimaryKey() {
+        $this->loadFixtures(
+			'CounterCacheUserNonstandardPrimaryKey',
+			'CounterCachePostNonstandardPrimaryKey'
+		);
+
+        $User = new CounterCacheUserNonstandardPrimaryKey();
+        $Post = new CounterCachePostNonstandardPrimaryKey();
+
+		$data = $Post->find('first', array(
+			'conditions' => array('pid' => 1),
+			'recursive' => -1
+		));
+		$data[$Post->alias]['uid'] = 301;
+		$Post->save($data);
+
+		$users = $User->find('all',array('order' => 'User.uid'));
+		$this->assertEqual($users[0]['User']['post_count'], 1);
+		$this->assertEqual($users[1]['User']['post_count'], 2);
+    }
+
+/**
+ * test Counter Cache With Self Joining table
+ *
+ * @return void
+ * @access public
+ */
+	function testCounterCacheWithSelfJoin() {
+		$skip = $this->skipIf(
+			($this->db->config['driver'] == 'sqlite'),
+			'SQLite 2.x does not support ALTER TABLE ADD COLUMN'
+		);
+		if ($skip) {
+			return;
+		}
+
+		$this->loadFixtures('CategoryThread');
+		$this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD COLUMN child_count INTEGER");
+		$Category =& new CategoryThread();
+		$result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5));
+		$this->assertTrue($result);
+
+		$Category =& new CategoryThread();
+		$Category->belongsTo['ParentCategory']['counterCache'] = 'child_count';
+		$Category->updateCounterCache(array('parent_id' => 5));
+		$result = Set::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count');
+		$expected = array_fill(0, 1, 1);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveWithCounterCacheScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCounterCacheScope() {
+		$this->loadFixtures('Syfile', 'Item');
+		$TestModel =& new Syfile();
+		$TestModel2 =& new Item();
+		$TestModel2->belongsTo['Syfile']['counterCache'] = true;
+		$TestModel2->belongsTo['Syfile']['counterScope'] = array('published' => true);
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], null);
+
+		$TestModel2->save(array(
+			'name' => 'Item 7',
+			'syfile_id' => 1,
+			'published'=> true
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+
+		$TestModel2->id = 1;
+		$TestModel2->saveField('published', true);
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$TestModel2->save(array(
+			'id' => 1,
+			'syfile_id' => 1,
+			'published'=> false
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+	}
+/**
+ * testValidatesBackwards method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatesBackwards() {
+		$TestModel =& new TestValidate();
+
+		$TestModel->validate = array(
+			'user_id' => VALID_NUMBER,
+			'title' => VALID_NOT_EMPTY,
+			'body' => VALID_NOT_EMPTY
+		);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '',
+			'body' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => 'not a number',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+	}
+/**
+ * testValidates method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidates() {
+		$TestModel =& new TestValidate();
+
+		$TestModel->validate = array(
+			'user_id' => 'numeric',
+			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'),
+			'body' => 'notEmpty'
+		);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data) && $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '0',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate['modified'] = array('allowEmpty' => true, 'rule' => 'date');
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => '2007-05-01'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => 'invalid-date-here'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => 0
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => '0'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate['modified'] = array('allowEmpty' => false, 'rule' => 'date');
+
+		$data = array('TestValidate' => array('modified' => null));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('modified' => false));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('modified' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'modified' => '2007-05-01'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate['slug'] = array('allowEmpty' => false, 'rule' => array('maxLength', 45));
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => 'slug-right-here'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate = array(
+			'number' => array(
+				'rule' => 'validateNumber',
+				'min' => 3,
+				'max' => 5
+			),
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'notEmpty'
+		));
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '0'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 0
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '3'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 3
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'number' => array(
+				'rule' => 'validateNumber',
+				'min' => 5,
+				'max' => 10
+			),
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'notEmpty'
+		));
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '3'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 3
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'validateTitle'
+		));
+
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('title' => 'new title'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('title' => 'title-new'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array('title' => array(
+			'allowEmpty' => true,
+			'rule' => 'validateTitle'
+		));
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'length' => array(
+					'allowEmpty' => true,
+					'rule' => array('maxLength', 10)
+		)));
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'rule' => array('userDefined', 'Article', 'titleDuplicate')
+		));
+		$data = array('TestValidate' => array('title' => 'My Article Title'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'My Article With a Different Title'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'tooShort' => array('rule' => array('minLength', 50)),
+				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
+			),
+		);
+		$data = array('TestValidate' => array(
+			'title' => 'I am a short string'
+		));
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+		$result = $TestModel->validationErrors;
+		$expected = array(
+			'title' => 'onlyLetters'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'tooShort' => array(
+					'rule' => array('minLength', 50),
+					'last' => true
+				),
+				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
+			),
+		);
+		$data = array('TestValidate' => array(
+			'title' => 'I am a short string'
+		));
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+		$result = $TestModel->validationErrors;
+		$expected = array(
+			'title' => 'tooShort'
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveField method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveField() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', 'New First Article');
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => 'First Article Body'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', '');
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => '',
+			'body' => 'First Article Body'
+		));
+		$result['Article']['title'] = trim($result['Article']['title']);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$TestModel->set('body', 'Messed up data');
+		$this->assertTrue($TestModel->saveField('title', 'First Article'));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'First Article',
+			'body' => 'First Article Body'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', '', true);
+		$this->assertFalse($result);
+
+		$this->loadFixtures('Node', 'Dependency');
+		$Node =& new Node();
+		$Node->set('id', 1);
+		$result = $Node->read();
+		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
+
+		$Node->saveField('state', 10);
+		$result = $Node->read();
+		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
+	}
+/**
+ * testSaveWithCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCreate() {
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'User',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Attachment'
+		);
+		$TestModel =& new User();
+
+		$data = array('User' => array(
+			'user' => 'user',
+			'password' => ''
+		));
+		$result = $TestModel->save($data);
+		$this->assertFalse($result);
+		$this->assertTrue(!empty($TestModel->validationErrors));
+
+		$TestModel =& new Article();
+
+		$data = array('Article' => array(
+			'user_id' => '',
+			'title' => '',
+			'body' => ''
+		));
+		$result = $TestModel->create($data) && $TestModel->save();
+		$this->assertFalse($result);
+		$this->assertTrue(!empty($TestModel->validationErrors));
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => ''
+		));
+		$result = $TestModel->create($data) && $TestModel->save();
+		$this->assertFalse($result);
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'title' => 'New First Article'
+		));
+		$result = $TestModel->create() && $TestModel->save($data, false);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => 'First Article Body',
+			'published' => 'N'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'user_id' => '2',
+			'title' => 'First Article',
+			'body' => 'New First Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data, true, array('id', 'title', 'published'));
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'First Article',
+			'body' => 'First Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'Tag' => array('Tag' => array(1, 3))
+		);
+		$TestModel->create();
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'published' => 'N',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+			),
+			'Comment' => array(),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Comment' => array(
+			'article_id' => '4',
+			'user_id' => '1',
+			'comment' => 'Comment New Article',
+			'published' => 'Y',
+			'created' => '2007-03-18 14:57:23',
+			'updated' => '2007-03-18 14:59:31'
+		));
+		$result = $TestModel->Comment->create() && $TestModel->Comment->save($data);
+		$this->assertTrue($result);
+
+		$data = array('Attachment' => array(
+			'comment_id' => '7',
+			'attachment' => 'newattachment.zip',
+			'created' => '2007-03-18 15:02:23',
+			'updated' => '2007-03-18 15:04:31'
+		));
+		$result = $TestModel->Comment->Attachment->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'published' => 'N',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '7',
+					'article_id' => '4',
+					'user_id' => '1',
+					'comment' => 'Comment New Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 14:57:23',
+					'updated' => '2007-03-18 14:59:31',
+					'Article' => array(
+						'id' => '4',
+						'user_id' => '2',
+						'title' => 'New Article',
+						'body' => 'New Article Body',
+						'published' => 'N',
+						'created' => '2007-03-18 14:55:23',
+						'updated' => '2007-03-18 14:57:31'
+					),
+					'User' => array(
+						'id' => '1',
+						'user' => 'mariano',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23',
+						'updated' => '2007-03-17 01:18:31'
+					),
+					'Attachment' => array(
+						'id' => '2',
+						'comment_id' => '7',
+						'attachment' => 'newattachment.zip',
+						'created' => '2007-03-18 15:02:23',
+						'updated' => '2007-03-18 15:04:31'
+			))),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveWithSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithSet() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		// Create record we will be updating later
+
+		$data = array('Article' => array(
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		// Check record we created
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// Create new record just to overlap Model->id on previously created record
+
+		$data = array('Article' => array(
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// Go back and edit the first article we created, starting by checking it's still there
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// And now do the update with set()
+
+		$data = array('Article' => array(
+			'id' => '4',
+			'title' => 'Fourth Article - New Title',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array('id' => '5', 'title' => 'Fifth Article - New Title 5'));
+		$result = ($TestModel->set($data) && $TestModel->save());
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article - New Title 5',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
+		$expected = array(
+			array('Article' => array('id' => 1, 'title' => 'First Article' )),
+			array('Article' => array('id' => 2, 'title' => 'Second Article' )),
+			array('Article' => array('id' => 3, 'title' => 'Third Article' )),
+			array('Article' => array('id' => 4, 'title' => 'Fourth Article - New Title' )),
+			array('Article' => array('id' => 5, 'title' => 'Fifth Article - New Title 5' ))
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveWithNonExistentFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithNonExistentFields() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+		$TestModel->recursive = -1;
+
+		$data = array(
+			'non_existent' => 'This field does not exist',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		);
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'user_id' => '1',
+			'non_existent' => 'This field does not exist',
+			'title' => 'Fiveth Article - New Title',
+			'body' => 'Fiveth Article Body',
+			'published' => 'N'
+		);
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '1',
+			'title' => 'Fiveth Article - New Title',
+			'body' => 'Fiveth Article Body',
+			'published' => 'N'
+		));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveFromXml method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveFromXml() {
+		$this->loadFixtures('Article');
+		App::import('Core', 'Xml');
+
+		$Article = new Article();
+		$Article->save(new Xml('
    '));
+		$this->assertTrue($Article->save(new Xml('
    ')));
+
+		$results = $Article->find(array('Article.title' => 'test xml'));
+		$this->assertTrue($results);
+	}
+/**
+ * testSaveHabtm method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveHabtm() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
+		$TestModel =& new Article();
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:20:23',
+				'updated' => '2007-03-17 01:22:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+			)),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article'
+			),
+			'Tag' => array('Tag' => array(1, 2))
+		);
+
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
+		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array('id' => '2'), 'Tag' => array('Tag' => array(2, 3)));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array(1, 2, 3)));
+
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array()));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Tag' => array('Tag' => ''));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array(2, 3)));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article'
+		));
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article Title'
+		));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article Title',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(2, 3)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'Changed Second Article'
+		));
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Changed Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 3)
+			),
+			'Article' => array('id' => '2'),
+		);
+
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Changed Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => 10,
+				'user_id' => '2',
+				'title' => 'New Article With Tags and fieldList',
+				'body' => 'New Article Body with Tags and fieldList',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'Tag' => array(
+				'Tag' => array(1, 2, 3)
+		));
+		$result =  $TestModel->create()
+				&& $TestModel->save($data, true, array('user_id', 'title', 'published'));
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
+		$result = $TestModel->read();
+		$expected = array(
+			'Article' => array(
+				'id' => 4,
+				'user_id' => 2,
+				'title' => 'New Article With Tags and fieldList',
+				'body' => '',
+				'published' => 'N',
+				'created' => '',
+				'updated' => ''
+			),
+			'Tag' => array(
+				0 => array(
+					'id' => 1,
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				1 => array(
+					'id' => 2,
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				2 => array(
+					'id' => 3,
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+
+		$this->loadFixtures('JoinA', 'JoinC', 'JoinAC', 'JoinB', 'JoinAB');
+		$TestModel = new JoinA();
+		$TestModel->hasBelongsToMany['JoinC']['unique'] = true;
+		$data = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'Join A 1',
+				'body' => 'Join A 1 Body',
+			),
+			'JoinC' => array(
+				'JoinC' => array(
+					array('join_c_id' => 2, 'other' => 'new record'),
+					array('join_c_id' => 3, 'other' => 'new record')
+				)
+			)
+		);
+		$TestModel->save($data);
+		$result = $TestModel->read(null, 1);
+		$time = date('Y-M-D H:i:s');
+		$expected = array(4, 5);
+		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
+		$expected = array('new record', 'new record');
+		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
+	}
+/**
+ * testSaveHabtmCustomKeys method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveHabtmCustomKeys() {
+		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
+		$Story =& new Story();
+
+		$data = array(
+			'Story' => array('story' => '1'),
+			'Tag' => array(
+				'Tag' => array(2, 3)
+		));
+		$result = $Story->set($data);
+		$this->assertTrue($result);
+
+		$result = $Story->save();
+		$this->assertTrue($result);
+
+		$result = $Story->find('all');
+		$expected = array(
+			array(
+				'Story' => array(
+					'story' => 1,
+					'title' => 'First Story'
+				),
+				'Tag' => array(
+					array(
+						'id' => 2,
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+					),
+					array(
+						'id' => 3,
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Story' => array(
+					'story' => 2,
+					'title' => 'Second Story'
+				),
+				'Tag' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmSaveKeyResolution method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmSaveKeyResolution() {
+		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
+		$ThePaper =& new ThePaper();
+
+		$ThePaper->id = 1;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(1, 2, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '1',
+				'device_type_id' => '1',
+				'name' => 'Device 1',
+				'typ' => '1'
+			),
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(1, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '1',
+				'device_type_id' => '1',
+				'name' => 'Device 1',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+			));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+	}
+/**
+ * testCreationOfEmptyRecord method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationOfEmptyRecord() {
+		$this->loadFixtures('Author');
+		$TestModel =& new Author();
+		$this->assertEqual($TestModel->find('count'), 4);
+
+		$TestModel->deleteAll(true, false, false);
+		$this->assertEqual($TestModel->find('count'), 0);
+
+		$result = $TestModel->save();
+		$this->assertTrue(isset($result['Author']['created']));
+		$this->assertTrue(isset($result['Author']['updated']));
+		$this->assertEqual($TestModel->find('count'), 1);
+	}
+/**
+ * testCreateWithPKFiltering method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreateWithPKFiltering() {
+		$TestModel =& new Article();
+		$data = array(
+			'id' => 5,
+			'user_id' => 2,
+			'title' => 'My article',
+			'body' => 'Some text'
+		);
+
+		$result = $TestModel->create($data);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->id, 5);
+
+		$result = $TestModel->create($data, true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+
+		$result = $TestModel->create(array('Article' => $data), true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+
+		$data = array(
+			'id' => 6,
+			'user_id' => 2,
+			'title' => 'My article',
+			'body' => 'Some text',
+			'created' => '1970-01-01 00:00:00',
+			'updated' => '1970-01-01 12:00:00',
+			'modified' => '1970-01-01 12:00:00'
+		);
+
+		$result = $TestModel->create($data);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => 6,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text',
+				'created' => '1970-01-01 00:00:00',
+				'updated' => '1970-01-01 12:00:00',
+				'modified' => '1970-01-01 12:00:00'
+		));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->id, 6);
+
+		$result = $TestModel->create(array(
+			'Article' => array_diff_key($data, array(
+				'created' => true,
+				'updated' => true,
+				'modified' => true
+		))), true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+	}
+/**
+ * testCreationWithMultipleData method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleData() {
+		$this->loadFixtures('Article', 'Comment');
+		$Article =& new Article();
+		$Comment =& new Comment();
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$comments = $Comment->find('all', array(
+			'fields' => array('id','article_id','user_id','comment','published'), 'recursive' => -1));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		))));
+
+		$this->assertEqual($comments, array(
+			array('Comment' => array(
+				'id' => 1,
+				'article_id' => 1,
+				'user_id' => 2,
+				'comment' => 'First Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 2,
+				'article_id' => 1,
+				'user_id' => 4,
+				'comment' => 'Second Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 3,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Third Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 4,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Fourth Comment for First Article',
+				'published' => 'N'
+			)),
+			array('Comment' => array(
+				'id' => 5,
+				'article_id' => 2,
+				'user_id' => 1,
+				'comment' => 'First Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 6,
+				'article_id' => 2,
+				'user_id' => 2,
+				'comment' => 'Second Comment for Second Article',
+				'published' => 'Y'
+		))));
+
+		$data = array(
+			'Comment' => array(
+				'article_id' => 2,
+				'user_id' => 4,
+				'comment' => 'Brand New Comment',
+				'published' => 'N'
+			),
+			'Article' => array(
+				'id' => 2,
+				'title' => 'Second Article Modified'
+		));
+
+		$result = $Comment->create($data);
+
+		$this->assertTrue($result);
+		$result = $Comment->save();
+		$this->assertTrue($result);
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$comments = $Comment->find('all', array(
+			'fields' => array('id','article_id','user_id','comment','published'),
+			'recursive' => -1
+		));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		))));
+
+		$this->assertEqual($comments, array(
+			array('Comment' => array(
+				'id' => 1,
+				'article_id' => 1,
+				'user_id' => 2,
+				'comment' => 'First Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 2,
+				'article_id' => 1,
+				'user_id' => 4,
+				'comment' => 'Second Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 3,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Third Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 4,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Fourth Comment for First Article',
+				'published' => 'N'
+			)),
+			array('Comment' => array(
+				'id' => 5,
+				'article_id' => 2,
+				'user_id' => 1,
+				'comment' => 'First Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 6,
+				'article_id' => 2,
+				'user_id' => 2, 'comment' =>
+				'Second Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 7,
+				'article_id' => 2,
+				'user_id' => 4,
+				'comment' => 'Brand New Comment',
+				'published' => 'N'
+	))));
+
+	}
+/**
+ * testCreationWithMultipleDataSameModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleDataSameModel() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$SecondaryArticle =& new Article();
+
+		$result = $Article->field('title', array('id' => 1));
+		$this->assertEqual($result, 'First Article');
+
+		$data = array(
+			'Article' => array(
+				'user_id' => 2,
+				'title' => 'Brand New Article',
+				'body' => 'Brand New Article Body',
+				'published' => 'Y'
+			),
+			'SecondaryArticle' => array(
+				'id' => 1
+		));
+
+		$Article->create();
+		$result = $Article->save($data);
+		$this->assertTrue($result);
+
+		$result = $Article->getInsertID();
+		$this->assertTrue(!empty($result));
+
+		$result = $Article->field('title', array('id' => 1));
+		$this->assertEqual($result, 'First Article');
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+			)),
+			array('Article' => array(
+				'id' => 4,
+				'title' => 'Brand New Article'
+		))));
+	}
+/**
+ * testCreationWithMultipleDataSameModelManualInstances method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleDataSameModelManualInstances() {
+		$this->loadFixtures('PrimaryModel');
+		$Primary =& new PrimaryModel();
+		$Secondary =& new PrimaryModel();
+
+		$result = $Primary->field('primary_name', array('id' => 1));
+		$this->assertEqual($result, 'Primary Name Existing');
+
+		$data = array(
+			'PrimaryModel' => array(
+				'primary_name' => 'Primary Name New'
+			),
+			'SecondaryModel' => array(
+				'id' => array(1)
+		));
+
+		$Primary->create();
+		$result = $Primary->save($data);
+		$this->assertTrue($result);
+
+		$result = $Primary->field('primary_name', array('id' => 1));
+		$this->assertEqual($result, 'Primary Name Existing');
+
+		$result = $Primary->getInsertID();
+		$this->assertTrue(!empty($result));
+
+		$result = $Primary->field('primary_name', array('id' => $result));
+		$this->assertEqual($result, 'Primary Name New');
+
+		$result = $Primary->find('count');
+		$this->assertEqual($result, 2);
+	}
+/**
+ * testRecordExists method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecordExists() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$this->assertFalse($TestModel->exists());
+		$TestModel->read(null, 1);
+		$this->assertTrue($TestModel->exists());
+		$TestModel->create();
+		$this->assertFalse($TestModel->exists());
+		$TestModel->id = 4;
+		$this->assertTrue($TestModel->exists());
+
+		$TestModel =& new TheVoid();
+		$this->assertFalse($TestModel->exists());
+		$TestModel->id = 5;
+		$this->assertFalse($TestModel->exists());
+	}
+/**
+ * testUpdateExisting method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateExisting() {
+		$this->loadFixtures('User', 'Article', 'Comment');
+		$TestModel =& new User();
+		$TestModel->create();
+
+		$TestModel->save(array(
+			'User' => array(
+				'user' => 'some user',
+				'password' => 'some password'
+		)));
+		$this->assertTrue(is_int($TestModel->id) || (intval($TestModel->id) === 5));
+		$id = $TestModel->id;
+
+		$TestModel->save(array(
+			'User' => array(
+				'user' => 'updated user'
+		)));
+		$this->assertEqual($TestModel->id, $id);
+
+		$result = $TestModel->findById($id);
+		$this->assertEqual($result['User']['user'], 'updated user');
+		$this->assertEqual($result['User']['password'], 'some password');
+
+		$Article =& new Article();
+		$Comment =& new Comment();
+		$data = array(
+			'Comment' => array(
+				'id' => 1,
+				'comment' => 'First Comment for First Article'
+			),
+			'Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+		));
+
+		$result = $Article->save($data);
+		$this->assertTrue($result);
+
+		$result = $Comment->save($data);
+		$this->assertTrue($result);
+	}
+/**
+ * testUpdateMultiple method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateMultiple() {
+		$this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread');
+		$TestModel =& new Comment();
+		$result = Set::extract($TestModel->find('all'), '{n}.Comment.user_id');
+		$expected = array('2', '4', '1', '1', '1', '2');
+		$this->assertEqual($result, $expected);
+
+		$TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2));
+		$result = Set::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id');
+		$expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->updateAll(
+			array('Comment.comment' => "'Updated today'"),
+			array('Comment.user_id' => 5)
+		);
+		$this->assertTrue($result);
+		$result = Set::extract(
+			$TestModel->find('all', array(
+				'conditions' => array(
+					'Comment.user_id' => 5
+			))),
+			'{n}.Comment.comment'
+		);
+		$expected = array_fill(0, 2, 'Updated today');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testHabtmUuidWithUuidId method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUuidWithUuidId() {
+		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolio');
+		$TestModel =& new Uuidportfolio();
+
+		$data = array('Uuidportfolio' => array('name' => 'Portfolio 3'));
+		$data['Uuiditem']['Uuiditem'] = array('483798c8-c7cc-430e-8cf9-4fcc40cf8569');
+		$TestModel->create($data);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$result = $TestModel->read(null, $id);
+		$this->assertEqual(1, count($result['Uuiditem']));
+		$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
+	}
+/**
+ * test HABTM saving when join table has no primary key and only 2 columns.
+ *
+ * @return void
+ **/
+	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
+		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
+		$Fruit =& new Fruit();
+		$data = array(
+			'Fruit' => array(
+				'color' => 'Red',
+				'shape' => 'Heart-shaped',
+				'taste' => 'sweet',
+				'name' => 'Strawberry',
+			),
+			'UuidTag' => array(
+				'UuidTag' => array(
+					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
+				)
+			)
+		);
+		$this->assertTrue($Fruit->save($data));
+	}
+/**
+ * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
+ *
+ * @return void
+ **/
+	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
+		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
+		$Fruit =& new FruitNoWith();
+		$data = array(
+			'Fruit' => array(
+				'color' => 'Red',
+				'shape' => 'Heart-shaped',
+				'taste' => 'sweet',
+				'name' => 'Strawberry',
+			),
+			'UuidTag' => array(
+				'UuidTag' => array(
+					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
+				)
+			)
+		);
+		$this->assertTrue($Fruit->save($data));
+	}
+
+/**
+ * testHabtmUuidWithNumericId method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUuidWithNumericId() {
+		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolioNumericid');
+		$TestModel =& new Uuiditem();
+
+		$data = array('Uuiditem' => array('name' => 'Item 7', 'published' => 0));
+		$data['Uuidportfolio']['Uuidportfolio'] = array('480af662-eb8c-47d3-886b-230540cf8569');
+		$TestModel->create($data);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$result = $TestModel->read(null, $id);
+		$this->assertEqual(1, count($result['Uuidportfolio']));
+	}
+/**
+ * testSaveMultipleHabtm method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveMultipleHabtm() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
+		$TestModel = new JoinA();
+		$result = $TestModel->findById(1);
+
+		$expected = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'Join A 1',
+				'body' => 'Join A 1 Body',
+				'created' => '2008-01-03 10:54:23',
+				'updated' => '2008-01-03 10:54:23'
+			),
+			'JoinB' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join B 2',
+					'created' => '2008-01-03 10:55:02',
+					'updated' => '2008-01-03 10:55:02',
+					'JoinAsJoinB' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_b_id' => 2,
+						'other' => 'Data for Join A 1 Join B 2',
+						'created' => '2008-01-03 10:56:33',
+						'updated' => '2008-01-03 10:56:33'
+			))),
+			'JoinC' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join C 2',
+					'created' => '2008-01-03 10:56:12',
+					'updated' => '2008-01-03 10:56:12',
+					'JoinAsJoinC' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_c_id' => 2,
+						'other' => 'Data for Join A 1 Join C 2',
+						'created' => '2008-01-03 10:57:22',
+						'updated' => '2008-01-03 10:57:22'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->id = 1;
+		$data = array(
+			'JoinA' => array(
+				'id' => '1',
+				'name' => 'New name for Join A 1',
+				'updated' => $ts
+			),
+			'JoinB' => array(
+				array(
+					'id' => 1,
+					'join_b_id' => 2,
+					'other' => 'New data for Join A 1 Join B 2',
+					'created' => $ts,
+					'updated' => $ts
+			)),
+			'JoinC' => array(
+				array(
+					'id' => 1,
+					'join_c_id' => 2,
+					'other' => 'New data for Join A 1 Join C 2',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+
+		$TestModel->set($data);
+		$TestModel->save();
+
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'New name for Join A 1',
+				'body' => 'Join A 1 Body',
+				'created' => '2008-01-03 10:54:23',
+				'updated' => $ts
+			),
+			'JoinB' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join B 2',
+					'created' => '2008-01-03 10:55:02',
+					'updated' => '2008-01-03 10:55:02',
+					'JoinAsJoinB' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_b_id' => 2,
+						'other' => 'New data for Join A 1 Join B 2',
+						'created' => $ts,
+						'updated' => $ts
+			))),
+			'JoinC' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join C 2',
+					'created' => '2008-01-03 10:56:12',
+					'updated' => '2008-01-03 10:56:12',
+					'JoinAsJoinC' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_c_id' => 2,
+						'other' => 'New data for Join A 1 Join C 2',
+						'created' => $ts,
+						'updated' => $ts
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAll() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$result = $TestModel->find('all');
+		$this->assertEqual(count($result), 3);
+		$this->assertFalse(isset($result[3]));
+		$ts = date('Y-m-d H:i:s');
+
+		$TestModel->saveAll(array(
+			'Post' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author'
+			),
+			'Author' => array(
+				'user' => 'bob',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf90'
+		)));
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			'Post' => array(
+				'id' => '4',
+				'author_id' => '5',
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author',
+				'published' => 'N',
+				'created' => $ts,
+				'updated' => $ts
+			),
+			'Author' => array(
+				'id' => '5',
+				'user' => 'bob',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
+				'created' => $ts,
+				'updated' => $ts,
+				'test' => 'working'
+		));
+		$this->assertEqual($result[3], $expected);
+		$this->assertEqual(count($result), 4);
+
+		$TestModel->deleteAll(true);
+		$this->assertEqual($TestModel->find('all'), array());
+
+		// SQLite seems to reset the PK counter when that happens, so we need this to make the tests pass
+		$this->db->truncate($TestModel);
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->saveAll(array(
+			array(
+				'title' => 'Multi-record post 1',
+				'body' => 'First multi-record post',
+				'author_id' => 2
+			),
+			array(
+				'title' => 'Multi-record post 2',
+				'body' => 'Second multi-record post',
+				'author_id' => 2
+		)));
+
+		$result = $TestModel->find('all', array(
+			'recursive' => -1,
+			'order' => 'Post.id ASC'
+		));
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '2',
+					'title' => 'Multi-record post 1',
+					'body' => 'First multi-record post',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '2',
+					'title' => 'Multi-record post 2',
+					'body' => 'Second multi-record post',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Comment();
+		$ts = date('Y-m-d H:i:s');
+		$result = $TestModel->saveAll(array(
+			'Comment' => array(
+				'article_id' => 2,
+				'user_id' => 2,
+				'comment' => 'New comment with attachment',
+				'published' => 'Y'
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.tgz'
+			)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			'id' => '7',
+			'article_id' => '2',
+			'user_id' => '2',
+			'comment' => 'New comment with attachment',
+			'published' => 'Y',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Comment'], $expected);
+
+		$expected = array(
+			'id' => '7',
+			'article_id' => '2',
+			'user_id' => '2',
+			'comment' => 'New comment with attachment',
+			'published' => 'Y',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Comment'], $expected);
+
+		$expected = array(
+			'id' => '2',
+			'comment_id' => '7',
+			'attachment' => 'some_file.tgz',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Attachment'], $expected);
+	}
+/**
+ * Test SaveAll with Habtm relations
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHabtm() {
+		$this->loadFixtures('Article', 'Tag', 'Comment', 'User');
+		$data = array(
+			'Article' => array(
+				'user_id' => 1,
+				'title' => 'Article Has and belongs to Many Tags'
+			),
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Comment' => array(
+				array(
+					'comment' => 'Article comment',
+					'user_id' => 1
+		)));
+		$Article =& new Article();
+		$result = $Article->saveAll($data);
+		$this->assertTrue($result);
+
+		$result = $Article->read();
+		$this->assertEqual(count($result['Tag']), 2);
+		$this->assertEqual($result['Tag'][0]['tag'], 'tag1');
+		$this->assertEqual(count($result['Comment']), 1);
+		$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
+	}
+/**
+ * Test SaveAll with Habtm relations and extra join table fields
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHabtmWithExtraJoinTableFields() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+
+		$data = array(
+			'Something' => array(
+				'id' => 4,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '1'),
+				array('something_else_id' => 2, 'doomed' => '0'),
+				array('something_else_id' => 3, 'doomed' => '1')
+			)
+		);
+
+		$Something =& new Something();
+		$result = $Something->saveAll($data);
+		$this->assertTrue($result);
+		$result = $Something->read();
+
+		$this->assertEqual(count($result['SomethingElse']), 3);
+		$this->assertTrue(Set::matches('/Something[id=4]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[something_else_id=1]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[doomed=1]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[something_else_id=2]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[doomed=0]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
+	}
+/**
+ * testSaveAllHasOne method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasOne() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Attachment->deleteAll(true);
+		$this->assertEqual($model->Attachment->find('all'), array());
+
+		$this->assertTrue($model->saveAll(array(
+			'Comment' => array(
+				'comment' => 'Comment with attachment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.zip'
+		))));
+		$result = $model->find('all', array('fields' => array(
+			'Comment.id', 'Comment.comment', 'Attachment.id',
+			'Attachment.comment_id', 'Attachment.attachment'
+		)));
+		$expected = array(array(
+			'Comment' => array(
+				'id' => '1',
+				'comment' => 'Comment with attachment'
+			),
+			'Attachment' => array(
+				'id' => '1',
+				'comment_id' => '1',
+				'attachment' => 'some_file.zip'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveAllBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllBelongsTo() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Article->deleteAll(true);
+		$this->assertEqual($model->Article->find('all'), array());
+
+		$this->assertTrue($model->saveAll(array(
+			'Comment' => array(
+				'comment' => 'Article comment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Article' => array(
+				'title' => 'Model Associations 101',
+				'user_id' => 1
+		))));
+		$result = $model->find('all', array('fields' => array(
+			'Comment.id', 'Comment.comment', 'Comment.article_id', 'Article.id', 'Article.title'
+		)));
+		$expected = array(array(
+			'Comment' => array(
+				'id' => '1',
+				'article_id' => '1',
+				'comment' => 'Article comment'
+			),
+			'Article' => array(
+				'id' => '1',
+				'title' => 'Model Associations 101'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSaveAllHasOneValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasOneValidation() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Attachment->deleteAll(true);
+		$this->assertEqual($model->Attachment->find('all'), array());
+
+		$model->validate = array('comment' => 'notEmpty');
+		$model->Attachment->validate = array('attachment' => 'notEmpty');
+		$model->Attachment->bind('Comment');
+
+		$this->assertFalse($model->saveAll(
+			array(
+				'Comment' => array(
+					'comment' => '',
+					'article_id' => 1,
+					'user_id' => 1
+				),
+				'Attachment' => array('attachment' => '')
+			),
+			array('validate' => 'first')
+		));
+		$expected = array(
+			'Comment' => array('comment' => 'This field cannot be left blank'),
+			'Attachment' => array('attachment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($model->validationErrors, $expected['Comment']);
+		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
+
+		$this->assertFalse($model->saveAll(
+			array(
+				'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
+				'Attachment' => array('attachment' => '')
+			),
+			array('validate' => 'only')
+		));
+		$this->assertEqual($model->validationErrors, $expected['Comment']);
+		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
+	}
+/**
+ * testSaveAllAtomic method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllAtomic() {
+		$this->loadFixtures('Article', 'User');
+		$TestModel =& new Article();
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author',
+				'user_id' => 2
+			),
+			'Comment' => array(
+				array('comment' => 'First new comment', 'user_id' => 2))
+		), array('atomic' => false));
+
+		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true)));
+
+		$result = $TestModel->saveAll(array(
+			array(
+				'id' => '1',
+				'title' => 'Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => 'Just update the title'
+			),
+			array(
+				'title' => 'Creating a fourth post',
+				'body' => 'Fourth post body',
+				'user_id' => 2
+			)
+		), array('atomic' => false));
+		$this->assertIdentical($result, array(true, true, true));
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$result = $TestModel->saveAll(array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+			)
+		), array('atomic' => false));
+		$this->assertIdentical($result, array(true, false));
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array(
+					'comment' => 'First new comment',
+					'published' => 'Y',
+					'user_id' => 1
+				),
+				array(
+					'comment' => 'Second new comment',
+					'published' => 'Y',
+					'user_id' => 2
+			))
+		), array('atomic' => false));
+		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
+	}
+/**
+ * testSaveAllHasMany method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasMany() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array('comment' => 'First new comment', 'published' => 'Y', 'user_id' => 1),
+				array('comment' => 'Second new comment', 'published' => 'Y', 'user_id' => 2)
+			)
+		));
+		$this->assertTrue($result);
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'Third new comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('atomic' => false)
+		);
+		$this->assertTrue($result);
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment',
+			'Third new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+
+		$TestModel->beforeSaveReturn = false;
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'Fourth new comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('atomic' => false)
+		);
+		$this->assertEqual($result, array('Article' => false));
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment',
+			'Third new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+	}
+/**
+ * testSaveAllHasManyValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasManyValidation() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array('comment' => '', 'published' => 'Y', 'user_id' => 1),
+			)
+		));
+		$expected = array('Comment' => array(false));
+		$this->assertEqual($result, $expected);
+
+		$expected = array('Comment' => array(
+			array('comment' => 'This field cannot be left blank')
+		));
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$expected = array(
+			array('comment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array(
+					'comment' => '',
+					'published' => 'Y',
+					'user_id' => 1
+			))
+		), array('validate' => 'only'));
+	}
+/**
+ * testSaveAllTransaction method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllTransaction() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$TestModel->validate = array('title' => 'notEmpty');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => '')
+		);
+		$ts = date('Y-m-d H:i:s');
+		$this->assertFalse($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array('Post' => array(
+				'id' => '1',
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Post' => array(
+				'id' => '2',
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Post' => array(
+				'id' => '3',
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		)));
+
+		if (count($result) != 3) {
+			// Database doesn't support transactions
+			$expected[] = array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => 1,
+					'title' => 'New Fourth Post',
+					'body' => null,
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$expected[] = array(
+				'Post' => array(
+					'id' => '5',
+					'author_id' => 1,
+					'title' => 'New Fifth Post',
+					'body' => null,
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$this->assertEqual($result, $expected);
+			// Skip the rest of the transactional tests
+			return;
+		}
+
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => ''),
+			array('author_id' => 1, 'title' => 'New Sixth Post')
+		);
+		$ts = date('Y-m-d H:i:s');
+		$this->assertFalse($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array('Post' => array(
+				'id' => '1',
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Post' => array(
+				'id' => '2',
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Post' => array(
+				'id' => '3',
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		)));
+
+		if (count($result) != 3) {
+			// Database doesn't support transactions
+			$expected[] = array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => 1,
+					'title' => 'New Fourth Post',
+					'body' => 'Third Post Body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$expected[] = array(
+				'Post' => array(
+					'id' => '5',
+					'author_id' => 1,
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+		}
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array('title' => 'notEmpty');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => 'New Sixth Post')
+		);
+		$this->assertTrue($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array(
+			'recursive' => -1,
+			'fields' => array('author_id', 'title','body','published')
+		));
+
+		$expected = array(
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fourth Post',
+				'body' => '',
+				'published' => 'N'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fifth Post',
+				'body' => '',
+				'published' => 'N'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Sixth Post',
+				'body' => '',
+				'published' => 'N'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveAllValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidation() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => 'Just update the title'
+			),
+			array(
+				'title' => 'Creating a fourth post',
+				'body' => 'Fourth post body',
+				'author_id' => 2
+		));
+
+		$this->assertTrue($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$ts = date('Y-m-d H:i:s');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'Baleeted First Post',
+					'body' => 'Baleeted!',
+					'published' => 'N',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Just update the title',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23', 'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+			)),
+			array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => '2',
+					'title' => 'Creating a fourth post',
+					'body' => 'Fourth post body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$result = $TestModel->saveAll($data);
+		$this->assertEqual($result, false);
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$errors = array(1 => array('title' => 'This field cannot be left blank'));
+		$transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result);
+		if (!$transactionWorked) {
+			$this->assertTrue(Set::matches('/Post[1][title=Un-Baleeted First Post]', $result));
+			$this->assertTrue(Set::matches('/Post[2][title=Just update the title]', $result));
+		}
+
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$result = $TestModel->saveAll($data, array('atomic' => false));
+		$this->assertEqual($result, array(true, false));
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$errors = array(1 => array('title' => 'This field cannot be left blank'));
+		$newTs = date('Y-m-d H:i:s');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'Un-Baleeted First Post',
+					'body' => 'Not Baleeted!',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => $newTs
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Just update the title',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+			)),
+			array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => '2',
+					'title' => 'Creating a fourth post',
+					'body' => 'Fourth post body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Re-Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$this->assertFalse($TestModel->saveAll($data, array('validate' => 'first')));
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$data = array(
+			array(
+				'title' => 'First new post',
+				'body' => 'Woohoo!',
+				'published' => 'Y'
+			),
+			array(
+				'title' => 'Empty body',
+				'body' => ''
+		));
+
+		$TestModel->validate['body'] = 'notEmpty';
+	}
+/**
+ * testSaveAllValidationOnly method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidationOnly() {
+		$TestModel =& new Comment();
+		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+
+		$data = array(
+			'Comment' => array(
+				'comment' => 'This is the comment'
+			),
+			'Attachment' => array(
+				'attachment' => ''
+			)
+		);
+
+		$result = $TestModel->saveAll($data, array('validate' => 'only'));
+		$this->assertFalse($result);
+
+		$TestModel =& new Article();
+		$TestModel->validate = array('title' => 'notEmpty');
+		$result = $TestModel->saveAll(
+			array(
+				0 => array('title' => ''),
+				1 => array('title' => 'title 1'),
+				2 => array('title' => 'title 2'),
+			),
+			array('validate'=>'only')
+		);
+		$this->assertFalse($result);
+		$expected = array(
+			0 => array('title' => 'This field cannot be left blank'),
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$result = $TestModel->saveAll(
+			array(
+				0 => array('title' => 'title 0'),
+				1 => array('title' => ''),
+				2 => array('title' => 'title 2'),
+			),
+			array('validate'=>'only')
+		);
+		$this->assertFalse($result);
+		$expected = array(
+			1 => array('title' => 'This field cannot be left blank'),
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+	}
+/**
+ * testSaveAllValidateFirst method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidateFirst() {
+		$model =& new Article();
+		$model->deleteAll(true);
+
+		$model->Comment->validate = array('comment' => 'notEmpty');
+		$result = $model->saveAll(array(
+			'Article' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved  author'
+			),
+			'Comment' => array(
+				array('comment' => 'First new comment'),
+				array('comment' => '')
+			)
+		), array('validate' => 'first'));
+
+		$this->assertFalse($result);
+
+		$result = $model->find('all');
+		$this->assertEqual($result, array());
+		$expected = array('Comment' => array(
+			1 => array('comment' => 'This field cannot be left blank')
+		));
+
+		$this->assertEqual($model->Comment->validationErrors, $expected['Comment']);
+
+		$this->assertIdentical($model->Comment->find('count'), 0);
+
+		$result = $model->saveAll(
+			array(
+				'Article' => array(
+					'title' => 'Post with Author',
+					'body' => 'This post will be saved with an author',
+					'user_id' => 2
+				),
+				'Comment' => array(
+					array(
+						'comment' => 'Only new comment',
+						'user_id' => 2
+			))),
+			array('validate' => 'first')
+		);
+
+		$this->assertIdentical($result, true);
+
+		$result = $model->Comment->find('all');
+		$this->assertIdentical(count($result), 1);
+		$result = Set::extract('/Comment/article_id', $result);
+		$this->assertTrue($result[0] === 1 || $result[0] === '1');
+
+
+		$model->deleteAll(true);
+		$data = array(
+			'Article' => array(
+				'title' => 'Post with Author saveAlled from comment',
+				'body' => 'This post will be saved with an author',
+				'user_id' => 2
+			),
+			'Comment' => array(
+				'comment' => 'Only new comment', 'user_id' => 2
+		));
+
+		$result = $model->Comment->saveAll($data, array('validate' => 'first'));
+		$this->assertTrue($result);
+
+		$result = $model->find('all');
+		$this->assertEqual(
+			$result[0]['Article']['title'],
+			'Post with Author saveAlled from comment'
+		);
+		$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
+	}
+/**
+ * testUpdateWithCalculation method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateWithCalculation() {
+		$this->loadFixtures('DataTest');
+		$model =& new DataTest();
+		$result = $model->saveAll(array(
+			array('count' => 5, 'float' => 1.1),
+			array('count' => 3, 'float' => 1.2),
+			array('count' => 4, 'float' => 1.3),
+			array('count' => 1, 'float' => 2.0),
+		));
+		$this->assertTrue($result);
+
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(5, 3, 4, 1));
+
+		$this->assertTrue($model->updateAll(array('count' => 'count + 2')));
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(7, 5, 6, 3));
+
+		$this->assertTrue($model->updateAll(array('DataTest.count' => 'DataTest.count - 1')));
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(6, 4, 5, 2));
+	}
+/**
+ * testSaveAllHasManyValidationOnly method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasManyValidationOnly() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1),
+					array(
+						'id' => 2,
+						'comment' =>
+						'comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('validate' => 'only')
+		);
+		$this->assertFalse($result);
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1
+					),
+					array(
+						'id' => 2,
+						'comment' => 'comment',
+						'published' => 'Y',
+						'user_id' => 1
+					),
+					array(
+						'id' => 3,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array(
+				'validate' => 'only',
+				'atomic' => false
+		));
+		$expected = array(
+			'Article' => true,
+			'Comment' => array(false, true, false)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('Comment' => array(
+			0 => array('comment' => 'This field cannot be left blank'),
+			2 => array('comment' => 'This field cannot be left blank')
+		));
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$expected = array(
+			0 => array('comment' => 'This field cannot be left blank'),
+			2 => array('comment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/model/models.php b/cake/tests/cases/libs/model/models.php
index ea0a07643..20e5b6ba1 100644
--- a/cake/tests/cases/libs/model/models.php
+++ b/cake/tests/cases/libs/model/models.php
@@ -1864,6 +1864,7 @@ class ValidationTest1 extends CakeTestModel {
  */
 	function customValidatorWithParams($data, $validator, $or = true, $ignore_on_same = 'id') {
 		$this->validatorParams = get_defined_vars();
+		unset($this->validatorParams['this']);
 		return true;
 	}
 /**
@@ -2543,7 +2544,7 @@ class Basket extends CakeTestModel {
 		'FilmFile' => array(
 			'className' => 'FilmFile',
 			'foreignKey' => 'object_id',
-			'conditions' => 'Basket.type = "file"',
+			'conditions' => "Basket.type = 'file'",
 			'fields' => '',
 			'order' => ''
 		)
diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
index f57c91d9c..cf2dd221e 100644
--- a/cake/tests/cases/libs/router.test.php
+++ b/cake/tests/cases/libs/router.test.php
@@ -299,7 +299,7 @@ class RouterTest extends CakeTestCase {
 		$result = Router::normalize('/recipe/recipes/add');
 		$this->assertEqual($result, '/recipe/recipes/add');
 
-		Router::setRequestInfo(array(array(), array('base' => 'us')));
+		Router::setRequestInfo(array(array(), array('base' => '/us')));
 		$result = Router::normalize('/us/users/logout/');
 		$this->assertEqual($result, '/users/logout');
 
@@ -309,6 +309,22 @@ class RouterTest extends CakeTestCase {
 		$result = Router::normalize('/cake_12/users/logout/');
 		$this->assertEqual($result, '/users/logout');
 
+		Router::reload();
+		$_back = Configure::read('App.baseUrl');
+		Configure::write('App.baseUrl', '/');
+		
+		Router::setRequestInfo(array(array(), array('base' => '/')));
+		$result = Router::normalize('users/login');
+		$this->assertEqual($result, '/users/login');
+		Configure::write('App.baseUrl', $_back);
+		
+		Router::reload();
+		Router::setRequestInfo(array(array(), array('base' => 'beer')));
+		$result = Router::normalize('beer/admin/beers_tags/add');
+		$this->assertEqual($result, '/admin/beers_tags/add');
+
+		$result = Router::normalize('/admin/beers_tags/add');
+		$this->assertEqual($result, '/admin/beers_tags/add');
 	}
 /**
  * testUrlGeneration method
@@ -1036,6 +1052,28 @@ class RouterTest extends CakeTestCase {
 		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
 		$expected = '/beheer/posts/index/0?var=test&var2=test2';
 		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.admin', 'admin');
+		$paths = Configure::read('pluginPaths');
+		Configure::write('pluginPaths', array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+		));
+		Configure::write('__objects.plugin', array('test_plugin'));
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('admin' => true, 'controller' => 'controller', 'action' => 'action', 
+				'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(), 
+				'argSeparator' => ':', 'namedArgs' => array())
+		));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'test_plugin', 'controller' => 'test_plugin', 'action' => 'index'));
+		$expected = '/admin/test_plugin';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('pluginPaths', $paths);
 	}
 /**
  * testExtensionParsingSetting method
@@ -1617,5 +1655,89 @@ class RouterTest extends CakeTestCase {
 		$expected = '/test/test_another_action/locale:badness';
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * testStripPlugin
+ *
+ * @return void
+ * @access public
+ */
+	function testStripPlugin() {
+		$pluginName = 'forums';
+		$url = 'example.com/' . $pluginName . '/';
+		$expected = 'example.com';
+
+		$this->assertEqual(Router::stripPlugin($url, $pluginName), $expected);
+		$this->assertEqual(Router::stripPlugin($url), $url);
+		$this->assertEqual(Router::stripPlugin($url, null), $url);
+	}
+/**
+ * testCurentRoute
+ *
+ * This test needs some improvement and actual requestAction() usage
+ * 
+ * @return void
+ * @access public
+ */
+	function testCurentRoute() {
+		$url = array('controller' => 'pages', 'action' => 'display', 'government');
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route = Router::currentRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+	}
+/**
+ * testRequestRoute
+ *
+ * @return void
+ * @access public
+ */
+	function testRequestRoute() {
+		$url = array('controller' => 'products', 'action' => 'display', 5);
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route = Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+
+		// test that the first route is matched
+		$newUrl = array('controller' => 'products', 'action' => 'display', 6);
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route = Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+
+		// test that an unmatched route does not change the current route
+		$newUrl = array('controller' => 'products', 'action' => 'display', 6);
+		Router::connect('/actor', $url);
+		Router::parse('/government');
+		$route = Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => false)), $route[3]);
+	}
+/**
+ * testGetParams
+ *
+ * @return void
+ * @access public
+ */
+	function testGetParams() {
+		$paths = array('base' => '/', 'here' => '/products/display/5', 'webroot' => '/webroot');
+		$params = array('param1' => '1', 'param2' => '2');
+		Router::setRequestInfo(array($params, $paths));
+		$expected = array(
+			'plugin' => false, 'controller' => false, 'action' => false,
+			'param1' => '1', 'param2' => '2'
+		);
+		$this->assertEqual(Router::getparams(), $expected);
+		$this->assertEqual(Router::getparam('controller'), false);
+		$this->assertEqual(Router::getparam('param1'), '1');
+		$this->assertEqual(Router::getparam('param2'), '2');
+
+		Router::reload();
+
+		$params = array('controller' => 'pages', 'action' => 'display');
+		Router::setRequestInfo(array($params, $paths));
+		$expected = array('plugin' => false, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual(Router::getparams(), $expected);
+		$this->assertEqual(Router::getparams(true), $expected);
+	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/sanitize.test.php b/cake/tests/cases/libs/sanitize.test.php
index e564f9a92..1899f16c7 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/cake/tests/cases/libs/sanitize.test.php
@@ -298,8 +298,8 @@ class SanitizeTest extends CakeTestCase {
 		$result = Sanitize::stripScripts($string);
 		$this->assertEqual($result, $expected);
 
-		$string = ''."\n".''."\n".''."\n".'';
-		$expected = "\n".''."\n".''."\n".'';
+		$string = '' . "\n" . '' . "\n" . '' . "\n" . '';
+		$expected = "\n" . '' . "\n" . ''."\n".'';
 		$result = Sanitize::stripScripts($string);
 		$this->assertEqual($result, $expected);
 
diff --git a/cake/tests/cases/libs/socket.test.php b/cake/tests/cases/libs/socket.test.php
index 31ce57873..931f2b531 100644
--- a/cake/tests/cases/libs/socket.test.php
+++ b/cake/tests/cases/libs/socket.test.php
@@ -144,6 +144,18 @@ class SocketTest extends CakeTestCase {
 		$this->Socket = new CakeSocket(array('timeout' => 5));
 		$this->Socket->connect();
 		$this->assertEqual($this->Socket->read(26), null);
+
+		$config = array('host' => 'www.cakephp.org', 'timeout' => 1);
+		$this->Socket = new CakeSocket($config);
+		$this->assertTrue($this->Socket->connect());
+		$this->assertFalse($this->Socket->read(1024 * 1024));
+		$this->assertEqual($this->Socket->lastError(), '2: ' . __('Connection timed out', true));
+
+		$config = array('host' => 'www.cakephp.org', 'timeout' => 30);
+		$this->Socket = new CakeSocket($config);
+		$this->assertTrue($this->Socket->connect());
+		$this->assertEqual($this->Socket->read(26), null);
+		$this->assertEqual($this->Socket->lastError(), null);
 	}
 /**
  * testLastError method
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php
index efdbdafcc..52dd5cbaf 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/cake/tests/cases/libs/view/helpers/html.test.php
@@ -56,12 +56,33 @@ class TheHtmlTestController extends Controller {
  */
 class HtmlHelperTest extends CakeTestCase {
 /**
- * html property
+ * Html property
  *
- * @var mixed null
+ * @var object
  * @access public
  */
-	var $html = null;
+	var $Html = null;
+/**
+ * Backup of app encoding configuration setting
+ *
+ * @var string
+ * @access protected
+ */
+	var $_appEncoding;
+/**
+ * Backup of asset configuration settings
+ *
+ * @var string
+ * @access protected
+ */
+	var $_asset;
+/**
+ * Backup of debug configuration setting
+ *
+ * @var integer
+ * @access protected
+ */
+	var $_debug;
 /**
  * setUp method
  *
@@ -73,6 +94,8 @@ class HtmlHelperTest extends CakeTestCase {
 		$view =& new View(new TheHtmlTestController());
 		ClassRegistry::addObject('view', $view);
 		$this->_appEncoding = Configure::read('App.encoding');
+		$this->_asset = Configure::read('Asset');
+		$this->_debug = Configure::read('debug');
 	}
 /**
  * tearDown method
@@ -82,6 +105,8 @@ class HtmlHelperTest extends CakeTestCase {
  */
 	function tearDown() {
 		Configure::write('App.encoding', $this->_appEncoding);
+		Configure::write('Asset', $this->_asset);
+		Configure::write('debug', $this->_debug);
 		ClassRegistry::flush();
 	}
 /**
@@ -254,14 +279,34 @@ class HtmlHelperTest extends CakeTestCase {
 		$result = $this->Html->image('cake.icon.gif');
 		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
 
-		$back = Configure::read('debug');
 		Configure::write('debug', 0);
 		Configure::write('Asset.timestamp', 'force');
 
 		$result = $this->Html->image('cake.icon.gif');
 		$this->assertTags($result, array('img' => array('src' => 'preg:/img\/cake\.icon\.gif\?\d+/', 'alt' => '')));
+	}
+/**
+ * Tests creation of an image tag using a theme and asset timestamping
+ *
+ * @access public
+ * @return void
+ * @link https://trac.cakephp.org/ticket/6490
+ */
+	function testImageTagWithTheme() {
+		$file = WWW_ROOT . 'themed' . DS . 'default' . DS . 'img' . DS . 'cake.power.gif';
+		$message = "File '{$file}' not present. %s";
+		$this->skipUnless(file_exists($file), $message);
 
-		Configure::write('debug', $back);
+		Configure::write('Asset.timestamp', true);
+		Configure::write('debug', 1);
+		$this->Html->themeWeb = 'themed/default/';
+
+		$result = $this->Html->image('cake.power.gif');
+		$this->assertTags($result, array(
+			'img' => array(
+				'src' => 'preg:/themed\/default\/img\/cake\.power\.gif\?\d+/',
+				'alt' => ''
+		)));
 	}
 /**
  * testStyle method
@@ -331,7 +376,6 @@ class HtmlHelperTest extends CakeTestCase {
 		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css\?[0-9]+/';
 		$this->assertTags($result, $expected);
 
-		$debug = Configure::read('debug');
 		Configure::write('debug', 0);
 
 		$result = $this->Html->css('cake.generic');
@@ -357,8 +401,6 @@ class HtmlHelperTest extends CakeTestCase {
 		$expected['link']['href'] = 'preg:/\/testing\/longer\/css\/cake\.generic\.css\?/';
 		$this->assertTags($result, $expected);
 		$this->Html->webroot = $webroot;
-
-		Configure::write('debug', $debug);
 	}
 /**
  * testCharsetTag method
diff --git a/cake/tests/cases/libs/view/helpers/javascript.test.php b/cake/tests/cases/libs/view/helpers/javascript.test.php
index 77425743b..7ebad00eb 100644
--- a/cake/tests/cases/libs/view/helpers/javascript.test.php
+++ b/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -95,13 +95,25 @@ class TestJavascriptObject {
  * @since         CakePHP Test Suite v 1.0.0.0
  */
 class JavascriptTest extends CakeTestCase {
+/**
+ * Regexp for CDATA start block
+ *
+ * @var string
+ */
+	var $cDataStart = 'preg:/^\/\/[\s\r\n]*/';
 /**
  * setUp method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Javascript =& new JavascriptHelper();
 		$this->Javascript->Html =& new HtmlHelper();
 		$this->Javascript->Form =& new FormHelper();
@@ -114,7 +126,7 @@ class JavascriptTest extends CakeTestCase {
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->Javascript->Html);
 		unset($this->Javascript->Form);
 		unset($this->Javascript);
@@ -356,11 +368,14 @@ class JavascriptTest extends CakeTestCase {
 
 		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8));
 		$result = $this->Javascript->object($object, array('block' => true));
-		$expected = '{"title":"New thing","indexes":[5,6,7,8]}';
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'{"title":"New thing","indexes":[5,6,7,8]}',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
 		$result = $this->Javascript->object($object);
@@ -409,68 +424,101 @@ class JavascriptTest extends CakeTestCase {
  * @return void
  */
 	function testScriptBlock() {
-		ob_flush();
+		$result = $this->Javascript->codeBlock('something');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
 		$result = $this->Javascript->codeBlock('something', array('allowCache' => true, 'safe' => false));
-		$this->assertPattern('/^]+>something<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">something<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', array('allowCache' => false, 'safe' => false));
-		$this->assertPattern('/^]+>something<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">something<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', true);
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', false);
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', array('safe' => false));
-		$this->assertPattern('/^]+>something<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">something<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
-
-		$result = $this->Javascript->blockEnd();
-		$this->assertPattern('/^<\/script>$/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock('something', array('safe' => true));
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock(null, array('safe' => true, 'allowCache' => false));
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//assertNoPattern('/^]*>/', $result);
+		$this->assertNull($result);
+		echo 'this is some javascript';
 
 		$result = $this->Javascript->blockEnd();
-		$this->assertPattern('/^\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
-
-		$result = $this->Javascript->codeBlock('something');
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'this is some javascript',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->codeBlock();
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//assertNoPattern('/^]*>/', $result);
-
+		$this->assertNull($result);
+		echo "alert('hey');";
 		$result = $this->Javascript->blockEnd();
-		$this->assertPattern('/^\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"alert('hey');",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Javascript->cacheEvents(false, true);
 		$this->assertFalse($this->Javascript->inBlock);
+
 		$result = $this->Javascript->codeBlock();
 		$this->assertIdentical($result, null);
 		$this->assertTrue($this->Javascript->inBlock);
@@ -490,11 +538,16 @@ class JavascriptTest extends CakeTestCase {
  * @return void
  */
 	function testOutOfLineScriptWriting() {
-		echo $this->Javascript->codeBlock('$(document).ready(function() { /* ... */ });', array('inline' => false));
+		echo $this->Javascript->codeBlock('$(document).ready(function() { });', array('inline' => false));
 
 		$this->Javascript->codeBlock(null, array('inline' => false));
-		echo '$(function(){ /* ... */ });';
+		echo '$(function(){ });';
 		$this->Javascript->blockEnd();
+		$script = $this->View->scripts();
+
+		$this->assertEqual(count($script), 2);
+		$this->assertPattern('/' . preg_quote('$(document).ready(function() { });', '/') . '/', $script[0]);
+		$this->assertPattern('/' . preg_quote('$(function(){ });', '/') . '/', $script[1]);
 	}
 /**
  * testEvent method
@@ -504,52 +557,78 @@ class JavascriptTest extends CakeTestCase {
  */
 	function testEvent() {
 		$result = $this->Javascript->event('myId', 'click', 'something();');
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click', 'something();', array('safe' => false));
-		$this->assertPattern('/^]+>[^<>]+<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click');
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) {  }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) {  }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click', 'something();', false);
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('myId', 'click', 'something();', array('useCapture' => true));
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, true);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, true);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('document', 'load');
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe(document, \'load\', function(event) {  }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe(document, 'load', function(event) {  }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('$(\'myId\')', 'click', 'something();', array('safe' => false));
-		$this->assertPattern('/^]+>[^<>]+<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->event('\'document\'', 'load', 'something();', array('safe' => false));
-		$this->assertPattern('/^]+>[^<>]+<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">' . str_replace('/', '\\/', preg_quote('Event.observe(\'document\', \'load\', function(event) { something(); }, false);')) . '<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe('document', 'load', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$this->Javascript->cacheEvents();
 		$result = $this->Javascript->event('myId', 'click', 'something();');
@@ -576,10 +655,14 @@ class JavascriptTest extends CakeTestCase {
 		$this->assertNull($result);
 
 		$result = $this->Javascript->writeEvents();
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->getCache();
 		$this->assertTrue(empty($result));
@@ -594,10 +677,15 @@ class JavascriptTest extends CakeTestCase {
 		$this->assertNull($result);
 		$this->assertEqual(count($resultScripts), 1);
 		$result = current($resultScripts);
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->getCache();
 		$this->assertTrue(empty($result));
@@ -653,11 +741,11 @@ class JavascriptTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Javascript->escapeString('CakePHP: \'Rapid Development Framework\'');
-		$expected = 'CakePHP: \\\'Rapid Development Framework\\\'';
+		$expected = "CakePHP: \\'Rapid Development Framework\\'";
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Javascript->escapeString('my \\"string\\"');
-		$expected = 'my \\\"string\\\"';
+		$expected = 'my \\\\\\"string\\\\\\"';
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Javascript->escapeString('my string\nanother line');
@@ -672,6 +760,58 @@ class JavascriptTest extends CakeTestCase {
 		$expected = 'String with \\\n string that looks like newline';
 		$this->assertEqual($result, $expected);
 	}
+/**
+ * test string escaping and compare to json_encode()
+ *
+ * @return void
+ **/
+	function testStringJsonEncodeCompliance() {
+		if (!function_exists('json_encode')) {
+			return;
+		}
+		$this->Javascript->useNative = false;
+		$data = array();
+		$data['mystring'] = "simple string";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "strïng with spécial chârs";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "a two lines\nstring";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "a \t tabbed \t string";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "a \"double-quoted\" string";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = 'a \\"double-quoted\\" string';
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+	}
+/**
+ * test that text encoded with Javascript::object decodes properly
+ *
+ * @return void
+ **/
+	function testObjectDecodeCompatibility() {
+		if (!function_exists('json_decode')) {
+			return;
+		}
+		$this->Javascript->useNative = false;
+
+		$data = array("simple string");
+		$result = $this->Javascript->object($data);
+		$this->assertEqual(json_decode($result), $data);
+
+		$data = array('my \"string\"');
+		$result = $this->Javascript->object($data);
+		$this->assertEqual(json_decode($result), $data);
+
+		$data = array('my \\"string\\"');
+		$result = $this->Javascript->object($data);
+		$this->assertEqual(json_decode($result), $data);
+	}
 /**
  * testAfterRender method
  *
@@ -686,11 +826,15 @@ class JavascriptTest extends CakeTestCase {
 		ob_start();
 		$this->Javascript->afterRender();
 		$result = ob_get_clean();
-
-		$this->assertPattern('/^]+>\s*' . str_replace('/', '\\/', preg_quote('//')) . '\s*<\/script>$/', $result);
-		$this->assertPattern('/^]+type="text\/javascript">.+' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '.+<\/script>$/s', $result);
-		$this->assertPattern('/^]+type="text\/javascript"[^<>]*>/', $result);
-		$this->assertNoPattern('/^]*>/', $result);
+		
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Javascript->getCache();
 		$this->assertTrue(empty($result));
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/cake/tests/cases/libs/view/helpers/paginator.test.php
index 6939f00b5..3b8817ab8 100644
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -116,9 +116,11 @@ class PaginatorHelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$this->Paginator->params['paging']['Article']['prevPage'] = false;
-		$result = $this->Paginator->prev('prev', array('update'=> 'theList', 'indicator'=> 'loading', 'url'=> array('controller' => 'posts')), null, array('class' => 'disabled', 'tag' => 'span'));
-		$expected = 'prev';
-		$this->assertEqual($result, $expected);
+		$result = $this->Paginator->prev('prev', array('update' => 'theList', 'indicator' => 'loading', 'url' => array('controller' => 'posts')), null, array('class' => 'disabled', 'tag' => 'span'));
+		$expected = array(
+			'span' => array('class' => 'disabled'), 'prev', '/span'
+		);
+		$this->assertTags($result, $expected);
 	}
 /**
  * testSortLinks method
@@ -135,24 +137,60 @@ class PaginatorHelperTest extends CakeTestCase {
 		));
 		$this->Paginator->options(array('url' => array('param')));
 		$result = $this->Paginator->sort('title');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc">Title<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->sort('date');
-		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:date\/direction:desc">Date<\/a>$/', $result);
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:date/direction:desc'),
+			'Date',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
 
 		$result = $this->Paginator->numbers(array('modulus'=> '2', 'url'=> array('controller'=>'projects', 'action'=>'sort'),'update'=>'list'));
 		$this->assertPattern('/\/projects\/sort\/page:2/', $result);
 		$this->assertPattern('/