Rename types to Type suffix
Signed-off-by: davidarendsen <davidarendsen@hey.com>
This commit is contained in:
parent
a3bf698359
commit
923cb7dcb7
12 changed files with 63 additions and 41 deletions
|
|
@ -5,14 +5,14 @@ declare(strict_types=1);
|
|||
namespace Tests\Functions;
|
||||
|
||||
use Arendsen\FluxQueryBuilder\Functions\Reduce;
|
||||
use Arendsen\FluxQueryBuilder\Type\Math;
|
||||
use Arendsen\FluxQueryBuilder\Type\MathType;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
final class ReduceFunctionTest extends TestCase
|
||||
{
|
||||
public function testSimpleReduce()
|
||||
{
|
||||
$expression = new Reduce(['sum' => new Math('r._value + accumulator.sum')], ['sum' => 0]);
|
||||
$expression = new Reduce(['sum' => new MathType('r._value + accumulator.sum')], ['sum' => 0]);
|
||||
|
||||
$query = '|> reduce(fn: (r, accumulator) => ({sum: r._value + accumulator.sum}), identity: {sum: 0}) ';
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use Exception;
|
|||
use Arendsen\FluxQueryBuilder\Expression\KeyValue;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Arendsen\FluxQueryBuilder\QueryBuilder;
|
||||
use Arendsen\FluxQueryBuilder\Type\Math;
|
||||
use Arendsen\FluxQueryBuilder\Type\MathType;
|
||||
|
||||
final class QueryBuilderTest extends TestCase
|
||||
{
|
||||
|
|
@ -103,7 +103,7 @@ final class QueryBuilderTest extends TestCase
|
|||
->addFilter(KeyValue::setEqualTo('_field', 'username'))
|
||||
->addMap('r with name: r.user')
|
||||
->addGroup(['_field', 'ip'])
|
||||
->addReduce(['count' => new Math('accumulator.count + 1')], ['count' => 0])
|
||||
->addReduce(['count' => new MathType('accumulator.count + 1')], ['count' => 0])
|
||||
->addFilter(KeyValue::setGreaterOrEqualTo('count', 1)->andGreaterOrEqualTo('count2', 2));
|
||||
|
||||
$expectedQuery = 'from(bucket: "test_bucket") |> range(start: time(v: 2022-08-12T17:31:00Z)) ' .
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@ namespace Tests\Type;
|
|||
|
||||
use DateTime;
|
||||
use Arendsen\FluxQueryBuilder\Type;
|
||||
use Arendsen\FluxQueryBuilder\Type\Record;
|
||||
use Arendsen\FluxQueryBuilder\Type\CustomType;
|
||||
use Arendsen\FluxQueryBuilder\Type\DurationType;
|
||||
use Arendsen\FluxQueryBuilder\Type\MathType;
|
||||
use Arendsen\FluxQueryBuilder\Type\RecordType;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
final class FactoryTypeTest extends TestCase
|
||||
|
|
@ -60,10 +63,22 @@ final class FactoryTypeTest extends TestCase
|
|||
['hello' => ['test' => 'bar', 'foo' => 'hi']],
|
||||
'hello: [test: "bar", foo: "hi"]'
|
||||
],
|
||||
'Record' => [
|
||||
new Record(['foo' => 'bar', 'nested' => ['hello' => 'world']]),
|
||||
'RecordType' => [
|
||||
new RecordType(['foo' => 'bar', 'nested' => ['hello' => 'world']]),
|
||||
'{foo: "bar", nested: {hello: "world"}}'
|
||||
],
|
||||
'DurationType' => [
|
||||
new DurationType('5h'),
|
||||
'5h',
|
||||
],
|
||||
'MathType' => [
|
||||
new MathType('r.count + 1'),
|
||||
'r.count + 1'
|
||||
],
|
||||
'CustomType' => [
|
||||
new CustomType('this can be anything'),
|
||||
'this can be anything'
|
||||
],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
editor.link_modal.header
Reference in a new issue