Skip to content

Commit 7e78b6a

Browse files
marcgeurtsmarcgeurts
committed
Add aggregation-class with limit and orderby function
1 parent 694425a commit 7e78b6a

21 files changed

+587
-182
lines changed

‎docs/roadmap.md‎

Lines changed: 171 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -4,198 +4,198 @@
44

55
## current and next versions
66

7-
| method | Version 1.0 | Version 2.0 |
7+
| method | Version 1.0 | Version 1.1 | Version x |
88
| --- | :---: | :---: |
99
| **Accessing ReQL**
10-
| r | ✓ | |
11-
| connection | ✓ | |
12-
| close | ✓ | |
13-
| reconnect | ✓ | |
14-
| use | ✓ | |
15-
| run | ✓ | |
16-
| runNoReply | ✓ | |
17-
| changes | ✓ | |
18-
| noreplyWait | ✓ | |
19-
| server | ✓ | |
20-
| optArg | ✘ | |
10+
| r | ✓ | ✓ | |
11+
| connection | ✓ | ✓ | |
12+
| close | ✓ | ✓ | |
13+
| reconnect | ✓ | ✓ | |
14+
| use | ✓ | ✓ | |
15+
| run | ✓ | ✓ | |
16+
| runNoReply | ✓ | ✓ | |
17+
| changes | ✓ | ✓ | |
18+
| noreplyWait | ✓ | ✓ | |
19+
| server | ✓ | ✓ | |
20+
| optArg | ✘ | ✘ | |
2121
| | | |
2222
| **Cursors**
23-
| next | ✓ | |
24-
| for | ✓ | |
25-
| toList | ✓ | |
26-
| close | ✓ | |
23+
| next | ✓ | ✓ | |
24+
| for | ✓ | ✓ | |
25+
| toList | ✓ | ✓ | |
26+
| close | ✓ | ✓ | |
2727
| | | |
2828
| **Manipulating databases**
29-
| dbCreate | ✓ | |
30-
| dbDrop | ✓ | |
31-
| dbList | ✓ | |
29+
| dbCreate | ✓ | ✓ | |
30+
| dbDrop | ✓ | ✓ | |
31+
| dbList | ✓ | ✓ | |
3232
| | | |
3333
| **Manipulating tables**
34-
| tableCreate | ✓ | |
35-
| tableDrop | ✓ | |
36-
| tableList | ✓ | |
37-
| indexCreate | ✘ | |
38-
| indexDrop | ✘ | |
39-
| indexList | ✘ | |
40-
| indexRename | ✘ | |
41-
| indexStatus | ✘ | |
42-
| indexWait | ✘ | |
34+
| tableCreate | ✓ | ✓ | |
35+
| tableDrop | ✓ | ✓ | |
36+
| tableList | ✓ | ✓ | |
37+
| indexCreate | ✘ | ✘ | |
38+
| indexDrop | ✘ | ✘ | |
39+
| indexList | ✘ | ✘ | |
40+
| indexRename | ✘ | ✘ | |
41+
| indexStatus | ✘ | ✘ | |
42+
| indexWait | ✘ | ✘ | |
4343
| | | |
4444
| **Writing data**
45-
| insert | ✓ | |
46-
| update | ✓ | |
47-
| replace | ✓ | |
48-
| delete | ✓ | |
49-
| sync | ✘ | |
45+
| insert | ✓ | ✓ | |
46+
| update | ✓ | ✓ | |
47+
| replace | ✓ | ✓ | |
48+
| delete | ✓ | ✓ | |
49+
| sync | ✘ | ✘ | |
5050
| | | |
5151
| **Selecting data**
52-
| db | ✓ | |
53-
| table | ✓ | |
54-
| get | ✓ | |
55-
| getAll | ✓ | |
56-
| between | ✘ | |
57-
| filter | ✓ | |
58-
| Joins | ✘ | |
59-
| innerJoin | ✘ | |
60-
| outerJoin | ✘ | |
61-
| eqJoin | ✘ | |
62-
| zip | ✘ | |
52+
| db | ✓ | ✓ | |
53+
| table | ✓ | ✓ | |
54+
| get | ✓ | ✓ | |
55+
| getAll | ✓ | ✓ | |
56+
| between | ✘ | ✘ | |
57+
| filter | ✓ | ✓ | |
58+
| Joins | ✘ | ✘ | |
59+
| innerJoin | ✘ | ✘ | |
60+
| outerJoin | ✘ | ✘ | |
61+
| eqJoin | ✘ | ✘ | |
62+
| zip | ✘ | ✘ | |
6363
| | | |
6464
| **Transformations**
65-
| map | ✘ | |
66-
| withFields | ✘ | |
67-
| concatMap | ✘ | |
68-
| orderBy | ✘ | |
69-
| skip | ✘ | |
70-
| limit | ✘ | |
71-
| slice | ✘ | |
72-
| nth | ✘ | |
73-
| offsetsOf | ✘ | |
74-
| isEmpty | ✘ | |
75-
| union | ✘ | |
76-
| sample | ✘ | |
65+
| map | ✘ | ✘ | |
66+
| withFields | ✘ | ✘ | |
67+
| concatMap | ✘ | ✘ | |
68+
| orderBy | ✘ | ✓ | |
69+
| skip | ✘ | ✘ | |
70+
| limit | ✘ | ✓ | |
71+
| slice | ✘ | ✘ | |
72+
| nth | ✘ | ✘ | |
73+
| offsetsOf | ✘ | ✘ | |
74+
| isEmpty | ✘ | ✘ | |
75+
| union | ✘ | ✘ | |
76+
| sample | ✘ | ✘ | |
7777
| | | |
7878
| **Aggregation**
79-
| group | ✘ | |
80-
| ungroup | ✘ | |
81-
| reduce | ✘ | |
82-
| fold | ✘ | |
83-
| count | ✘ | |
84-
| sum | ✘ | |
85-
| avg | ✘ | |
86-
| min | ✘ | |
87-
| max | ✘ | |
88-
| distinct | ✘ | |
89-
| contains | ✘ | |
79+
| group | ✘ | ✘ | |
80+
| ungroup | ✘ | ✘ | |
81+
| reduce | ✘ | ✘ | |
82+
| fold | ✘ | ✘ | |
83+
| count | ✘ | ✘ | |
84+
| sum | ✘ | ✘ | |
85+
| avg | ✘ | ✘ | |
86+
| min | ✘ | ✘ | |
87+
| max | ✘ | ✘ | |
88+
| distinct | ✘ | ✘ | |
89+
| contains | ✘ | ✘ | |
9090
| | | |
9191
| **Document manipulation**
92-
| row | ✘ | |
93-
| pluck | ✘ | |
94-
| without | ✘ | |
95-
| merge | ✘ | |
96-
| append | ✘ | |
97-
| prepend | ✘ | |
98-
| difference | ✘ | |
99-
| setInsert | ✘ | |
100-
| setUnion | ✘ | |
101-
| setIntersection | ✘ | |
102-
| setDifference | ✘ | |
103-
| () (bracket) | ✘ | |
104-
| getField | ✘ | |
105-
| hasFields | ✘ | |
106-
| insertAt | ✘ | |
107-
| spliceAt | ✘ | |
108-
| deleteAt | ✘ | |
109-
| changeAt | ✘ | |
110-
| keys | ✘ | |
111-
| values | ✘ | |
112-
| literal | ✘ | |
113-
| object | ✘ | |
114-
| String manipulation | ✘ | |
115-
| match | ✘ | |
116-
| split | ✘ | |
117-
| upcase | ✘ | |
118-
| downcase | ✘ | |
119-
| Math and logic | ✘ | |
120-
| add | ✘ | |
121-
| sub | ✘ | |
122-
| mul | ✘ | |
123-
| div | ✘ | |
124-
| mod | ✘ | |
125-
| and | ✘ | |
126-
| or | ✘ | |
127-
| eq | ✘ | |
128-
| ne | ✘ | |
129-
| gt | ✘ | |
130-
| ge | ✘ | |
131-
| lt | ✘ | |
132-
| le | ✘ | |
133-
| not | ✘ | |
134-
| random | ✘ | |
135-
| round | ✘ | |
136-
| ceil | ✘ | |
137-
| floor | ✘ | |
92+
| row | ✘ | ✘ | |
93+
| pluck | ✘ | ✘ | |
94+
| without | ✘ | ✘ | |
95+
| merge | ✘ | ✘ | |
96+
| append | ✘ | ✘ | |
97+
| prepend | ✘ | ✘ | |
98+
| difference | ✘ | ✘ | |
99+
| setInsert | ✘ | ✘ | |
100+
| setUnion | ✘ | ✘ | |
101+
| setIntersection | ✘ | ✘ | |
102+
| setDifference | ✘ | ✘ | |
103+
| () (bracket) | ✘ | ✘ | |
104+
| getField | ✘ | ✘ | |
105+
| hasFields | ✘ | ✘ | |
106+
| insertAt | ✘ | ✘ | |
107+
| spliceAt | ✘ | ✘ | |
108+
| deleteAt | ✘ | ✘ | |
109+
| changeAt | ✘ | ✘ | |
110+
| keys | ✘ | ✘ | |
111+
| values | ✘ | ✘ | |
112+
| literal | ✘ | ✘ | |
113+
| object | ✘ | ✘ | |
114+
| String manipulation | ✘ | ✘ | |
115+
| match | ✘ | ✘ | |
116+
| split | ✘ | ✘ | |
117+
| upcase | ✘ | ✘ | |
118+
| downcase | ✘ | ✘ | |
119+
| Math and logic | ✘ | ✘ | |
120+
| add | ✘ | ✘ | |
121+
| sub | ✘ | ✘ | |
122+
| mul | ✘ | ✘ | |
123+
| div | ✘ | ✘ | |
124+
| mod | ✘ | ✘ | |
125+
| and | ✘ | ✘ | |
126+
| or | ✘ | ✘ | |
127+
| eq | ✘ | ✘ | |
128+
| ne | ✘ | ✘ | |
129+
| gt | ✘ | ✘ | |
130+
| ge | ✘ | ✘ | |
131+
| lt | ✘ | ✘ | |
132+
| le | ✘ | ✘ | |
133+
| not | ✘ | ✘ | |
134+
| random | ✘ | ✘ | |
135+
| round | ✘ | ✘ | |
136+
| ceil | ✘ | ✘ | |
137+
| floor | ✘ | ✘ | |
138138
| | | |
139139
| **Dates and times**
140-
| now | ✘ | |
141-
| time | ✘ | |
142-
| epochTime | ✘ | |
143-
| ISO8601 | ✘ | |
144-
| inTimezone | ✘ | |
145-
| timezone | ✘ | |
146-
| during | ✘ | |
147-
| date | ✘ | |
148-
| timeOfDay | ✘ | |
149-
| year | ✘ | |
150-
| month | ✘ | |
151-
| day | ✘ | |
152-
| dayOfWeek | ✘ | |
153-
| dayOfYear | ✘ | |
154-
| hours | ✘ | |
155-
| minutes | ✘ | |
156-
| seconds | ✘ | |
157-
| toISO8601 | ✘ | |
158-
| toEpochTime | ✘ | |
140+
| now | ✘ | ✘ | |
141+
| time | ✘ | ✘ | |
142+
| epochTime | ✘ | ✘ | |
143+
| ISO8601 | ✘ | ✘ | |
144+
| inTimezone | ✘ | ✘ | |
145+
| timezone | ✘ | ✘ | |
146+
| during | ✘ | ✘ | |
147+
| date | ✘ | ✘ | |
148+
| timeOfDay | ✘ | ✘ | |
149+
| year | ✘ | ✘ | |
150+
| month | ✘ | ✘ | |
151+
| day | ✘ | ✘ | |
152+
| dayOfWeek | ✘ | ✘ | |
153+
| dayOfYear | ✘ | ✘ | |
154+
| hours | ✘ | ✘ | |
155+
| minutes | ✘ | ✘ | |
156+
| seconds | ✘ | ✘ | |
157+
| toISO8601 | ✘ | ✘ | |
158+
| toEpochTime | ✘ | ✘ | |
159159
| | | |
160160
| **Control structures**
161-
| array | ✘ | |
162-
| hashMap | ✘ | |
163-
| args | ✘ | |
164-
| binary | ✘ | |
165-
| do | ✘ | |
166-
| branch | ✘ | |
167-
| forEach | ✘ | |
168-
| range | ✘ | |
169-
| error | ✘ | |
170-
| default | ✘ | |
171-
| expr | ✘ | |
172-
| js | ✘ | |
173-
| coerceTo | ✘ | |
174-
| typeOf | ✘ | |
175-
| info | ✘ | |
176-
| json | ✘ | |
177-
| "toJsonString, toJSON" | ✘ | |
178-
| http | ✘ | |
179-
| uuid | ✘ | |
180-
| Geospatial commands | ✘ | |
181-
| circle | ✘ | |
182-
| distance | ✘ | |
183-
| fill | ✘ | |
184-
| geojson | ✘ | |
185-
| toGeojson | ✘ | |
186-
| getIntersecting | ✘ | |
187-
| getNearest | ✘ | |
188-
| includes | ✘ | |
189-
| intersects | ✘ | |
190-
| line | ✘ | |
191-
| point | ✘ | |
192-
| polygon | ✘ | |
193-
| polygonSub | ✘ | |
161+
| array | ✘ | ✘ | |
162+
| hashMap | ✘ | ✘ | |
163+
| args | ✘ | ✘ | |
164+
| binary | ✘ | ✘ | |
165+
| do | ✘ | ✘ | |
166+
| branch | ✘ | ✘ | |
167+
| forEach | ✘ | ✘ | |
168+
| range | ✘ | ✘ | |
169+
| error | ✘ | ✘ | |
170+
| default | ✘ | ✘ | |
171+
| expr | ✘ | ✘ | |
172+
| js | ✘ | ✘ | |
173+
| coerceTo | ✘ | ✘ | |
174+
| typeOf | ✘ | ✘ | |
175+
| info | ✘ | ✘ | |
176+
| json | ✘ | ✘ | |
177+
| "toJsonString, toJSON" | ✘ | ✘ | |
178+
| http | ✘ | ✘ | |
179+
| uuid | ✘ | ✘ | |
180+
| Geospatial commands | ✘ | ✘ | |
181+
| circle | ✘ | ✘ | |
182+
| distance | ✘ | ✘ | |
183+
| fill | ✘ | ✘ | |
184+
| geojson | ✘ | ✘ | |
185+
| toGeojson | ✘ | ✘ | |
186+
| getIntersecting | ✘ | ✘ | |
187+
| getNearest | ✘ | ✘ | |
188+
| includes | ✘ | ✘ | |
189+
| intersects | ✘ | ✘ | |
190+
| line | ✘ | ✘ | |
191+
| point | ✘ | ✘ | |
192+
| polygon | ✘ | ✘ | |
193+
| polygonSub | ✘ | ✘ | |
194194
| | | |
195195
| **Administration**
196-
| grant | ✘ | |
197-
| config | ✘ | |
198-
| rebalance | ✘ | |
199-
| reconfigure | ✘ | |
200-
| status | ✘ | |
201-
| wait | ✘ | |
196+
| grant | ✘ | ✘ | |
197+
| config | ✘ | ✘ | |
198+
| rebalance | ✘ | ✘ | |
199+
| reconfigure | ✘ | ✘ | |
200+
| status | ✘ | ✘ | |
201+
| wait | ✘ | ✘ | |

‎src/Query/AbstractQuery.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
namespace TBolier\RethinkQL\Query;
55

66
use TBolier\RethinkQL\Message\MessageInterface;
7-
use TBolier\RethinkQL\Response\Cursor;
8-
use TBolier\RethinkQL\Response\ResponseInterface;
97
use TBolier\RethinkQL\RethinkInterface;
108

119
abstract class AbstractQuery implements QueryInterface

‎src/Query/Aggregation/AbstractAggregation.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
declare(strict_types = 1);
3+
4+
namespace TBolier\RethinkQL\Query\Aggregation;
5+
6+
use TBolier\RethinkQL\Query\AbstractQuery;
7+
8+
abstract class AbstractAggregation extends AbstractQuery implements AggregationInterface
9+
{
10+
}

0 commit comments

Comments
 (0)