Skip to content

Commit

Permalink
Fixing failing test caused by registry pollution.
Browse files Browse the repository at this point in the history
Adding a test case to prove that unqualified column names work with postgresql.  Closes #930
  • Loading branch information
markstory committed Jul 29, 2010
1 parent 596c751 commit a9bb4ee
Showing 1 changed file with 18 additions and 1 deletion.
Expand Up @@ -572,7 +572,7 @@ function testCakeSchema() {
date date, date date,
CONSTRAINT test_suite_data_types_pkey PRIMARY KEY (id) CONSTRAINT test_suite_data_types_pkey PRIMARY KEY (id)
)'); )');
$model =& ClassRegistry::init('datatypes'); $model = new Model(array('name' => 'Datatype', 'ds' => 'test_suite'));
$schema = new CakeSchema(array('connection' => 'test_suite')); $schema = new CakeSchema(array('connection' => 'test_suite'));
$result = $schema->read(array( $result = $schema->read(array(
'connection' => 'test_suite', 'connection' => 'test_suite',
Expand Down Expand Up @@ -807,4 +807,21 @@ function testQuoteDistinctInFunction() {
$expected = array('COUNT(DISTINCT FUNC("id"))'); $expected = array('COUNT(DISTINCT FUNC("id"))');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }

/**
* test that saveAll works even with conditions that lack a model name.
*
* @return void
*/
function testUpdateAllWithNonQualifiedConditions() {
$this->loadFixtures('Article');
$Article =& new Article();
$result = $Article->updateAll(array('title' => "'Awesome'"), array('published' => 'Y'));
$this->assertTrue($result);

$result = $Article->find('count', array(
'conditions' => array('Article.title' => 'Awesome')
));
$this->assertEqual($result, 3, 'Article count is wrong or fixture has changed.');
}
} }

0 comments on commit a9bb4ee

Please sign in to comment.