Skip to content

Commit ef161d7

Browse files
committed
Fixed TextDB output when TextDB.paginate() without sorting.
1 parent 24d9cd4 commit ef161d7

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
0.0.65
33
========================
44

5+
- fixed TextDB output when `TextDB.paginate()` without sorting
6+
57
========================
68
0.0.64
79
========================

textdb-builder.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,21 @@ QueryBuilder.prototype.assign = function(meta) {
115115
meta.sort && self.sort(meta.sort);
116116
meta.take && self.take(meta.take);
117117
meta.skip && self.skip(meta.skip);
118+
119+
if (meta.paginate)
120+
self.$paginate = 1;
121+
118122
meta.modify && self.modify(meta.modify, meta.modifyarg);
119123
meta.filter && self.filter(meta.filter, meta.filterarg);
120124
meta.scalar && self.scalar(meta.scalar, meta.scalararg);
121125
meta.backup && self.backup(meta.backup);
122126
meta.payload && (self.payload = meta.payload);
123127
meta.log && self.log(meta.log);
124128
meta.join && self.join(meta.join);
129+
125130
if (meta.filter)
126131
self.filterid = meta.filter;
132+
127133
return self;
128134
};
129135

@@ -300,6 +306,7 @@ function filterrule() {
300306
}
301307

302308
QueryBuilder.prototype.modify = function(rule, arg) {
309+
303310
var self = this;
304311
var tmp = FUNCCACHE[rule];
305312

textdb-reader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ TextReader.prototype.compare = function(docs) {
216216
builder.counter++;
217217
builder.push(doc);
218218

219-
if (self.cancelable && !builder.$sort && builder.response.length === builder.$take) {
219+
if (self.cancelable && !builder.$sort && !builder.$paginate && builder.response.length === builder.$take) {
220220
builder.canceled = true;
221221
self.canceled++;
222222
}

textdb-wrapper.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,7 @@ DB.page = function(page, limit) {
813813
if (limit)
814814
this.options.take = limit;
815815
this.options.skip = page * this.options.take;
816+
this.options.paginate = 1;
816817
return this;
817818
};
818819

@@ -832,6 +833,7 @@ DB.paginate = function(page, limit, maxlimit) {
832833

833834
this.options.skip = page2 * limit2;
834835
this.options.take = limit2;
836+
this.options.paginate = 1;
835837
return this;
836838
};
837839

@@ -1392,7 +1394,6 @@ DB.autoquery = function(query, schema, defsort, maxlimit, localized) {
13921394
self.gridsort(defsort);
13931395

13941396
maxlimit && self.paginate(query.page, query.limit, maxlimit);
1395-
13961397
return self;
13971398
};
13981399

0 commit comments

Comments
 (0)