Skip to content

Group function closer to the original one #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Group function closer to the original one #134

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
51128de
Update ValuedQuery.php
lexx27 Jul 14, 2016
3c0920d
Update Group.php
lexx27 Jul 14, 2016
a0efaa8
Update Group.php
lexx27 Jul 14, 2016
3167e62
Update ValuedQuery.php
lexx27 Jul 14, 2016
68ce683
Update NumberDatum.php
lexx27 Jul 17, 2016
2975e7d
Merge pull request #1 from lexx27/numberDatum
lexx27 Jul 17, 2016
528184d
[] to array()
lexx27 Sep 15, 2016
2110d06
[] to array()
lexx27 Sep 15, 2016
9c464c1
fixed syntax and passed test
lexx27 Oct 1, 2016
eb75db2
indentation
lexx27 Oct 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rdb/Datum/NumberDatum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ class NumberDatum extends Datum
{
public function encodeServerRequest()
{
return (float)$this->getValue();
return $this->getValue();
Copy link
Owner

@danielmewes danielmewes Sep 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change this?

Copy link
Author

@lexx27 lexx27 Sep 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because all the numbers are saved as float. I couldn't save integers.

}

public static function decodeServerResponse($json)
{
$result = new NumberDatum();
$result->setValue((float)$json);
$result->setValue($json);
return $result;
}

Expand Down
12 changes: 8 additions & 4 deletions rdb/Queries/Aggregations/Group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@

class Group extends ValuedQuery
{
public function __construct(ValuedQuery $sequence, $groupOn)
public function __construct(ValuedQuery $sequence, $fieldOrFunction, $groupOn = [])
Copy link
Owner

@danielmewes danielmewes Sep 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to use PHP 5.3 compatible syntax, i.e. array() instead of [].

Copy link
Author

@lexx27 lexx27 Sep 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, will fix it

{
if (!is_array($groupOn)) {
$groupOn = array($groupOn);
}
array_unshift($groupOn, $fieldOrFunction);

if (isset($groupOn['index'])) {
$this->setOptionalArg('index', $this->nativeToDatum($groupOn['index']));
unset($groupOn['index']);
}

if (isset($groupOn['multi'])) {
$this->setOptionalArg('multi', $this->nativeToDatum($groupOn['multi']));
unset($groupOn['multi']);
}

$this->setPositionalArg(0, $sequence);
$i = 1;
Expand Down
4 changes: 2 additions & 2 deletions rdb/ValuedQuery/ValuedQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ public function distinct($opts = null)
{
return new Distinct($this, $opts);
}
public function group($groupOn)
public function group($fieldOrFunction, $groupOn = [])
{
return new Group($this, $groupOn);
return new Group($this, $fieldOrFunction, $groupOn);
}
public function ungroup()
{
Expand Down