Permalink
Browse files

Fix issue with postgres and virtualFields

If a virtualField was set to a literal value it would be quoted.
Test added.

Fixes #2085
  • Loading branch information...
1 parent 118cbe2 commit c66fe393292ab4af334b41c6a146dfa8eb1557ad @markstory markstory committed Oct 22, 2011
View
7 cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -492,6 +492,7 @@ function fields(&$model, $alias = null, $fields = array(), $quote = true) {
/**
* Auxiliary function to quote matched `(Model.fields)` from a preg_replace_callback call
+ * Quotes the fields in a function call.
*
* @param string matched string
* @return string quoted strig
@@ -503,9 +504,11 @@ function __quoteFunctionField($match) {
$prepend = 'DISTINCT ';
$match[1] = trim(str_replace('DISTINCT', '', $match[1]));
}
- if (strpos($match[1], '.') === false) {
+ $constant = preg_match('/^\d+|NULL|FALSE|TRUE$/i', $match[1]);
+
+ if (!$constant && strpos($match[1], '.') === false) {
$match[1] = $this->name($match[1]);
- } else {
+ } elseif (!$constant){
$parts = explode('.', $match[1]);
if (!Set::numeric($parts)) {
$match[1] = $this->name($match[1]);
View
19 cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -815,6 +815,25 @@ function testVirtualFields() {
}
/**
+ * Test that virtual fields work with SQL constants
+ *
+ * @return void
+ */
+ function testVirtualFieldAsAConstant() {
+ $this->loadFixtures('Article', 'Comment');
+ $Article =& ClassRegistry::init('Article');
+ $Article->virtualFields = array(
+ 'empty' => "NULL",
+ 'number' => 43,
+ 'truth' => 'TRUE'
+ );
+ $result = $Article->find('first');
+ $this->assertNull($result['Article']['empty']);
+ $this->assertTrue($result['Article']['truth']);
+ $this->assertEqual(42, $result['Article']['number']);
+ }
+
+/**
* Tests additional order options for postgres
*
* @access public

0 comments on commit c66fe39

Please sign in to comment.