Feature/handle different keys in update

lib/Instance.js

@@ -14,6 +14,7 @@ function Instance(Model, opts) {
 	opts.extrachanges = [];
 	opts.associations = {};
 	opts.originalKeyValues = {};
+	opts.originalPartitionKeyValues = {};
 
 	var instance_saving = false;
 	var events = {};
@@ -35,6 +36,12 @@ function Instance(Model, opts) {
 			prop = opts.keyProperties[i];
 			opts.originalKeyValues[prop.name] = opts.data[prop.name];
 		}
+
+		for(i = 0; i < opts.partitionKeysProperties.length; i++) {
+			prop = opts.partitionKeysProperties[i];
+			opts.originalPartitionKeyValues[prop.name] = opts.data[prop.name];
+		}
+
 	};
 	var handleValidations = function (cb) {
 		var pending = [], errors = [], required;
@@ -265,10 +272,17 @@ function Instance(Model, opts) {
 			for (i = 0; i < opts.changes.length; i++) {
 				changes[opts.changes[i]] = data[opts.changes[i]];
 			}
+
 			for (i = 0; i < opts.keyProperties.length; i++) {
 				prop = opts.keyProperties[i];
 				conditions[prop.mapsTo] = opts.originalKeyValues[prop.name];
 			}
+
+			for (i = 0; i < opts.partitionKeysProperties.length; i++) {
+				prop = opts.partitionKeysProperties[i];
+				conditions[prop.mapsTo] = opts.originalPartitionKeyValues[prop.name];
+			}
+
 			changes = Utilities.transformPropertyNames(changes, Model.allProperties);
 
 			opts.driver.update(opts.table, changes, conditions, function (err) {

lib/Model.js

@@ -33,9 +33,10 @@ function Model(opts) {
 	var extend_associations    = [];
 	var association_properties = [];
 	var model_fields           = [];
-	var fieldToPropertyMap     = {};
-	var allProperties          = {};
+	var fieldToPropertyMap        = {};
+	var allProperties             = {};
 	var keyProperties          = [];
+	var partitionKeysProperties   = [];
 
 	var createHookHelper = function (hook) {
 		return function (cb) {
@@ -105,7 +106,7 @@ function Model(opts) {
 			driver                 : opts.driver,
 			table                  : opts.table,
 			hooks                  : opts.hooks,
-      partition              : opts.partition,
+      		partition              : opts.partition,
 			methods                : opts.methods,
 			validations            : opts.validations,
 			one_associations       : one_associations,
@@ -114,7 +115,9 @@ function Model(opts) {
 			association_properties : association_properties,
 			setupAssociations      : setupAssociations,
 			fieldToPropertyMap     : fieldToPropertyMap,
-			keyProperties          : keyProperties
+			keyProperties          : keyProperties,
+			partitionKeys          : opts.partitionKeys,
+			partitionKeysProperties: partitionKeysProperties
 		});
 		instance.on("ready", function (err) {
 			if (--pending > 0) {
@@ -383,18 +386,19 @@ function Model(opts) {
 		}
 
 		var chain = new ChainFind(model, {
-			only         : options.only || model_fields,
-			keys         : opts.keys,
-			table        : opts.table,
-			driver       : opts.driver,
-			conditions   : conditions,
-			associations : many_associations,
-			limit        : options.limit,
-			order        : order,
-			merge        : merge,
-			offset       : options.offset,
-			properties   : allProperties,
-			keyProperties: keyProperties,
+			only         			: options.only || model_fields,
+			keys                   : opts.keys,
+			table                  : opts.table,
+			driver                 : opts.driver,
+			conditions             : conditions,
+			associations           : many_associations,
+			limit                  : options.limit,
+			order                  : order,
+			merge                  : merge,
+			offset                 : options.offset,
+			properties             : allProperties,
+			keyProperties          : keyProperties,
+			partitionKeysProperties: partitionKeysProperties,
 			newInstance  : function (data, cb) {
 				var uid = opts.driver.uid + "/" + opts.table + (merge ? "+" + merge.from.table : "");
 				for (var i = 0; i < opts.keys.length; i++) {
@@ -684,7 +688,12 @@ function Model(opts) {
 		allProperties[k] = prop;
 		fieldToPropertyMap[prop.mapsTo] = prop;
 
-		if (opts.keys.indexOf(k) != -1) {
+		if(opts.partitionKeys.indexOf(k) !== -1) {
+			prop.partitionKey = true;
+			partitionKeysProperties.push(prop);
+		}
+
+		if (opts.keys.indexOf(k) !== -1) {
 			prop.key = true;
 		} else if (prop.key) {
 			opts.keys.push(k);

lib/ORM.js

@@ -231,9 +231,10 @@ ORM.prototype.define = function (name, properties, opts) {
 		autoFetchLimit : opts.autoFetchLimit || this.settings.get("instance.autoFetchLimit"),
 		cascadeRemove  : opts.hasOwnProperty("cascadeRemove") ? opts.cascadeRemove : this.settings.get("instance.cascadeRemove"),
 		hooks          : opts.hooks || {},
-    partition      : opts.partition,
+    	partition      : opts.partition,
 		methods        : opts.methods || {},
-		validations    : opts.validations || {}
+		validations    : opts.validations || {},
+		partitionKeys  : opts.partitionKeys || []
 	});
 
 	for (i = 0; i < this.plugins.length; i++) {

lib/sql/Comparators.js

@@ -69,6 +69,10 @@ exports.not_any = function(v) {
 	return createSpecialObject({ val: v }, 'not_any');
 };
 
+exports.not_contains = function(v) {
+	return createSpecialObject({ val: v }, 'not_contains');
+};
+
 exports.bit_eq = function(v) {
 	return createSpecialObject({ val: v }, 'bit_eq');
 };

lib/sql/Helpers.js

@@ -56,6 +56,8 @@ module.exports.resolveComparator = function(left, operator, right) {
       return left + " = ANY(" + right + ")";
     case 'not_any':
       return left + " <> ANY(" + right + ")";
+    case 'not_contains':
+      return right + " <> ALL(" + left + ")";
     case 'date_eq':
       //((field at time zone tz)::date::timestamp at time zone tz),
       var x = "((" + right.field + " at time zone " + right.tz + ")::date::timestamp at time zone " + right.tz + ")";