[fix] fix case with order: sequelize.literal(), closes #2838

changelog.md

+# Next
+- [BUG] Fixed issue with `order: sequelize.literal('string')`
+
 # 2.0.0-rc6
 - [BUG] Fixed issue with including by association reference and where
 

lib/dialects/abstract/query-generator.js

@@ -1231,7 +1231,7 @@ module.exports = (function() {
             mainQueryOrder.push(this.quote(t, model));
           }.bind(this));
         } else {
-          mainQueryOrder.push(options.order);
+          mainQueryOrder.push(this.quote(options.order, model));
         }
 
         if (mainQueryOrder.length) {

test/model/findAll/order.test.js

+'use strict';
+
+var chai = require('chai')
+  , Sequelize = require('../../../index')
+  , expect = chai.expect
+  , Support = require(__dirname + '/../../support')
+  , DataTypes = require(__dirname + '/../../../lib/data-types')
+  , dialect = Support.getTestDialect()
+  , config = require(__dirname + '/../../config/config')
+  , datetime = require('chai-datetime')
+  , _ = require('lodash')
+  , moment = require('moment')
+  , async = require('async')
+  , current = Support.sequelize;
+
+chai.use(datetime);
+chai.config.includeStack = true;
+
+describe(Support.getTestDialectTeaser('Model'), function() {
+  describe('findAll', function () {
+    describe('order', function () {
+      describe('Sequelize.literal()', function () {
+        beforeEach(function () {
+          this.User = this.sequelize.define('User', {
+            email: DataTypes.STRING
+          });
+
+          return this.User.sync({force: true}).bind(this).then(function () {
+            return this.User.create({
+              email: 'test@sequelizejs.com'
+            });
+          });
+        });
+
+        it('should work with order: literal()', function () {
+          return this.User.findAll({
+            order: this.sequelize.literal('email IS NOT NULL') 
+          }).then(function (users) {
+            expect(users.length).to.equal(1);
+            users.forEach(function (user) {
+              expect(user.get('email')).to.be.ok;
+            });
+          });
+        });
+
+        it('should work with order: [literal()]', function () {
+          return this.User.findAll({
+            order: [this.sequelize.literal('email IS NOT NULL')]
+          }).then(function (users) {
+            expect(users.length).to.equal(1);
+            users.forEach(function (user) {
+              expect(user.get('email')).to.be.ok;
+            });
+          });
+        });
+
+        it('should work with order: [[literal()]]', function () {
+          return this.User.findAll({
+            order: [
+              [this.sequelize.literal('email IS NOT NULL')]
+            ]
+          }).then(function (users) {
+            expect(users.length).to.equal(1);
+            users.forEach(function (user) {
+              expect(user.get('email')).to.be.ok;
+            });
+          });
+        });
+      });
+    });
+  });
+});
\ No newline at end of file