Dev: Adding basic support for ColumnControl's searchDateTime mask option

Dev: Correct return type for Editor->Field()

Author: AllanJard

Database/Query.php

@@ -276,6 +276,16 @@ public function bind($name, $value, $type = null)
 		return $this;
 	}
 
+	/**
+	 * Generate a unique name for binding values.
+	 *
+	 * @return string Name
+	 */
+	public function bindName()
+	{
+		return ':binding_' . count($this->_bindings);
+	}
+
 	/**
 	 * Get the Database host for this query instance.
 	 *

Editor.php

@@ -322,7 +322,7 @@ public function debug($_ = null, $path = null)
 	 *      * `array` - An array of {@see Field} instances to add to the list
 	 *        of fields.
 	 *
-	 * @return ($_ is null ? ($_ is string ? Field : Field[]) : $this) The selected field, an array of fields, depending on the input parameter.
+	 * @return ($_ is null ? Field[] : ($_ is string ? Field : $this)) The selected field, an array of fields, depending on the input parameter.
 	 *
 	 * @see {@see Field} for field documentation.
 	 */

Editor/ColumnControl.php

@@ -33,7 +33,7 @@ public static function ssp(&$editor, &$query, $http)
 					if ($type === 'num') {
 						self::_sspNumber($query, $field, $value, $logic);
 					} elseif ($type === 'date') {
-						self::_sspDate($query, $field, $value, $logic);
+						self::_sspDate($query, $field, $value, $logic, $search['mask']);
 					} else {
 						self::_sspText($query, $field, $value, $logic);
 					}
@@ -57,8 +57,24 @@ public static function ssp(&$editor, &$query, $http)
 	 * @param string                     $value Search term
 	 * @param string                     $logic Search logic
 	 */
-	private static function _sspDate(&$query, $field, $value, $logic)
+	private static function _sspDate(&$query, $field, $value, $logic, $mask)
 	{
+		$bindingName = $query->bindName();
+		$dbField = $field->dbField();
+		$search = $bindingName;
+
+		// Only support date and time masks. This departs from the client side which allows
+		// any component in the date/time to be masked out.
+		if ($mask === 'YYYY-MM-DD') {
+			$dbField = 'DATE(' . $dbField . ')';
+			$search = 'DATE(' . $bindingName . ')';
+		} elseif ($mask === 'hh:mm:ss') {
+			$dbField = 'TIME(' . $dbField . ')';
+			$search = 'TIME(' . $bindingName . ')';
+		} else {
+			$search = '(' . $bindingName . ')';
+		}
+
 		if ($logic === 'empty') {
 			$query->where($field->dbField(), null);
 		} elseif ($logic === 'notEmpty') {
@@ -67,13 +83,21 @@ private static function _sspDate(&$query, $field, $value, $logic)
 			// Empty search value means no search for the other logic operators
 			return;
 		} elseif ($logic === 'equal') {
-			$query->where($field->dbField(), $value);
+			$query
+				->where($dbField, $search, '=', false)
+				->bind($bindingName, $value);
 		} elseif ($logic === 'notEqual') {
-			$query->where($field->dbField(), $value, '!=');
+			$query
+				->where($dbField, $search, '!=', false)
+				->bind($bindingName, $value);
 		} elseif ($logic === 'greater') {
-			$query->where($field->dbField(), $value, '>');
+			$query
+				->where($dbField, $search, '>', false)
+				->bind($bindingName, $value);
 		} elseif ($logic === 'less') {
-			$query->where($field->dbField(), $value, '<');
+			$query
+				->where($dbField, $search, '<', false)
+				->bind($bindingName, $value);
 		}
 	}