All tests pass in Sqlite now, additionally made more secure the way

DateDiff is translated
cakephp · Aug 13, 2013 · e043699 · e043699
1 parent 32983dc
commit e043699
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/Cake/Database/Dialect/SqliteDialectTrait.php b/lib/Cake/Database/Dialect/SqliteDialectTrait.php
@@ -71,7 +71,7 @@ protected function _transformFunctionExpression(FunctionExpression $expression)
 					->name('ROUND')
 					->type('-')
 					->iterateParts(function($p) {
-						return new FunctionExpression('JULIANDAY', [$p => 'literal']);
+						return new FunctionExpression('JULIANDAY', [$p['value']], [$p['type']]);
 					});
 				break;
 			case 'NOW':

diff --git a/lib/Cake/Database/Expression/FunctionExpression.php b/lib/Cake/Database/Expression/FunctionExpression.php
@@ -65,6 +65,13 @@ public function __construct($name, $params = [], $types = []) {
 		parent::__construct($params, $types, ',');
 	}
 
+/**
+ * Sets the name of the SQL function to be invoke in this expression,
+ * if no value is passed it will return current name
+ *
+ * @param string $name
+ * @return string
+ */
 	public function name($name = null) {
 		if ($name === null) {
 			return $this->_name;
@@ -112,7 +119,6 @@ public function add($params, $types = []) {
  * @return string
  */
 	public function sql(ValueBinder $generator) {
-
 		$parts = [];
 		foreach ($this->_conditions as $condition) {
 			if ($condition instanceof ExpressionInterface) {