Merge branch 'n1crack:master' into bugfix

Author: kalider

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: n1crack # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -1,7 +1,7 @@
 # Datatables library for PHP 
 [![Latest Stable Version](https://poser.pugx.org/ozdemir/datatables/v/stable)](https://packagist.org/packages/ozdemir/datatables) [![PHP Composer](https://github.com/n1crack/datatables/actions/workflows/tests.yml/badge.svg)](https://github.com/n1crack/datatables/actions/workflows/tests.yml) [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/n1crack/datatables/blob/master/LICENCE) 
 
-PHP Library to handle server-side processing for Datatables, in a fast and simple way. [Live Demo](https://datatables.ozdemir.be/)
+Simplify your Datatables server-side processing effortlessly using our lightning-fast PHP library, streamlining your workflow seamlessly. [Live Demo](https://datatables.ozdemir.be/)
 
 ## Features  
 * Easy to use. Generates json using only a few lines of code.
@@ -127,20 +127,22 @@ use Ozdemir\Datatables\DB\LaravelAdapter;
 
 Route::get('/ajax/laravel', function () {
 
-    $sqlBuilder = Track::select([
-        'TrackId',
-        'Track.Name',
-        'Title as Album',
-        'MediaType.Name as MediaType',
-        'UnitPrice',
-        'Milliseconds',
-        'Bytes',
-    ])
-        ->join('Album', 'Album.AlbumId', 'Track.AlbumId')
-        ->join('MediaType', 'MediaType.MediaTypeId', 'Track.MediaTypeId');
-
     $dt = new Datatables(new LaravelAdapter);
-    $dt->query($sqlBuilder); // same as the previous example, sql statement can be used.
+
+    $dt->query(
+      Track::query()
+          ->select([
+              'TrackId',
+              'Track.Name',
+              'Title as Album',
+              'MediaType.Name as MediaType',
+              'UnitPrice',
+              'Milliseconds',
+              'Bytes',
+          ])
+          ->join('Album', 'Album.AlbumId', 'Track.AlbumId')
+          ->join('MediaType', 'MediaType.MediaTypeId', 'Track.MediaTypeId')
+    ); // same as the previous example, sql statement can be used.
 
     return $dt->generate();
 });

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "ozdemir/datatables",
-  "description": "PHP Library to handle server-side processing for Datatables, in a fast and simple way.",
+  "description": "Simplify your Datatables server-side processing effortlessly using our lightning-fast PHP library, streamlining your workflow seamlessly.",
   "license": "MIT",
   "config": {
     "bin-dir": "vendor/bin"

src/Column.php

@@ -50,7 +50,19 @@ class Column
      * Custom filter
      * @var \Closure
      */
-    public $customFilter;
+    public $customIndividualFilter;
+
+    /**
+     * Custom filter
+     * @var \Closure
+     */
+    public $customGlobalFilter;
+
+    /**
+     *
+     * @var string
+     */
+    public $customFilterType;
 
     /**
      * Column constructor.
@@ -82,7 +94,7 @@ public function value($row): string
      * Set visibility of the column.
      * @param bool $searchable
      */
-    public function hide($searchable = false): void
+    public function hide(bool $searchable = false): void
     {
         $this->hidden = true;
         $this->forceSearch = $searchable;
@@ -91,9 +103,17 @@ public function hide($searchable = false): void
     /**
      * @return bool
      */
-    public function hasFilter(): bool
+    public function hasCustomIndividualFilter(): bool
+    {
+        return $this->customIndividualFilter instanceof \Closure;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasCustomGlobalFilter(): bool
     {
-        return $this->customFilter instanceof \Closure;
+        return $this->customGlobalFilter instanceof \Closure;
     }
 
     /**

src/CustomFilterType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Ozdemir\Datatables;
+
+class CustomFilterType
+{
+    const INDIVIDUAL = 'individual';
+    const GLOBALLY = 'globally';
+    const ALL = 'all';
+}

src/DB/Codeigniter4Adapter.php

@@ -18,19 +18,22 @@ class Codeigniter4Adapter extends DBAdapter
     protected $db;
 
     /**
-     * @var $config
+     * @var array
      */
+    protected $config;
+
     public function __construct($config = null)
     {
-
+        $this->config = $config ?? ['DBGroup' => 'default'];
+        $this->config['DBGroup'] = $this->config['DBGroup'] ?? 'default';
     }
 
     /**
      * @return $this
      */
     public function connect()
     {
-        $this->db = \Config\Database::connect();
+        $this->db = \Config\Database::connect($this->config['DBGroup']);
 
         return $this;
     }
@@ -87,7 +90,7 @@ public function makeQueryString(string $query, ColumnCollection $columns): strin
      * @param $query
      * @return string
      */
-    public function getQueryString($query)
+    public function getQueryString($query): string
     {
         if ($query instanceof \CodeIgniter\Database\BaseBuilder) {
             return $query->getCompiledSelect();

src/DB/DBAdapter.php

@@ -10,6 +10,7 @@
 
 abstract class DBAdapter implements DatabaseInterface
 {
+    public $exactMatch = false;
 
     /**
      * @return void
@@ -64,17 +65,46 @@ public function makeWhereString(array $filter)
         return ' WHERE '.implode(' AND ', $filter);
     }
 
+
+    /**
+     * @return bool
+     */
+    public function isExactMatch()
+    {
+        return $this->exactMatch;
+    }
+
+    /**
+     * @param bool $value
+     * @return void
+     */
+    public function setExactMatch(bool $value)
+    {
+        $this->exactMatch = $value;
+    }
+
     /**
      * @param Query $query
      * @param Column $column
-     * @param $word
+     * @param string $word
      * @return string
      */
     public function makeLikeString(Query $query, Column $column, string $word)
     {
         return $column->name.' LIKE '.$this->escape('%'.$word.'%', $query);
     }
 
+     /**
+     * @param Query $query
+     * @param Column $column
+     * @param string $word
+     * @return string
+     */
+    public function makeEqualString(Query $query, Column $column, string $word)
+    {
+        return $column->name.' = '.$this->escape( $word, $query);
+    }
+
     /**
      * @param array $o
      * @return string
@@ -98,7 +128,7 @@ public function makeLimitString(int $take, int $skip)
      * @param $query
      * @return string
      */
-    public function getQueryString($query)
+    public function getQueryString($query): string
     {
         return $query;
     }

src/DB/DatabaseInterface.php

@@ -54,6 +54,17 @@ public function makeDistinctQueryString(Query $query, string $column);
      */
     public function makeWhereString(array $filter);
 
+    /**
+     * @param bool $value
+     * @return void
+     */
+    public function setExactMatch(bool $value);
+
+    /**
+     * @return mixed
+     */
+    public function isExactMatch();
+
     /**
      * @param Query $query
      * @param Column $column
@@ -62,6 +73,15 @@ public function makeWhereString(array $filter);
      */
     public function makeLikeString(Query $query, Column $column, string $word);
 
+
+    /**
+     * @param Query $query
+     * @param Column $column
+     * @param string $word
+     * @return mixed
+     */
+    public function makeEqualString(Query $query, Column $column, string $word);
+
     /**
      * @param array $o
      * @return mixed
@@ -74,4 +94,10 @@ public function makeOrderByString(array $o);
      * @return mixed
      */
     public function makeLimitString(int $take, int $skip);
+
+    /**
+     * @param $query
+     * @return string
+     */
+    public function getQueryString($query): string;
 }

src/DB/LaravelAdapter.php

@@ -71,7 +71,7 @@ public function escape($string, Query $query)
      * @param $query
      * @return string
      */
-    public function getQueryString($query)
+    public function getQueryString($query): string
     {
         if ($query instanceof \Illuminate\Database\Eloquent\Builder) {
             return vsprintf(str_replace('?', '%s', $query->toSql()),