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

8
src/Expression/KeyValue.php
View file

@ -2,7 +2,7 @@
namespace Arendsen\FluxQueryBuilder\Expression;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
use Exception;
class KeyValue extends Base
@ -35,7 +35,7 @@ class KeyValue extends Base
private function __construct(string $key, string $operator, $value)
{
$this->checkOperator($operator);
$this->expressions[] = 'r.' . $key . ' ' . $operator . ' ' . Formatters::valueToString($value);
$this->expressions[] = 'r.' . $key . ' ' . $operator . ' ' . new Type($value);
}
public static function set(string $key, string $operator, $value): KeyValue
@ -86,7 +86,7 @@ class KeyValue extends Base
public function and(string $key, string $operator, $value): KeyValue
{
$this->checkOperator($operator);
$this->expressions[] = 'and r.' . $key . ' ' . $operator . ' ' . Formatters::valueToString($value);
$this->expressions[] = 'and r.' . $key . ' ' . $operator . ' ' . new Type($value);
return $this;
}
@ -141,7 +141,7 @@ class KeyValue extends Base
public function or(string $key, string $operator, $value): KeyValue
{
$this->checkOperator($operator);
$this->expressions[] = 'or r.' . $key . ' ' . $operator . ' ' . Formatters::valueToString($value);
$this->expressions[] = 'or r.' . $key . ' ' . $operator . ' ' . new Type($value);
return $this;
}

10
src/Formatters.php
View file

@ -10,18 +10,12 @@ class Formatters
{
public static function valueToString($value): string
{
if (is_array($value)) {
return '[' . new ArrayType($value) . ']';
} else {
return new Type($value);
}
return $value;
return new Type($value);
}
public static function toFluxArrayString(array $array): string
{
return new ArrayType($array);
return new Type($array);
}
public static function dateTimeToString(DateTime $dateTime): string

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) . ') ';
}
}

5
src/Type.php
View file

@ -9,9 +9,10 @@ use DateTime;
class Type
{
public function __construct($value)
public function __construct($value, $settings = [])
{
$this->value = $value;
$this->settings = $settings;
}
public function __toString(): string
@ -27,7 +28,7 @@ class Type
case 'boolean':
return new BooleanType($this->value);
case 'array':
return new ArrayType($this->value);
return new ArrayType($this->value, $this->settings);
default:
return (string)$this->value;
}

26
src/Type/ArrayType.php
View file

@ -2,26 +2,42 @@
namespace Arendsen\FluxQueryBuilder\Type;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
class ArrayType implements TypeInterface
{
public function __construct(array $value)
/**
* @var array $value
*/
protected $value;
/**
* @var array $settings
*/
protected $settings;
public function __construct(array $value, $settings = [])
{
$this->value = $value;
$this->settings = $settings;
}
public function __toString(): string
{
$subArray = isset($this->settings['subArray']) && $this->settings['subArray'];
array_walk($this->value, function (&$value, $key) {
if (is_string($key)) {
$value = $key . ': ' . Formatters::valueToString($value);
$value = $key . ': ' . new Type($value, [
'subArray' => is_array($value)
]);
} else {
$value = Formatters::valueToString($value);
$value = new Type($value, [
'subArray' => is_array($value)
]);
}
});
return implode(', ', $this->value);
return ($subArray ? '[' : '') . implode(', ', $this->value) . ($subArray ? ']' : '');
}
}

3
src/Type/Math.php
View file

@ -2,9 +2,6 @@
namespace Arendsen\FluxQueryBuilder\Type;
use Arendsen\FluxQueryBuilder\Formatters;
use Arendsen\FluxQueryBuilder\Type;
class Math implements TypeInterface
{
public function __construct(string $value)