ee-orm - npm Package Compare versions

Comparing version 0.13.1 to 0.14.0

lib/Model.js

		@@ -170,2 +170,6 @@ !function(){
		// write it directly to the model object
		if (this._serialize && this._serialize.indexOf(property) !== -1) {
		// store as serializable value
		this[property] = item;
		}
		if (!this._defintion.columns[property]) {
		@@ -393,16 +397,6 @@ if (!this._serialize) this._serialize = [];
		else if (index++ === listeners.length) callback(null, (endNow \|\| dontResume));
		else if (index > listeners.length) throw new Error('The related ORM extension event listener for the event «'+event+'» fired twice!');
		else {

		// this cheecks if a callback is calledd twice
		var callbackCheck = function(innerErr, innerEndNow) {
		if (!callbackCheck.callCounter) callbackCheck.callCounter = 1;
		else throw new Error('The related ORM extension event listener for the event «'+event+'» fired twice!');
		callNext(innerErr, innerEndNow);
		};

		var innerArgs = args.slice();
		innerArgs.push(callbackCheck);

		if (endNow) dontResume = true;
		listeners[index-1].apply(null, innerArgs);
		listeners[index-1].apply(null, args);
		}
		@@ -420,3 +414,3 @@ }.bind(this);
		// add my own callback
		//args.push(callNext);
		args.push(callNext);

		@@ -423,0 +417,0 @@ // aaand go!

lib/QueryBuilder.js

		@@ -565,3 +565,11 @@ !function(){
		select.forEach(function(item) {
		query.select.push(item);
		if (item === '*') {
		Object.keys(this._getDatabase()[tableName].getDefinition().columns).forEach(function(columnName) {
		if (query.select.indexOf(columnName) === -1) query.select.push(columnName);
		}.bind(this));

		// all fields should be selected, extensions needd to know this
		query.select.selectAll = true;
		}
		else query.select.push(item);
		}.bind(this));
		@@ -568,0 +576,0 @@ }

package.json

		{
		"name" : "ee-orm"
		, "description" : "ORM for postgres and mysql. Loads and saves referenced entites, executes complex queries, supports joins, transactions, complex database clusters, connection pooling and much more. No conventions. MIT Licence"
		, "version" : "0.13.1"
		, "version" : "0.14.0"
		, "homepage" : "https://github.com/eventEmitter/ee-orm"
		@@ -6,0 +6,0 @@ , "author" : "Michael van der Weg <michael@eventemitter.com> (http://eventemitter.com/)"

New alerts