README.md

@@ -81,10 +81,10 @@ API
 
 It's kinda CRUDdy... but don't let that scare you.
 
-* `upsert(id, data[, oldId])` - creates or updates based on existence in DB (use this)
+* `upsert(id, data)` - creates or updates based on existence in DB (use this)
   * modifies `createdAt` and or `updatedAt`
 * `create(id, obj)` - same as above, but fails if the object exists
-* `save(data[, oldId])` - (just don't use this, please) creates or updates based on presence of ID
+* `save(data)` - (just don't use this, please) creates or updates based on presence of ID
 * `destroy(id)` - mark a record as `deletedAt` from DB
 * `get(id)` - grab one by id
 * `find(attrs, opts)` - grab many by indexable attributes

lib/dbwrap.js

@@ -97,8 +97,7 @@ function wrap(db, dir, dbsMap) {
         db.all(sql, earr, function (err, results) {
           if (err) {
             console.error("[Error] add column '" + tablename + "'");
-            console.error(sql);
+            console.error(err.stack);
-            console.error(err.stack || new Error('stack').stack);
             cb(err);
             return;
           }
@@ -303,13 +302,13 @@ function wrap(db, dir, dbsMap) {
       }).then(simpleParse);
     };
 
-    DB.upsert = function (id, data, oldId) {
+    DB.upsert = function (id, data) {
       if (!data) {
         data = id;
         id = data[idnameCased];
       }
 
-      return DB.set(oldId || id, data, oldId).then(function (result) {
+      return DB.set(id, data).then(function (result) {
         var success = result.changes >= 1;
 
         if (success) {
@@ -320,8 +319,8 @@ function wrap(db, dir, dbsMap) {
       });
     };
 
-    DB.save = function (data, oldId) {
+    DB.save = function (data) {
-      if (!data[idnameCased] && !oldId) {
+      if (!data[idnameCased]) {
         // NOTE saving the id both in the object and the id for now
         var UUID = require('node-uuid');
         data[idnameCased] = UUID.v4();
@@ -331,7 +330,7 @@ function wrap(db, dir, dbsMap) {
         });
       }
 
-      return DB.set(oldId || data[idnameCased], data, oldId).then(function (result) {
+      return DB.set(data[idnameCased], data).then(function (result) {
         var success = result.changes >= 1;
 
         if (success) {
@@ -396,7 +395,7 @@ function wrap(db, dir, dbsMap) {
     };
 
     // pull indices from object
-    function strainUpdate(id, data/*, vals*/, cb, oldId) {
+    function strainUpdate(id, data/*, vals*/, cb) {
       var fieldable = [];
       var json;
       var sql;
@@ -441,9 +440,7 @@ function wrap(db, dir, dbsMap) {
         delete data[camelCase(col.name)];
       });
 
-      if (!oldId) {
+      delete data[idnameCased];
-        delete data[idnameCased];
-      }
 
       if (!fieldable.length || Object.keys(data).length) {
         json = JSON.stringify(data);
@@ -469,7 +466,7 @@ function wrap(db, dir, dbsMap) {
       return sql;
     }
 
-    DB.set = function (id, obj, oldId) {
+    DB.set = function (id, obj) {
       obj.updatedAt = Date.now();
 
       var json = JSON.stringify(obj);
@@ -487,7 +484,7 @@ function wrap(db, dir, dbsMap) {
         //var vals = [];
         // removes known fields from data
         data.updated_at = Date.now();
-        var sql = strainUpdate(id, data/*, vals*/, sqlTpl, oldId);
+        var sql = strainUpdate(id, data/*, vals*/, sqlTpl);
 
         //console.log('[debug] DB.set() sql:', sql);
         db.run(sql, /*vals*/[], function (err) {