Refs #2633 Adding one test + mysql function replace also replaces _ (for...

Refs #2633 Adding one test + mysql function replace also replaces _ (for functions such as UNIX_TIMESTAMP)

git-svn-id: http://dev.piwik.org/svn/trunk@5148 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/Segment.php

@@ -209,10 +209,12 @@ class Piwik_Segment
     		$sql = $this->buildSelectQuery($select, $from, $where, $orderBy, $groupBy);
     	}
     	
-    	return array(
+    	$return = array(
     		'sql' => $sql,
     		'bind' => $bind
     	);
+    	//var_dump($return);
+    	return $return;
     }
     
     /**

core/SegmentExpression.php

@@ -185,8 +185,7 @@ class Piwik_SegmentExpression
         
         // remove sql functions from field name
         // example: `HOUR(log_visit.visit_last_action_time)` gets `HOUR(log_visit` => remove `HOUR(` 
-        $table = preg_replace('/^[A-Z]+\(/', '', $table);
-        
+        $table = preg_replace('/^[A-Z_]+\(/', '', $table);
         $tableExists = !$table || in_array($table, $availableTables);
         
         if (!$tableExists)

tests/core/Segment.test.php

@@ -221,7 +221,7 @@ class Test_Piwik_Segment extends UnitTestCase
     	
     	$this->assertEqual($query, $expected, var_export($query, true));
     }
-    
+
     public function test_getSelectQuery_joinConversionOnVisit()
     {
     	$select = 'log_visit.*';
@@ -255,6 +255,32 @@ class Test_Piwik_Segment extends UnitTestCase
     	
     	$this->assertEqual($query, $expected, var_export($query, true));
     }
+    public function test_getSelectQuery_conversionOnly()
+    {
+    	$select = 'log_conversion.*';
+    	$from = 'log_conversion';
+    	$where = 'log_conversion.idvisit = ?';
+    	$bind = array(1);
+    	
+    	$segment = 'visitConvertedGoalId==1';
+    	$segment = new Piwik_Segment($segment, $idSites = array());
+    	
+    	$query = $segment->getSelectQuery($select, $from, $where, $bind);
+    	
+    	$expected = array(
+    		"sql" => "
+			SELECT
+				log_conversion.*
+			FROM
+				piwiktests_log_conversion AS log_conversion
+			WHERE
+				( log_conversion.idvisit = ? )
+				AND
+				( log_conversion.idgoal = ? )",
+    		"bind" => array(1, 1));
+    	
+    	$this->assertEqual($query, $expected, var_export($query, true));
+    }
     
     public function test_getSelectQuery_joinVisitOnConversion()
     {