@bestapps/microservice-entity - npm Package Compare versions

Comparing version 1.0.34 to 1.0.35

Changelog.md

@@ -0,1 +1,4 @@
+### Version 1.0.35
+Added BETWEEN
+
 ### Version 1.0.34
@@ -2,0 +5,0 @@ Added HAVING

dist/model/entity/EntityBaseSQLModel.js

@@ -64,5 +64,12 @@ "use strict";
                 else if (typeof where.key !== 'object') {
-                    let signChanged = prepareValue(me, where, sign);
-                    let name = `${me.escapeField(where.key)} ${equal} ${signChanged}`;
-                    names.push(name);
+                    if (where.equal && where.equal.toLowerCase() === 'between') {
+                        let name = `${me.escapeField(where.key)} ${equal} ? AND ?`;
+                        values = values.concat(where.value);
+                        names.push(name);
+                    }
+                    else {
+                        let signChanged = prepareValue(me, where, sign);
+                        let name = `${me.escapeField(where.key)} ${equal} ${signChanged}`;
+                        names.push(name);
+                    }
                 }
@@ -72,3 +79,2 @@ else {
                     name = `${prepareKey(me, where)} ${name}`;
-                    //values.push(where.value);
                     let signChanged = prepareValue(me, where, sign);
@@ -75,0 +81,0 @@ name = `${name} ${signChanged}`;

package.json

@@ -14,3 +14,3 @@ {
     "main": "dist/index.js",
-    "version": "1.0.34",
+    "version": "1.0.35",
     "dependencies": {
@@ -17,0 +17,0 @@ "@bestapps/raks-sql": "1.0.15",

src/model/entity/EntityBaseSQLModel.ts

@@ -68,9 +68,14 @@ import EntityModel from "./EntityModel";
                 } else if (typeof where.key !== 'object') {
-                    let signChanged = prepareValue(me, where, sign);
-                    let name = `${me.escapeField(where.key)} ${equal} ${signChanged}`;
-                    names.push(name);
+                    if (where.equal && where.equal.toLowerCase() === 'between') {
+                        let name = `${me.escapeField(where.key)} ${equal} ? AND ?`;
+                        values = values.concat(where.value);
+                        names.push(name);
+                    } else {
+                        let signChanged = prepareValue(me, where, sign);
+                        let name = `${me.escapeField(where.key)} ${equal} ${signChanged}`;
+                        names.push(name);
+                    }
                 } else {
                     let name = `${equal}`;
                     name = `${prepareKey(me, where)} ${name}`;
-                    //values.push(where.value);
                     let signChanged = prepareValue(me, where, sign);
@@ -77,0 +82,0 @@ name = `${name} ${signChanged}`;

test/tests/where.test.ts

@@ -75,4 +75,7 @@ import mainModel from "../model/MainModel";
 
-async function check(where: IEntityItemsWhere | IEntityItemsWhere[], limit: number) {
+async function check(where: IEntityItemsWhere | IEntityItemsWhere[], limit: number, isSpecial = false) {
     let res = await mainModel.getItemsAsync({where});
+    if(isSpecial){
+        console.log(res);
+    }
     expect(res.length).toBe(limit);
@@ -229,2 +232,17 @@ return res;
 
+    it('Between ? and ?', async () => {
+        await testWhereHelper.prepare();
+        await createList({some: {limit: 1, value: 1}});
+        await createList({some: {limit: 1, value: 2}});
+        await createList({some: {limit: 1, value: 3}});
+        let where = [
+            {
+                key: 'some',
+                equal: 'between',
+                value: [2, 3],
+            }
+        ];
+        await check(where, 2);
+    });
+
     it('LEFT JOIN with Key = Value', async () => {
@@ -231,0 +249,0 @@ await testWhereHelper.prepare();

No alert changes

Improved metrics

Total package byte prevSize

327550

increased by0.43%

Lines of code

6095

increased by0.46%

No dependency changes