fix global search for number and boolean

new column options: operator leftExpr rightExpr

Author: biji

src/Adapter/Doctrine/ORM/SearchCriteriaProvider.php

@@ -16,6 +16,7 @@
 use Doctrine\ORM\QueryBuilder;
 use Omines\DataTablesBundle\Column\AbstractColumn;
 use Omines\DataTablesBundle\DataTableState;
+use Omines\DataTablesBundle\Adapter\Doctrine\ORM\QueryBuilderProcessorInterface;
 
 /**
  * SearchCriteriaProvider.
@@ -60,8 +61,9 @@ private function processGlobalSearch(QueryBuilder $queryBuilder, DataTableState
             $expr = $queryBuilder->expr();
             $comparisons = $expr->orX();
             foreach ($state->getDataTable()->getColumns() as $column) {
-                if ($column->isGlobalSearchable() && !empty($field = $column->getField())) {
-                    $comparisons->add($expr->like($field, $expr->literal("%{$globalSearch}%")));
+                if ($column->isGlobalSearchable() && !empty($field = $column->getField()) && $column->isValidForSearch($globalSearch)) {
+                    $comparisons->add(new Comparison($column->getLeftExpr(), $column->getOperator(),
+                        $expr->literal($column->getRightExpr($globalSearch))));
                 }
             }
             $queryBuilder->andWhere($comparisons);

src/Column/AbstractColumn.php

@@ -123,6 +123,9 @@ protected function configureOptions(OptionsResolver $resolver)
                 'filter' => null,
                 'className' => null,
                 'render' => null,
+                'leftExpr' => null,
+                'operator' => '=',
+                'rightExpr' => null,
             ])
             ->setAllowedTypes('label', ['null', 'string'])
             ->setAllowedTypes('data', ['null', 'string', 'callable'])
@@ -132,10 +135,13 @@ protected function configureOptions(OptionsResolver $resolver)
             ->setAllowedTypes('orderable', ['null', 'boolean'])
             ->setAllowedTypes('orderField', ['null', 'string'])
             ->setAllowedTypes('searchable', ['null', 'boolean'])
-            ->setAllowedTypes('globalSearchable', ['null', 'boolean'])
+            ->setAllowedTypes('globalSearchable',  ['null', 'boolean'])
             ->setAllowedTypes('filter', ['null', 'array'])
             ->setAllowedTypes('className', ['null', 'string'])
             ->setAllowedTypes('render', ['null', 'string', 'callable'])
+            ->setAllowedTypes('operator', ['string'])
+            ->setAllowedTypes('leftExpr', ['null', 'string', 'callable'])
+            ->setAllowedTypes('rightExpr', ['null', 'string', 'callable'])
         ;
 
         return $this;
@@ -237,6 +243,40 @@ public function isGlobalSearchable(): bool
         return $this->options['globalSearchable'] ?? $this->isSearchable();
     }
 
+    /**
+     * @return string
+     */
+    public function getLeftExpr()
+    {
+        $leftExpr = $this->options['leftExpr'];
+        if ($leftExpr === null) return $this->getField();
+        if (is_callable($leftExpr)) {
+            return call_user_func($leftExpr, $this->getField());
+        }
+        return $leftExpr;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getRightExpr($value)
+    {
+        $rightExpr = $this->options['rightExpr'];
+        if ($rightExpr === null) return $value;
+        if (is_callable($rightExpr)) {
+            return call_user_func($rightExpr, $value);
+        }
+        return $rightExpr;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOperator()
+    {
+        return $this->options['operator'];
+    }
+
     /**
      * @return string
      */
@@ -264,4 +304,14 @@ public function setOption(string $name, $value): self
 
         return $this;
     }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    public function isValidForSearch($value)
+    {
+        return true;
+    }
+
 }

src/Column/BoolColumn.php

@@ -40,6 +40,14 @@ protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 
+        $resolver
+            ->setDefault(
+                'rightExpr',
+                function ($value) {
+                    return trim(strtolower($value)) == $this->getTrueValue();
+                }
+        );
+
         $resolver
             ->setDefault('trueValue', 'true')
             ->setDefault('falseValue', 'false')
@@ -75,4 +83,14 @@ public function getNullValue(): string
     {
         return $this->options['nullValue'];
     }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    public function isValidForSearch($value)
+    {
+        $value = trim(strtolower($value));
+        return ($value == $this->getTrueValue()) || ($value == $this->getFalseValue());
+    }
 }

src/Column/NumberColumn.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Omines\DataTablesBundle\Column;
+
+use Omines\DataTablesBundle\Column\AbstractColumn;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * NumberColumn.
+ *
+ * @author Niels Keurentjes <[email protected]>
+ */
+class NumberColumn extends AbstractColumn
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function normalize($value): string
+    {
+        $value = (string) $value;
+        if (is_numeric($value)) return $value;
+
+        return $this->isRaw() ? $value : (string) floatval($value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver
+            ->setDefault('raw', false)
+            ->setAllowedTypes('raw', 'bool')
+        ;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isRaw(): bool
+    {
+        return $this->options['raw'];
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    public function isValidForSearch($value)
+    {
+        return is_numeric($value);
+    }
+}