Skip to content

fix: added missing 'ORDER BY' before 'OFFSET' II #220

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
merged 2 commits into from
Jan 22, 2020
Merged

fix: added missing 'ORDER BY' before 'OFFSET' II #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499c1bb
add missing 'ORDER BY' before 'OFFSET'
achrinza Nov 27, 2019
3f21d1d
add tests for limit&limit with supportsOffsetFetch
frbuceta Jan 19, 2020
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
2 changes: 1 addition & 1 deletion lib/mssql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ function buildLimit(limit, offset) {
if (isNaN(offset)) {
offset = 0;
}
let sql = 'OFFSET ' + offset + ' ROWS';
let sql = 'ORDER BY RowNum OFFSET ' + offset + ' ROWS';
if (limit >= 0) {
sql += ' FETCH NEXT ' + limit + ' ROWS ONLY';
}
Expand Down
33 changes: 32 additions & 1 deletion test/mssql.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@
require('./init');

const should = require('should');
let Post, PostWithUUID, PostWithStringId, db;
let User, Post, PostWithUUID, PostWithStringId, db, dbOSF;

describe('mssql connector', function() {
before(function() {
/* global getDataSource */
db = getDataSource();
dbOSF = getDataSource({
supportsOffSetFetch: true,
});

User = dbOSF.define('User', {
id: {type: Number, generated: true, id: true},
name: String,
age: Number,
});

Post = db.define('PostWithBoolean', {
title: {type: String, length: 255, index: true},
Expand Down Expand Up @@ -242,6 +251,28 @@ describe('mssql connector', function() {
);
});

it('should support limit', function(done) {
Post.find({
limit: 3,
}, (err, result) => {
should.not.exist(err);
should.exist(result);
result.should.have.length(3);
done();
});
});

it('should support limit with \'supportsOffsetFetch\'', function(done) {
User.find({
limit: 3,
}, (err, result) => {
should.not.exist(err);
should.exist(result);
result.should.have.length(3);
done();
});
});

context('regexp operator', function() {
beforeEach(function deleteExistingTestFixtures(done) {
Post.destroyAll(done);
Expand Down