@@ -22,5 +22,5 @@ * @lastmodified $Date$ * @license http://www.opensource.org/licenses/mit-license.php The MIT License */ -return $config['Cake.version'] = '1.2.0.7962'; +return $config['Cake.version'] = '1.2.1.8004'; ?> \ No newline at end of file config/config.php @@ -279,12 +279,15 @@ class BehaviorCollection extends Object { $this->{$name} =& new $class; } } elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) { - if ($config !== null && $config !== false) { + if (!empty($config)) { $config = array_merge($this->{$name}->settings[$this->modelName], $config); } else { $config = array(); } } + if (empty($config)) { + $config = array(); + } $this->{$name}->setup(ClassRegistry::getObject($this->modelName), $config); foreach ($this->{$name}->mapMethods as $method => $alias) { libs/model/behavior.php @@ -1390,7 +1390,8 @@ class DboSource extends DataSource { * @access protected */ function _prepareUpdateFields(&$model, $fields, $quoteValues = true, $alias = false) { - $quotedAlias = $this->startQuote . $model->alias . $this->startQuote; + $quotedAlias = $this->startQuote . $model->alias . $this->endQuote; + foreach ($fields as $field => $value) { if ($alias && strpos($field, '.') === false) { $quoted = $model->escapeField($field); @@ -1404,19 +1405,20 @@ class DboSource extends DataSource { if ($value === null) { $updates[] = $quoted . ' = NULL'; + continue; + } + $update = $quoted . ' = '; + + if ($quoteValues) { + $update .= $this->value($value, $model->getColumnType($field), false); + } elseif (!$alias) { + $update .= str_replace($quotedAlias . '.', '', str_replace( + $model->alias . '.', '', $value + )); } else { - $update = $quoted . ' = '; - if ($quoteValues) { - $update .= $this->value($value, $model->getColumnType($field), false); - } elseif (!$alias) { - $update .= str_replace($quotedAlias . '.', '', str_replace( - $model->alias . '.', '', $value - )); - } else { - $update .= $value; - } - $updates[] = $update; + $update .= $value; } + $updates[] = $update; } return $updates; } @@ -1674,7 +1676,11 @@ class DboSource extends DataSource { $dot = strpos($fields[$i], '.'); if ($dot === false) { - $fields[$i] = $this->name($alias . '.' . $fields[$i]); + $prefix = !( + strpos($fields[$i], ' ') !== false || + strpos($fields[$i], '(') !== false + ); + $fields[$i] = $this->name(($prefix ? '' : '') . $alias . '.' . $fields[$i]); } else { $value = array(); $comma = strpos($fields[$i], ','); libs/model/datasources/dbo_source.php @@ -37,6 +37,14 @@ require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php'; * @subpackage cake.tests.cases.libs.model.datasources.dbo */ class DboMssqlTestDb extends DboMssql { + + function __construct() {} + + function connect() { + $this->connected = true; + return true; + } + function lastError() {} /** * simulated property * @@ -69,6 +77,16 @@ class DboMssqlTestDb extends DboMssql { * @access protected * @return void */ + function _matchRecords(&$model, $conditions = null) { + return $this->conditions(array('id' => array(1, 2))); + } +/** + * fetchAll method + * + * @param mixed $sql + * @access protected + * @return void + */ function fetchAll($sql, $cache = true, $modelName = null) { $result = parent::fetchAll($sql, $cache, $modelName); if (!empty($this->fetchAllResultsStack)) { @@ -297,6 +315,17 @@ class DboMssqlTest extends CakeTestCase { $this->assertEqual($result, $expected); } + function testUpdateAllSyntax() { + $model = ClassRegistry::init('MssqlTestModel'); + $fields = array('MssqlTestModel.client_id' => '[MssqlTestModel].[client_id] + 1'); + $conditions = array('MssqlTestModel.updated <' => date('2009-01-01 00:00:00')); + $this->db->update($model, $fields, null, $conditions); + + $result = $this->db->getLastQuery(); + $this->assertNoPattern('/MssqlTestModel/', $result); + $this->assertPattern('/^UPDATE \[mssql_test_models\]/', $result); + $this->assertPattern('/SET \[client_id\] = \[client_id\] \+ 1/', $result); + } /** * tearDown method tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php 0ace726559231ca33c3996bb8ecb8b750843f99d 6b6e2fb7146dbfcc40a21fc20cd6161b12d56167 Joel Moss joel@developwithstyle.com http://github.com/joelmoss/cakephp/commit/d4d865d765b7580b1f905302074ccdeab5f36757 d4d865d765b7580b1f905302074ccdeab5f36757 2009-01-17T07:16:28-08:00 2009-01-17T07:16:28-08:00 Merge branch 'master' into pimped bf071077ff739294aa911eec7fa86f5cc067f209 Joel Moss joel@developwithstyle.com