Skip to content

Fix query options bug from Mongodb breaking change #615

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

Merged
dozoisch merged 1 commit into from
Oct 5, 2020
Merged

Fix query options bug from Mongodb breaking change #615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 9 additions & 21 deletions lib/routes/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,12 @@ var routes = function (config) {
};

exp._getQueryOptions = function (req) {
var limit = config.options.documentsPerPage;
var skip = parseInt(req.query.skip, 10) || 0;
var sort = exp._getSort(req);

var query_options = {
sort: sort,
limit: limit,
skip: skip,
return {
sort: exp._getSort(req),
limit: config.options.documentsPerPage,
skip: parseInt(req.query.skip, 10) || 0,
projection: exp._getProjection(req),
};
return query_options;
};

exp._getProjection = function (req) {
Expand All @@ -124,11 +120,9 @@ var routes = function (config) {

var query;
var query_options;
var projection;
try {
query = exp._getQuery(req, res);
query_options = exp._getQueryOptions(req);
projection = exp._getProjection(req, res);
} catch (err) {
req.session.error = err.message;
return res.redirect('back');
Expand All @@ -155,7 +149,7 @@ var routes = function (config) {
var limit = query_options.limit;
var sort = query_options.sort;

req.collection.find(query, projection, query_options).toArray(function (err, items) {
req.collection.find(query, query_options).toArray(function (err, items) {
req.collection.stats(function (err, stats) {
if (stats === undefined) {
req.session.error = 'Collection not found!';
Expand Down Expand Up @@ -301,20 +295,18 @@ var routes = function (config) {

var query;
var query_options;
var projection;

try {
query_options = {
sort: exp._getSort(req),
};
query = exp._getQuery(req, res);
projection = exp._getProjection(req, res);
} catch (err) {
req.session.error = err.message;
return res.redirect('back');
}

req.collection.find(query, projection, query_options).stream({
req.collection.find(query, query_options).stream({
transform: function (item) {
return bson.toJsonString(item) + os.EOL;
},
Expand All @@ -324,20 +316,18 @@ var routes = function (config) {
exp.exportColArray = function (req, res) {
var query;
var query_options;
var projection;

try {
query_options = {
sort: exp._getSort(req),
};
query = exp._getQuery(req, res);
projection = exp._getProjection(req, res);
} catch (err) {
req.session.error = err.message;
return res.redirect('back');
}

req.collection.find(query, projection, query_options).toArray(function (err, items) {
req.collection.find(query, query_options).toArray(function (err, items) {
res.setHeader(
'Content-Disposition',
'attachment; filename="' + encodeURI(req.collectionName) + '"; filename*=UTF-8\'\'' + encodeURI(req.collectionName)
Expand All @@ -351,20 +341,18 @@ var routes = function (config) {
exp.exportCsv = function (req, res) {
var query;
var query_options;
var projection;

try {
query_options = {
sort: exp._getSort(req),
};
query = exp._getQuery(req, res);
projection = exp._getProjection(req, res);
} catch (err) {
req.session.error = err.message;
return res.redirect('back');
}

req.collection.find(query, projection, query_options).toArray(function (err, items) {
req.collection.find(query, query_options).toArray(function (err, items) {
res.setHeader(
'Content-Disposition',
'attachment; filename="' + encodeURI(req.collectionName) + '.csv"; filename*=UTF-8\'\'' + encodeURI(req.collectionName)
Expand Down