Removing hardcoded '__' for virtualField separators. Making it an ins…

…tance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655, #730
cakephp · May 22, 2010 · 29f2223 · 29f2223
1 parent 23d4baf
commit 29f2223
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -728,7 +728,7 @@ function resultSet(&$results) {
 
 		while ($j < $numFields) {
 			$column = mysql_fetch_field($results, $j);
-			if (!empty($column->table) && strpos($column->name, '__') === false) {
+			if (!empty($column->table) && strpos($column->name, $this->virtualFieldSeparator) === false) {
 				$this->map[$index++] = array($column->table, $column->name);
 			} else {
 				$this->map[$index++] = array(0, $column->name);

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -97,6 +97,13 @@ class DboSource extends DataSource {
 		'rollback' => 'ROLLBACK'
 	);
 
+/**
+ * Separator string for virtualField composition
+ *
+ * @var string
+ */
+	var $virtualFieldSeparator = '__';
+
 /**
  * List of table engine specific parameters used on table creating
  *
@@ -432,10 +439,10 @@ function fetchAll($sql, $cache = true, $modelName = null) {
 	function fetchVirtualField(&$result) {
 		if (isset($result[0]) && is_array($result[0])) {
 			foreach ($result[0] as $field => $value) {
-				if (strpos($field, '__') === false) {
+				if (strpos($field, $this->virtualFieldSeparator) === false) {
 					continue;
 				}
-				list($alias, $virtual) = explode('__', $field);
+				list($alias, $virtual) = explode($this->virtualFieldSeparator, $field);
 
 				if (!ClassRegistry::isKeySet($alias)) {
 					return;
@@ -1902,7 +1909,7 @@ function __scrubQueryData($data) {
 	function _constructVirtualFields(&$model, $alias, $fields) {
 		$virtual = array();
 		foreach ($fields as $field) {
-			$virtualField = $this->name("{$alias}__{$field}");
+			$virtualField = $this->name($alias . $this->virtualFieldSeparator . $field);
 			$expression = $this->__quoteFields($model->getVirtualField($field));
 			$virtual[] = '(' .$expression . ") {$this->alias} {$virtualField}";
 		}

diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -759,4 +759,22 @@ function testGetCharsetName() {
 		$this->assertEqual($result, 'cp1250');
 	}
 
+/**
+ * test that changing the virtualFieldSeparator allows for __ fields.
+ *
+ * @return void
+ */
+	function testVirtualFieldSeparators() {
+		$model =& new CakeTestModel(array('table' => 'binary_tests', 'ds' => 'test_suite', 'name' => 'BinaryTest'));
+		$model->virtualFields = array(
+			'other__field' => 'SUM(id)'
+		);
+
+		$this->db->virtualFieldSeparator = '_$_';
+		$result = $this->db->fields($model, null, array('data', 'other__field'));
+		$expected = array('`BinaryTest`.`data`', '(SUM(id)) AS  BinaryTest_$_other__field');
+		$this->assertEqual($result, $expected);
+
+	}
+
 }