Merge pull request #24 from webcc/fixes

hot Fixes
webcc · May 12, 2017 · d04e2f7 · d04e2f7
2 parents 2890a4c + 8c20931
commit d04e2f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/lib/CriteriaQuery.js b/lib/CriteriaQuery.js
@@ -36,7 +36,7 @@ module.exports = class CriteriaQuery {
         if(typeof orderBy !== "undefined")
         {
             //ORDER BY ( clustering_column ( ASC | DESC )...)
-            orderByQ = "ORDER BY "
+            orderByQ = "ORDER BY " + orderBy + " ASC "; //FIXME
         }
         if(typeof allowFiltering !== "undefined" && allowFiltering === true)
         {

diff --git a/lib/EntityManager.js b/lib/EntityManager.js
@@ -26,29 +26,24 @@ module.exports = class EntityManager {
     getCriteriaBuilder(metaModel)
     {
         this.metaModel = metaModel || this.metaModel;
-        if (!this.criteriaBuilder)
-        {
-            this.criteriaBuilder = new CriteriaBuilder(this.metaModel);
-        }
+        this.criteriaBuilder = new CriteriaBuilder(this.metaModel);
         return this.criteriaBuilder;
     }
 
     getCriteriaQuery(metaModel)
     {
         this.metaModel = metaModel || this.metaModel;
-        if (!this.criteriaQuery)
-        {
-            this.criteriaQuery = this.getCriteriaBuilder(this.metaModel).createQuery(this.metaModel);
-        }
+        this.criteriaQuery = this.getCriteriaBuilder(this.metaModel).createQuery(this.metaModel);
         return this.criteriaQuery;
     }
 
     persist(entity, callback, metaModel)
     {
         this.metaModel = metaModel || this.metaModel;
         let row = this.metaModel.toRow(entity);
-        row.id = row.id.toString();
-        const queryObject = this.getCriteriaQuery().insert(row);
+        if(row.id)
+            row.id = row.id.toString();
+        const queryObject = this.getCriteriaQuery(this.metaModel).insert(row);
         return this.query(queryObject, callback);
     }
 
@@ -59,7 +54,7 @@ module.exports = class EntityManager {
         async.each(entities, function (entity, cb)
         {
             let row = self.metaModel.toRow(entity);
-            const queryObject = self.getCriteriaQuery().insert(row);
+            const queryObject = self.getCriteriaQuery(this.metaModel).insert(row);
             return self.query(queryObject, cb);
         }, function (err)
         {
@@ -73,8 +68,8 @@ module.exports = class EntityManager {
         let queryObjects = [];
         entities.forEach((entity)=>
         {
-            let row = this.metaModel.toRow(entity);
-            let q = this.getCriteriaQuery().insertOrUpdate(row);
+            let row = this.metaModel.toRow(entity, metaModel);
+            let q = this.getCriteriaQuery(this.metaModel).insertOrUpdate(row);
             queryObjects.push(q);
         });
         this.queryBatch(queryObjects, callback);
@@ -84,22 +79,22 @@ module.exports = class EntityManager {
     {
         this.metaModel = metaModel || this.metaModel;
         let row = this.metaModel.toRow(entity);
-        const queryObject = this.getCriteriaQuery().update(row, criteriaQuery);
+        const queryObject = this.getCriteriaQuery(this.metaModel).update(row, criteriaQuery);
         return this.query(queryObject, callback);
     }
 
     removeByCriteria(callback, criteriaQuery, metaModel)
     {
         this.metaModel = metaModel || this.metaModel;
-        const queryObject = this.getCriteriaQuery().remove(criteriaQuery);
+        const queryObject = this.getCriteriaQuery(this.metaModel).remove(criteriaQuery);
         return this.query(queryObject, callback);
     }
 
     findOne(callback, criteriaQuery, metaModel)
     {
         this.metaModel = metaModel || this.metaModel;
         const queryObject = {
-            query: this.getCriteriaQuery().from(criteriaQuery),
+            query: this.getCriteriaQuery(this.metaModel).from(criteriaQuery),
             params: null
         };
         return this.findOneByQueryObject(queryObject, this.metaModel, callback);
@@ -109,7 +104,7 @@ module.exports = class EntityManager {
     {
         this.metaModel = metaModel || this.metaModel;
         const queryObject = {
-            query: this.getCriteriaQuery().from(criteriaQuery),
+            query: this.getCriteriaQuery(this.metaModel).from(criteriaQuery),
             params: null
         };
         return this.findAllByQueryObject(queryObject, this.metaModel, callback);
@@ -173,7 +168,7 @@ module.exports = class EntityManager {
     {
         this.metaModel = metaModel || this.metaModel;
         let self = this;
-        let query = this.getCriteriaQuery().truncate();
+        let query = this.getCriteriaQuery(this.metaModel).truncate();
         this.client.execute(query, null, this.client.options.queryOptions,
             function (error, result)
             {
@@ -285,7 +280,7 @@ module.exports = class EntityManager {
         this.metaModel = metaModel || this.metaModel;
         let self = this;
         let queryObject = {
-            query: this.getCriteriaQuery().create(),
+            query: this.getCriteriaQuery(this.metaModel).create(),
             params: []
         };
         this.query(queryObject, function (error, result)
@@ -306,7 +301,7 @@ module.exports = class EntityManager {
         this.metaModel.secondaryIndexes.forEach((field) =>
         {
             let queryObject = {
-                query: this.getCriteriaQuery().insertIndex(field),
+                query: this.getCriteriaQuery(this.metaModel).insertIndex(field),
                 params: []
             };
             indexQueries.push(queryObject);
@@ -330,7 +325,7 @@ module.exports = class EntityManager {
         this.metaModel.secondaryIndexes.forEach((field) =>
         {
             let queryObject = {
-                query: this.getCriteriaQuery().dropIndex(field),
+                query: this.getCriteriaQuery(this.metaModel).dropIndex(field),
                 params: []
             };
             indexQueries.push(queryObject);
@@ -348,7 +343,7 @@ module.exports = class EntityManager {
     {
         this.metaModel = metaModel || this.metaModel;
         let queryObject = {
-            query: this.getCriteriaQuery().drop(),
+            query: this.getCriteriaQuery(this.metaModel).drop(),
             params: []
         };
         this.query(queryObject, function (error, result)