Hosterra/flux-querybuilder
Hosterra/flux-querybuilder
1
0
Fork 0
Code Issues Pull requests Releases 2 Packages Activity

Movee Formatters to Type factory

Browse source 
Signed-off-by: davidarendsen <davidarendsen@hey.com>
This commit is contained in:
davidarendsen 2022-08-16 15:06:32 +00:00
commit 4abd95f303
12 changed files with 40 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Functions/Base.php
View file

@ -2,7 +2,6 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Exception\FunctionNotImplementedException;
abstract class Base

4
src/Functions/From.php
View file

@ -2,7 +2,7 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
class From extends Base
{
@ -18,6 +18,6 @@ class From extends Base
public function __toString()
{
return 'from(' . Formatters::toFluxArrayString($this->settings) . ') ';
return 'from(' . new Type($this->settings) . ') ';
}
}

4
src/Functions/Group.php
View file

@ -2,7 +2,7 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
class Group extends Base
{
@ -24,7 +24,7 @@ class Group extends Base
public function __toString()
{
$array = Formatters::toFluxArrayString([
$array = new Type([
'columns' => $this->columns,
'mode' => $this->mode,
]);

6
src/Functions/Range.php
View file

@ -3,7 +3,7 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Exception\FunctionRequiredSettingMissingException;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
use DateTime;
class Range extends Base
@ -20,8 +20,8 @@ class Range extends Base
public function __construct(DateTime $start, ?DateTime $stop = null)
{
$this->start = Formatters::dateTimeToString($start);
$this->stop = $stop ? Formatters::dateTimeToString($stop) : null;
$this->start = new Type($start);
$this->stop = $stop ? new Type($stop) : null;
}
public function __toString()

2
src/Functions/Reduce.php
View file

@ -2,7 +2,6 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type\Record;
class Reduce extends Base
@ -28,5 +27,4 @@ class Reduce extends Base
return '|> reduce(fn: (r, accumulator) => (' . new Record($this->settings) . '), ' .
'identity: ' . new Record($this->identity) . ') ';
}
}

6
src/Functions/Sort.php
View file

@ -2,7 +2,7 @@
namespace Arendsen\FluxQueryBuilder\Functions;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
class Sort extends Base
{
@ -24,7 +24,7 @@ class Sort extends Base
public function __toString()
{
return '|> sort(columns: [' . Formatters::toFluxArrayString($this->columns) .
'], desc: ' . Formatters::valueToString($this->desc) . ') ';
return '|> sort(columns: [' . new Type($this->columns) .
'], desc: ' . new Type($this->desc) . ') ';
}
}