ee-orm - npm Package Compare versions

Comparing version 0.2.7 to 0.2.8

lib/DefaultModel.js

@@ -85,3 +85,3 @@ !function(){
 					}
-					else throw new Error('Cannot add «'+name+'» model to «'+this.getEntityName()+'» model! there is no relation between the thwo models!');					
+					else throw new Error('Cannot add «'+name+'» model to «'+this.getEntityName()+'» model! there is no relation between the two models!');					
 				}
@@ -92,3 +92,2 @@ else if (type.array(item)) {
 							var name = obj.getEntityName();
-
 							if (!type.undefined(this[name])){
@@ -103,3 +102,3 @@ if (type.boolean(this[name].isMapping)){
 							}
-							else throw new Error('Cannot add «'+name+'» model to «'+this.getEntityName()+'» model! there is no relation between the thwo models!');	
+							else throw new Error('Cannot add «'+name+'» model to «'+this.getEntityName()+'» model! there is no relation between the two models!');	
 						}
@@ -106,0 +105,0 @@ else throw new Error('Expected a Query or a Model for the key «'+property+'»!');

lib/ORM.js

@@ -9,3 +9,3 @@ !function(){
 		, async 		= require('ee-async')
-		, DBCluster 	= require('ee-db-cluster'); //*/require('../../ee-db-cluster');
+		, DBCluster 	= /*require('ee-db-cluster'); //*/require('../../ee-db-cluster');
 
@@ -12,0 +12,0 @@

lib/QueryBuilder.js

@@ -70,2 +70,4 @@ !function(){
 				}));
+
+				this._addPrimarySelect();
 			}
@@ -431,4 +433,2 @@
 		, find: function(callback) {
-			this._addPrimarySelect();
-
 			new QueryCompiler({
@@ -443,4 +443,2 @@ orm 				: this._orm
 		, findOne: function(callback) {
-			this._addPrimarySelect();
-
 			new QueryCompiler({
@@ -447,0 +445,0 @@ orm 				: this._orm

lib/Resource.js

@@ -142,2 +142,6 @@ !function(){
 			q.filter[this.name][this.primaryKeys[0]] = ORM.in(this.set.getColumnValues(this.primaryKeys[0]));
+			q.group.push({
+				  table 	: this.name
+				, column 	: this.primaryKeys[0]
+			});
 		}
@@ -144,0 +148,0 @@

package.json

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

test.js

@@ -26,3 +26,3 @@
 
-			new orm.eventbooster.resource({
+			/*new orm.eventbooster.resource({
 				key: 'email.test.1'+Math.random()
@@ -39,7 +39,6 @@ , id_tenant: 0
 			}).save(function(err, resource){ log(err);
-				resource.language.push(orm.eventbooster.language({code:'it'}));
-				resource.save(function(err){
-					log(err, resource);
-				});				
-			});
+							
+			});*/
+
+			orm.eventbooster.resource(['*']).getResourceLocale(['*']).find(log)
 return;
@@ -46,0 +45,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

105073

No dependency changes