fixes Vincit#1126

koskimas · koskimas · commit c0bbaa1057fa · 2018-10-24T12:31:58.000+03:00
diff --git a/lib/model/modelValidate.js b/lib/model/modelValidate.js
@@ -1,5 +1,4 @@
 const clone = require('./modelClone').clone;
-const { defineNonEnumerableProperty } = require('./modelUtils');
 
 function validate(model, json, options = {}) {
   json = json || model;
diff --git a/lib/queryBuilder/QueryBuilder.js b/lib/queryBuilder/QueryBuilder.js
@@ -3,7 +3,7 @@ const Bluebird = require('bluebird');
 const { raw } = require('./RawBuilder');
 const { createModifier } = require('../utils/createModifier');
 const { Type: ValidationErrorType } = require('../model/ValidationError');
-const { isObject, isString, isFunction, last, upperFirst } = require('../utils/objectUtils');
+const { isObject, isString, isFunction, last } = require('../utils/objectUtils');
 const { RelationExpression, DuplicateRelationError } = require('./RelationExpression');
 
 const QueryBuilderContext = require('./QueryBuilderContext');
diff --git a/lib/queryBuilder/RawBuilder.js b/lib/queryBuilder/RawBuilder.js
@@ -3,7 +3,7 @@ const { buildArg } = require('../utils/buildUtils');
 
 class RawBuilder {
   constructor(sql, args) {
-    this._sql = sql;
+    this._sql = `${sql}`;
     this._args = args;
   }
 
diff --git a/tests/integration/find.js b/tests/integration/find.js
@@ -320,6 +320,17 @@ module.exports = session => {
             });
         });
 
+        it('raw should accept non-string values', () => {
+          return Model2.query()
+            .where(
+              'model2_prop2',
+              raw(20)
+            )
+            .then(models => {
+              expect(_.map(models, 'model2Prop2').sort()).to.eql([20]);
+            });
+        });
+
         it('.where() with objection.raw and a subquery builder in an object', () => {
           return Model2.query()
             .where(

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const clone = require('./modelClone').clone;`
`2`		`-const { defineNonEnumerableProperty } = require('./modelUtils');`
`3`	`2`
`4`	`3`	`function validate(model, json, options = {}) {`
`5`	`4`	`json = json \|\| model;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ const { buildArg } = require('../utils/buildUtils');`
`3`	`3`
`4`	`4`	`class RawBuilder {`
`5`	`5`	`constructor(sql, args) {`
`6`		`- this._sql = sql;`
	`6`	+ this._sql = `${sql}`;
`7`	`7`	`this._args = args;`
`8`	`8`	`}`
`9`	`9`