ee-orm - npm Package Compare versions

Comparing version 0.6.19 to 0.6.20

lib/QueryCompiler.js

		@@ -39,2 +39,3 @@ !function(){


		// rpepare the resources, apply filters & ordering to the
		@@ -52,2 +53,3 @@ // root resource, manage selects


		// collect subqueries, if there is data in the base result set
		@@ -54,0 +56,0 @@ if (resource.set.length) this._executeSubqueries(resource, this._collectQueries(resource, []), callback);

lib/Resource.js

		@@ -346,2 +346,3 @@ !function () {
		, applyFiltersToParents: function(resource, sourceResource, joins, childResource) {
		//if (!childResource) log.warn('no childResource');
		if (!childResource) childResource = sourceResource;
		@@ -356,5 +357,4 @@
		if (debug) log.debug('applying filters on %s to the parent %s ...', sourceResource.name, resource.name);
		if (debug) log.debug('applying sub-join from %s to %s ...'.cyan, sourceResource.name, resource.name);

		if (debug) log.debug('applying join on %s to %s ...'.cyan, sourceResource.name, resource.name);

		if (!joins) joins = sourceResource.joins.slice().reverse();
		@@ -380,3 +380,3 @@
		// we should not join any table twice
		if (sourceResource.subJoinApplied) {
		if (sourceResource.subJoinApplied \|\| resource.subJoinApplied) {
		this.applyFiltersToParents(resource.getParent(), sourceResource, joins, resource);
		@@ -386,3 +386,4 @@ }
		sourceResource.subJoinApplied = true;
		this.applyFiltersToParents(resource.getParent(), sourceResource, resource.joins.reverse().concat(joins), resource);
		resource.subJoinApplied = true;
		this.applyFiltersToParents(resource.getParent(), sourceResource, resource.joins.slice().reverse().concat(joins), resource);
		}
		@@ -389,0 +390,0 @@

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.6.19"
		, "version" : "0.6.20"
		, "homepage" : "https://github.com/eventEmitter/ee-orm"
		@@ -6,0 +6,0 @@ , "author" : "Michael van der Weg <michael@eventemitter.com> (http://eventemitter.com/)"

New alerts