massive - npm Package Compare versions

Comparing version 5.9.0 to 5.10.0

CHANGELOG.md

@@ -1,6 +0,7 @@
-# Changelog
+# Change Log
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [5.9.0](https://gitlab.com/dmfay/massive-js/compare/v5.8.0...v5.9.0) (2019-05-16)
+<a name="5.10.0"></a>
+# [5.10.0](https://gitlab.com/dmfay/massive-js/compare/v5.9.0...v5.10.0) (2019-05-19)
 
@@ -10,7 +11,4 @@
 
-* always generate function invocation sql to handle overloads properly ([0b60dcd](https://gitlab.com/dmfay/massive-js/commit/0b60dcd))
-* **deps:** update dependency glob to v7.1.4 ([587fcd1](https://gitlab.com/dmfay/massive-js/commit/587fcd1))
-* **deps:** update dependency pg-promise to v8.7.0 ([800c093](https://gitlab.com/dmfay/massive-js/commit/800c093))
-* **deps:** update dependency pg-promise to v8.7.1 ([5d418f1](https://gitlab.com/dmfay/massive-js/commit/5d418f1))
-* **deps:** update dependency pg-promise to v8.7.2 ([3374298](https://gitlab.com/dmfay/massive-js/commit/3374298))
+* return real error for incomplete args to Readable.search and searchDoc ([c251495](https://gitlab.com/dmfay/massive-js/commit/c251495))
+* return real error in saveDoc/saveDocs ([6fa2d88](https://gitlab.com/dmfay/massive-js/commit/6fa2d88))
 
@@ -20,45 +18,6 @@
 
-* invoke procedures like functions (fixes [#679](https://gitlab.com/dmfay/massive-js/issues/679)) ([aa18183](https://gitlab.com/dmfay/massive-js/commit/aa18183))
+* onConflictUpdate option for true upserts in db.mytable.insert ([a4cf534](https://gitlab.com/dmfay/massive-js/commit/a4cf534))
 
 
-### Tests
 
-* remove superfluous check ([d387aec](https://gitlab.com/dmfay/massive-js/commit/d387aec))
-
-
-
-# [5.8.0](https://gitlab.com/dmfay/massive-js/compare/v5.7.7...v5.8.0) (2019-04-30)
-
-
-### Bug Fixes
-
-* **deps:** update dependency commander to v2.20.0 ([04ac4f4](https://gitlab.com/dmfay/massive-js/commit/04ac4f4))
-* **deps:** update dependency pg-promise to v8.6.4 ([70d6501](https://gitlab.com/dmfay/massive-js/commit/70d6501))
-* **deps:** update dependency pg-promise to v8.6.5 ([4cf6e15](https://gitlab.com/dmfay/massive-js/commit/4cf6e15))
-
-
-### Features
-
-* forUpdate and forShare option for find queries (closes [#677](https://gitlab.com/dmfay/massive-js/issues/677)) ([66a00ce](https://gitlab.com/dmfay/massive-js/commit/66a00ce))
-
-
-
-## [5.7.7](https://gitlab.com/dmfay/massive-js/compare/v5.7.6...v5.7.7) (2019-03-01)
-
-
-### Bug Fixes
-
-* query files can use streaming as long as they don't have named parameters ([58e413c](https://gitlab.com/dmfay/massive-js/commit/58e413c))
-
-
-
-## [5.7.6](https://github.com/dmfay/massive-js/compare/v5.7.5...v5.7.6) (2019-02-18)
-
-
-### Bug Fixes
-
-* simplify executable clone to improve performance in tasks/transactions (fixes [#673](https://github.com/dmfay/massive-js/issues/673)) ([#674](https://github.com/dmfay/massive-js/issues/674)) ([bf1c5df](https://github.com/dmfay/massive-js/commit/bf1c5df))
-
-
-
 <a name="5.7.5"></a>
@@ -65,0 +24,0 @@ ## [5.7.5](https://github.com/dmfay/massive-js/compare/v5.7.4...v5.7.5) (2019-02-06)

lib/database.js

@@ -641,4 +641,3 @@ 'use strict';
     case 'v3':
-      sqlDefault = 'DEFAULT uuid_generate_v3()';
-      break;
+      throw new Error('v3 UUIDs are not currently supported');
     case 'v4':
@@ -648,4 +647,3 @@ sqlDefault = 'DEFAULT uuid_generate_v4()';
     case 'v5':
-      sqlDefault = 'DEFAULT uuid_generate_v5()';
-      break;
+      throw new Error('v5 UUIDs are not currently supported');
     default:
@@ -652,0 +650,0 @@ sqlDefault = 'DEFAULT uuid_generate_v4()';

lib/readable.js

@@ -171,3 +171,3 @@ 'use strict';
   if (!plan.fields || !plan.term) {
-    return this.db.$p.reject('Need fields as an array and a term string');
+    return this.db.$p.reject(new Error('Need fields as an array and a term string'));
   }
@@ -209,3 +209,3 @@
   if (!plan.term) {
-    return this.db.$p.reject('Need fields as an array and a term string');
+    return this.db.$p.reject(new Error('Need fields as an array and a term string'));
   }
@@ -212,0 +212,0 @@

lib/statement/insert.js

@@ -25,2 +25,3 @@ 'use strict';
   this.onConflictIgnore = options.onConflictIgnore;
+  this.onConflictUpdate = options.onConflictUpdate;
   this.deepInsert = Object.prototype.hasOwnProperty.call(options, 'deepInsert') && !!options.deepInsert;
@@ -92,2 +93,7 @@
     sql += 'ON CONFLICT DO NOTHING ';
+  } else if (this.onConflictUpdate) {
+    const conflictFields = this.onConflictUpdate.map(f => `"${f}"`);
+    const excludedFields = _.difference(this.columns, this.onConflictUpdate).map(f => `"${f}" = EXCLUDED."${f}"`);
+
+    sql += `ON CONFLICT (${conflictFields.join(', ')}) DO UPDATE SET ${excludedFields.join(', ')} `;
   }
@@ -94,0 +100,0 @@

lib/writable.js

@@ -170,3 +170,3 @@ 'use strict';
   if (!_.isObjectLike(doc) || _.isArray(doc)) {
-    return this.db.$p.reject('Please pass in the document for saving as an object. Include the primary key for an UPDATE.');
+    return this.db.$p.reject(new Error('Please pass in the document for saving as an object. Include the primary key for an UPDATE.'));
   }
@@ -203,7 +203,7 @@
   if (!_.isArray(docs)) {
-    return this.db.$p.reject('Please pass in the documents as an array of objects.');
+    return this.db.$p.reject(new Error('Please pass in the documents as an array of objects.'));
   }
 
   if (!docs.every(_.isObjectLike)) {
-    return this.db.$p.reject('Please pass in valid documents. Include the primary key for an UPDATE.');
+    return this.db.$p.reject(new Error('Please pass in valid documents. Include the primary key for an UPDATE.'));
   }
@@ -210,0 +210,0 @@

package.json

 {
   "name": "massive",
-  "version": "5.9.0",
+  "version": "5.10.0",
   "description": "A small query tool for Postgres that embraces json and makes life simpler",
@@ -5,0 +5,0 @@ "homepage": "https://massivejs.org",

No alert changes

Improved metrics

Lines of code

2536

increased by0.12%

Worsened metrics

Total package byte prevSize

144418

decreased by-0.88%

No dependency changes