ee-orm - npm Package Compare versions

Comparing version 0.3.34 to 0.3.35

lib/Query.js

@@ -19,2 +19,3 @@ !function(){
             this.group          = options.group || [];
+            this.order          = options.order || [];
         }
@@ -21,0 +22,0 @@

lib/QueryCompiler.js

@@ -192,3 +192,7 @@ !function(){
                     if (debug) log.info('preparing childResource for ordering «'+childResource.name.yellow+'», selected: '+((!!childResource.selected)+'').yellow+', hasRootFilter: '+((!!childResource.hasRootFilter)+'').yellow+', filtered: '+((!!childResource.filtered)+'').yellow+'');
-                    if (childResource.isRootOrdered) childResource.rootOrder();
+                    if (childResource.isRootOrdered) {
+                        // go up the tree and left join all required tables
+                        this._orderByChildren(resource);
+                        childResource.rootOrder();
+                    }
 
@@ -201,3 +205,10 @@ this._preparechildResourceForOrdering(childResource);
 
+        , _orderByChildren: function(resource) {
+            if (resource.parentResource) {
+                resource.joinRoot(true);
+                this._orderByChildren(resource.parentResource);
+            }
+        }
 
+
         , _filterByChildren: function(resource, joins, filter, resourceName) {
@@ -204,0 +215,0 @@ if (!resource.selected) {

lib/Resource.js

@@ -165,2 +165,14 @@ !function(){
 
+        , joinRoot: function(leftJoin) {
+             this.joins.reverse().forEach(function(joinStatement, index){
+                if (!joinStatement.used) {
+                    joinStatement.used = true;
+                    this.rootResource.query.join.push(joinStatement.reverseFormat(this.id, (index > 0 ? this.id: this.parentResource.id), leftJoin));
+                }
+            }.bind(this));
+        }
+
+
+
+
         , selectReferencedColumn: function(columnName) {
@@ -167,0 +179,0 @@ this.query.select.push(columnName);

package.json

 {
       "name"                        : "ee-orm"
     , "description"                 : "An easy to use ORM for node.js. Supports eager loading, complex queries, joins, transactions, complex database clusters & connection pooling."
-    , "version"                     : "0.3.34"
+    , "version"                     : "0.3.35"
     , "homepage"                    : "https://github.com/eventEmitter/ee-orm"
@@ -6,0 +6,0 @@ , "author"                      : "Michael van der Weg <[e-mail]> (http://eventemitter.com/)"

test.js

@@ -28,8 +28,3 @@
 
-			var query = db.event(['*']);
-				query.getVenue(['*']);
-				query.getVenue(['*'], {id: ORM.or([1,2,3,4])});
-				query.getVenue(['*'], {name: ORM.like('Da%')});
-
-				query.find(cb);
+			db.event(['*']).getVenue(['*']).orderRoot('id').find(cb);
 			return;
@@ -36,0 +31,0 @@

test/postgres.js

@@ -517,2 +517,6 @@
 			});
+
+			it('should order the rootquery using a child resource', function(done) {
+				db.event(['*']).getVenue(['*']).orderRoot('id').find(expect('[{"id":3,"venue":{"id":1,"name":"Dachstock Reitschule"},"title":"Mapping Test","startdate":"1970-01-01T00:00:00.000Z","enddate":null,"canceled":true},{"id":4,"venue":{"id":1,"name":"Dachstock Reitschule"},"title":"Changed title","startdate":"1970-01-01T00:00:00.000Z","enddate":"2014-05-13T16:53:20.000Z","canceled":null},{"id":1,"venue":{"id":2,"name":"Dachstock Reitschule"},"title":"Changed title","startdate":"1970-01-01T00:00:00.000Z","enddate":null,"canceled":null},{"id":2,"venue":{"id":2,"name":"Dachstock Reitschule"},"title":"Mapping Test","startdate":"1970-01-01T00:00:00.000Z","enddate":null,"canceled":null}]', done));
+			});
 		});
@@ -519,0 +523,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

187779

increased by0.82%

Lines of code

3504

increased by0.57%

No dependency changes