Skip to content

Commit

Permalink
Remove automatic table alias handling.
Browse files Browse the repository at this point in the history
As discussed in #2761 we shouldn't support automatic table aliases in
entity paths. They are not required and only really serve to bloat HTML.
Not having them makes reading entity properties, handling request data
and forms consistent.
  • Loading branch information
markstory committed Feb 4, 2014
1 parent 4af2637 commit cd9a0f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 30 deletions.
5 changes: 0 additions & 5 deletions src/View/Form/EntityContext.php
Expand Up @@ -135,11 +135,6 @@ protected function _getEntity($path) {
return [$entity, $this->_rootName];
}

// Remove the Table name if present.
if (count($path) > 1 && $path[0] === $this->_rootName) {
array_shift($path);
}

$lastProp = $this->_rootName;
foreach ($path as $prop) {
$next = $this->_getProp($entity, $prop);
Expand Down
27 changes: 2 additions & 25 deletions tests/TestCase/View/Form/EntityContextTest.php
Expand Up @@ -58,21 +58,12 @@ public function testValBasic() {
'entity' => $row,
'table' => 'Articles',
]);
$result = $context->val('Articles.title');
$this->assertEquals($row->title, $result);

$result = $context->val('title');
$this->assertEquals($row->title, $result);

$result = $context->val('Articles.body');
$this->assertEquals($row->body, $result);

$result = $context->val('body');
$this->assertEquals($row->body, $result);

$result = $context->val('Articles.nope');
$this->assertNull($result);

$result = $context->val('nope');
$this->assertNull($result);
}
Expand All @@ -99,28 +90,19 @@ public function testValAssociated() {
'table' => 'Articles',
]);

$result = $context->val('Articles.user.fname');
$this->assertEquals($row->user->fname, $result);

$result = $context->val('user.fname');
$this->assertEquals($row->user->fname, $result);

$result = $context->val('Articles.comments.0.comment');
$this->assertEquals($row->comments[0]->comment, $result);

$result = $context->val('comments.0.comment');
$this->assertEquals($row->comments[0]->comment, $result);

$result = $context->val('Articles.comments.1.comment');
$this->assertEquals($row->comments[1]->comment, $result);

$result = $context->val('comments.1.comment');
$this->assertEquals($row->comments[1]->comment, $result);

$result = $context->val('Articles.comments.0.nope');
$result = $context->val('comments.0.nope');
$this->assertNull($result);

$result = $context->val('Articles.comments.0.nope.no_way');
$result = $context->val('comments.0.nope.no_way');
$this->assertNull($result);
}

Expand All @@ -138,9 +120,7 @@ public function testIsRequiredStringValidator() {
'validator' => 'create',
]);

$this->assertTrue($context->isRequired('Articles.title'));
$this->assertTrue($context->isRequired('title'));
$this->assertFalse($context->isRequired('Articles.body'));
$this->assertFalse($context->isRequired('body'));

$this->assertFalse($context->isRequired('Herp.derp.derp'));
Expand Down Expand Up @@ -175,10 +155,7 @@ public function testIsRequiredAssociatedHasMany() {
]);

$this->assertTrue($context->isRequired('comments.0.user_id'));
$this->assertTrue($context->isRequired('Articles.comments.0.user_id'));

$this->assertFalse($context->isRequired('comments.0.other'));
$this->assertFalse($context->isRequired('Articles.comments.0.other'));
}

/**
Expand Down

0 comments on commit cd9a0f7

Please sign in to comment.