diff --git a/cake/libs/controller/pages_controller.php b/cake/libs/controller/pages_controller.php index ecaf125db..b26f71a74 100644 --- a/cake/libs/controller/pages_controller.php +++ b/cake/libs/controller/pages_controller.php @@ -67,7 +67,7 @@ class PagesController extends AppController { if (!$count) { $this->redirect('/'); } - $page = $subpage = $title = null; + $page = $subpage = $title_for_layout = null; if (!empty($path[0])) { $page = $path[0]; @@ -76,9 +76,9 @@ class PagesController extends AppController { $subpage = $path[1]; } if (!empty($path[$count - 1])) { - $title = Inflector::humanize($path[$count - 1]); + $title_for_layout = Inflector::humanize($path[$count - 1]); } - $this->set(compact('page', 'subpage', 'title')); + $this->set(compact('page', 'subpage', 'title_for_layout')); $this->render(implode('/', $path)); } } diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php index d99b989aa..6a5b5a5b9 100644 --- a/cake/libs/model/datasources/dbo/dbo_postgres.php +++ b/cake/libs/model/datasources/dbo/dbo_postgres.php @@ -440,9 +440,23 @@ class DboPostgres extends DboSource { } $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++) { if (!preg_match('/^.+\\(.*\\)/', $fields[$i]) && !preg_match('/\s+AS\s+/', $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; + } + $prepend = ''; if (strpos($fields[$i], 'DISTINCT') !== false) { $prepend = 'DISTINCT '; @@ -458,7 +472,9 @@ class DboPostgres extends DboSource { } else { $fields[$i] = preg_replace_callback('/\(([\s\.\w]+)\)/', array(&$this, '__quoteFunctionField'), $fields[$i]); } + $result[] = $fields[$i]; } + return $result; } return $fields; } 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 fac7f19ee..38f3a28af 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 @@ -84,6 +84,18 @@ class PostgresTestModel extends Model { */ var $useTable = false; +/** + * belongsTo property + * + * @var array + * @access public + */ + var $belongsTo = array( + 'PostgresClientTestModel' => array( + 'foreignKey' => 'client_id' + ) + ); + /** * find method * @@ -142,6 +154,47 @@ class PostgresTestModel extends Model { } } +/** + * PostgresClientTestModel class + * + * @package cake + * @subpackage cake.tests.cases.libs.model.datasources + */ +class PostgresClientTestModel extends Model { + +/** + * name property + * + * @var string 'PostgresClientTestModel' + * @access public + */ + var $name = 'PostgresClientTestModel'; + +/** + * useTable property + * + * @var bool false + * @access public + */ + var $useTable = false; + +/** + * schema method + * + * @access public + * @return void + */ + function schema() { + return 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) + ); + } +} + /** * DboPostgresTest class * @@ -227,13 +280,12 @@ class DboPostgresTest extends CakeTestCase { } /** - * Test field and value quoting method + * Test field quoting method * * @access public */ - function testQuoting() { - $result = $this->db2->fields($this->model); - $expected = array( + function testFieldQuoting() { + $fields = array( '"PostgresTestModel"."id" AS "PostgresTestModel__id"', '"PostgresTestModel"."client_id" AS "PostgresTestModel__client_id"', '"PostgresTestModel"."name" AS "PostgresTestModel__name"', @@ -253,15 +305,29 @@ class DboPostgresTest extends CakeTestCase { '"PostgresTestModel"."created" AS "PostgresTestModel__created"', '"PostgresTestModel"."updated" AS "PostgresTestModel__updated"' ); + + $result = $this->db->fields($this->model); + $expected = $fields; $this->assertEqual($result, $expected); - $expected = "'1.2'"; - $result = $this->db2->value(1.2, 'float'); - $this->assertIdentical($expected, $result); + $result = $this->db->fields($this->model, null, 'PostgresTestModel.*'); + $expected = $fields; + $this->assertEqual($result, $expected); - $expected = "'1,2'"; - $result = $this->db2->value('1,2', 'float'); - $this->assertIdentical($expected, $result); + $result = $this->db->fields($this->model, null, array('*', 'AnotherModel.id', 'AnotherModel.name')); + $expected = array_merge($fields, array( + '"AnotherModel"."id" AS "AnotherModel__id"', + '"AnotherModel"."name" AS "AnotherModel__name"')); + $this->assertEqual($result, $expected); + + $result = $this->db->fields($this->model, null, array('*', 'PostgresClientTestModel.*')); + $expected = array_merge($fields, array( + '"PostgresClientTestModel"."id" AS "PostgresClientTestModel__id"', + '"PostgresClientTestModel"."name" AS "PostgresClientTestModel__name"', + '"PostgresClientTestModel"."email" AS "PostgresClientTestModel__email"', + '"PostgresClientTestModel"."created" AS "PostgresClientTestModel__created"', + '"PostgresClientTestModel"."updated" AS "PostgresClientTestModel__updated"')); + $this->assertEqual($result, $expected); } /** @@ -286,6 +352,9 @@ class DboPostgresTest extends CakeTestCase { * @return void */ function testValueQuoting() { + $this->assertIdentical($this->db2->value(1.2, 'float'), "'1.2'"); + $this->assertEqual($this->db2->value('1,2', 'float'), "'1,2'"); + $this->assertEqual($this->db2->value('0', 'integer'), "'0'"); $this->assertEqual($this->db2->value('', 'integer'), 'NULL'); $this->assertEqual($this->db2->value('', 'float'), 'NULL'); @@ -682,9 +751,12 @@ class DboPostgresTest extends CakeTestCase { $this->db->query($this->db->dropSchema($schema1)); } -/** -* Test it is possible to use virtual field with postgresql -*/ +/* + * Test it is possible to use virtual field with postgresql + * + * @access public + * @return void + */ function testVirtualFields() { $this->loadFixtures('Article', 'Comment'); $Article = new Article; @@ -702,8 +774,11 @@ class DboPostgresTest extends CakeTestCase { } /** -* Tests additional order options for postgres -*/ + * Tests additional order options for postgres + * + * @access public + * @return void + */ function testOrderAdditionalParams() { $result = $this->db->order(array('title' => 'DESC NULLS FIRST', 'body' => 'DESC')); $expected = ' ORDER BY "title" DESC NULLS FIRST, "body" DESC';