Merge 1beb8ea into 394ba20

lib/dbutils.js

@@ -613,7 +613,7 @@ dbu.buildPutQuery = function(req, keyspace, table, schema) {
 
     // switch between insert & update / upsert
     // - insert for 'if not exists', or when no non-primary-key attributes are
-    //   specified
+    //   specified, or they are all null (as Cassandra does not distinguish the two)
     // - update when any non-primary key attributes are supplied
     //   - Need to verify that all primary key members are supplied as well,
     //     else error.
@@ -626,8 +626,26 @@ dbu.buildPutQuery = function(req, keyspace, table, schema) {
 
     var condRes = dbu.buildCondition(indexKVMap, schema);
 
+    // determine if we should use INSERT INTO
+    var shouldUseInsert = !keys.length || req.if === 'not exists' || keys.every(function(key) {
+        var val = req.attributes[key];
+        // if the value is null or undefined, it is not considered a value
+        if (val === null || val === undefined) {
+            return true;
+        }
+        // if the value is an empty array, it is not considered a value
+        if (Array.isArray(val) && !val.length) {
+            return true;
+        }
+        // if the value is an empty object, it is not considered a value
+        if (val.constructor === Object && !Object.keys(val).length) {
+            return true;
+        }
+        return false;
+    });
+
     var cond = '';
-    if (!keys.length || req.if === 'not exists') {
+    if (shouldUseInsert) {
         if (req.if === 'not exists') {
             cond = ' if not exists ';
         }