ee-orm - npm Package Compare versions

Comparing version 0.2.10 to 0.2.11

lib/Model.js

@@ -355,3 +355,4 @@ !function(){
 
-			// generic accessor method for belongTo
+
+			// generic accessor method for reference
 			properties.getReference = {
@@ -365,5 +366,6 @@ value: function(referenceName){
 			};
+
 			properties.setReference = {
 				value: function(referenceName, newReferenceModel, existing){
-					if (referenceMap[referenceName]) {
+					if (referenceMap[referenceName]) {log.wtf(this._references[referenceName] !== newReferenceModel);
 						if (!existing && this._references[referenceName] !== newReferenceModel) {
@@ -370,0 +372,0 @@ this._changedReferences.push(referenceName);

lib/QueryCompiler.js

@@ -104,3 +104,3 @@ !function(){
 
-		, _buildRelations: function(resource) {
+		, _buildRelations: function(resource) { log.error(resource.hasChildren(), resource.query.from);
 			if (resource.set && resource.hasChildren()) {
@@ -112,5 +112,8 @@ resource.children.forEach(function(childResource){
 
-							record._mappingIds.forEach(function(mappingId){
-								var parentRecord = resource.set.getByColumnValue('_primary', mappingId);
+							//log(childResource);
 
+							record._mappingIds.forEach(function(mappingId){ log(mappingId);
+								var parentRecord = resource.set.getByColumnValue(childResource.referencedParentColumn, mappingId);
+
+
 								if (parentRecord) {
@@ -128,4 +131,4 @@ //log(childResource.loaderId);
 										// reference
-										parentRecord.setReference(childResource.loaderId, record, true);
-										//parentRecord[childResource.name] = record;
+										//parentRecord.setReference(childResource.loaderId, record, true);
+										parentRecord[childResource.name] = record;
 									}
@@ -132,0 +135,0 @@ }

lib/Resource.js

@@ -87,4 +87,4 @@ !function(){
 				// add parent reference to selects
-				if (this.referencedParentColumn) {
-					this.defaultSelect.push(ORM.alias('____id____', this.referencedParentTable, this.parentResource.primaryKeys[0]));
+				if (this.referencedParentColumn) { 
+					this.defaultSelect.push(ORM.alias('____id____', this.referencedParentTable, this.referencedParentColumn));
 
@@ -142,6 +142,7 @@ this.parentResource.selectReferencedColumn(this.referencedParentColumn);
 			if (!q.filter[this.name]) q.filter[this.name] = {};
-			q.filter[this.name][this.primaryKeys[0]] = ORM.in(this.set.getColumnValues(this.primaryKeys[0]));
+			q.filter[this.name][resource.referencedParentColumn] = ORM.in(this.set.getColumnValues(resource.referencedParentColumn));
+
 			q.group.push({
 				  table 	: this.name
-				, column 	: this.primaryKeys[0]
+				, column 	: resource.referencedParentColumn
 			});
@@ -148,0 +149,0 @@ }

lib/Set.js

@@ -63,2 +63,3 @@ !function(){
 		, getByColumnValue: function(column, value){
+			if (!this._maps[column]) this.createMap(column);
 			return this._maps[column] ? this._maps[column][value] : undefined;
@@ -65,0 +66,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.10"
+    , "version"                     : "0.2.11"
     , "homepage"                    : "https://github.com/eventEmitter/ee-orm"
@@ -6,0 +6,0 @@ , "author"                      : "Michael van der Weg <[e-mail]> (http://eventemitter.com/)"

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

105350

increased by0.26%

Lines of code

2471

increased by0.08%

No dependency changes