Comparison operator support

lib/convertor.js

@@ -252,9 +252,11 @@ class MongoToKnex {
                             if (negateGroup) {
                                 statementOp = compOps.$in;
                             } else {
-                                statementOp = isNegationOp(statement.operator)
-                                    ? compOps.$nin
-                                    : compOps.$in;
+                                if (isNegationOp(statement.operator)) {
+                                    statementOp = compOps.$nin;
+                                } else {
+                                    statementOp = compOps[statement.operator];
+                                }
                             }
                             const statementValue = !_.isArray(statement.value) ? [statement.value] : statement.value;
 

test/integration/relations.test.js

@@ -112,6 +112,64 @@ describe('Relations', function () {
             });
         });
 
+        describe('COMPARISONS $gt / $gte / $lt / $lte', function () {
+            it('tags.created_at is > 2015-06-21', function () {
+                const mongoJSON = {'tags.created_at': {
+                    $gt: '2015-06-21'
+                }};
+
+                const query = makeQuery(mongoJSON);
+
+                return query
+                    .then((result) => {
+                        result.length.should.eql(1);
+                        result.should.matchIds([8]);
+                    });
+            });
+
+            it('tags.created_at is >= 2015-06-21', function () {
+                const mongoJSON = {'tags.created_at': {
+                    $gte: '2015-06-21'
+                }};
+
+                const query = makeQuery(mongoJSON);
+
+                return query
+                    .then((result) => {
+                        result.length.should.eql(2);
+                        result.should.matchIds([3, 8]);
+                    });
+            });
+
+            it('tags.created_at is < 2015-01-02', function () {
+                const mongoJSON = {'tags.created_at': {
+                    $lt: '2015-01-02'
+                }};
+
+                const query = makeQuery(mongoJSON);
+
+                return query
+                    .then((result) => {
+                        result.length.should.eql(4);
+                        result.should.matchIds([1, 4, 5, 6]);
+                    });
+            });
+
+            it('tags.created_at is <= 2015-01-02', function () {
+                const mongoJSON = {'tags.created_at': {
+                    $lte: '2015-01-02'
+                }};
+
+                const query = makeQuery(mongoJSON);
+
+                return query
+                    .then((result) => {
+                        result.length.should.eql(5);
+                        result.should.matchIds([1, 2, 4, 5, 6]);
+                    });
+            });
+        });
+
         describe('AND $and', function () {
             it('tags.slug is animal and classic', function () {
                 const mongoJSON = {
@@ -248,7 +306,7 @@ describe('Relations', function () {
                 };
 
                 const query = makeQuery(mongoJSON);
-
+                console.log(query.toSQL());
                 return query
                     .select()
                     .then((result) => {

test/integration/suite1/fixtures/base.json

@@ -95,25 +95,29 @@
             "id": 1,
             "name": "Classic",
             "slug": "classic",
-            "visibility": "public"
+            "visibility": "public",
+            "created_at": "2015-01-01"
         },
         {
             "id": 2,
             "name": "Animal",
             "slug": "animal",
-            "visibility": "public"
+            "visibility": "public",
+            "created_at": "2015-01-02"
         },
         {
             "id": 3,
             "name": "CGI",
             "slug": "cgi",
-            "visibility": "public"
+            "visibility": "public",
+            "created_at": "2015-06-21"
         },
         {
             "id": 4,
             "name": "#internal",
             "slug": "hash-internal",
-            "visibility": "internal"
+            "visibility": "internal",
+            "created_at": "2015-06-22"
         }
     ]
 }

test/integration/suite1/schema.js

@@ -23,6 +23,7 @@ module.exports.up = function (knex) {
             table.string('name', 191);
             table.string('slug', 191);
             table.string('visibility', 191).defaultTo('public');
+            table.dateTime('created_at');
         }))
         .then(() => knex.schema.createTable('posts_tags', (table) => {
             table.increments('id').primary();