refactor: remove dependency on Bluebird.prototype.map in repository f…

…or querying responses
knex · Oct 10, 2019 · bc6e265 · bc6e265
1 parent 6de2633
commit bc6e265
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/lib/dialects/sqlite3/index.js b/lib/dialects/sqlite3/index.js
@@ -122,9 +122,7 @@ Object.assign(Client_SQLite3.prototype, {
       return client
         ._query(connection, sql)
         .then((obj) => obj.response)
-        .map(function(row) {
-          stream.write(row);
-        })
+        .then((rows) => rows.forEach((row) => stream.write(row)))
         .catch(function(err) {
           stream.emit('error', err);
         })

diff --git a/lib/migrate/Migrator.js b/lib/migrate/Migrator.js
@@ -436,14 +436,18 @@ class Migrator {
         qb.max('batch').from(getTableName(tableName, schemaName));
       })
       .orderBy('id', 'desc')
-      .map((migration) => {
-        return allMigrations.find((entry) => {
-          return (
-            this.config.migrationSource.getMigrationName(entry) ===
-            migration.name
-          );
-        });
-      });
+      .then((migrations) =>
+        Promise.all(
+          migrations.map((migration) => {
+            return allMigrations.find((entry) => {
+              return (
+                this.config.migrationSource.getMigrationName(entry) ===
+                migration.name
+              );
+            });
+          })
+        )
+      );
   }
 
   // Returns the latest batch number.

diff --git a/test/integration/datatype/bigint.js b/test/integration/datatype/bigint.js
@@ -28,15 +28,15 @@ module.exports = function(knex) {
           .where('expiry', unsafeBigint)
           .select('*');
       })
-      .map(function(row) {
+      .then(function(row) {
         // triggers request execution
       })
       .then(function() {
         return knex(tableName)
           .where('expiry', negativeUnsafeBigint)
           .select('*');
       })
-      .map(function(row) {
+      .then(function(row) {
         // triggers request execution
       })
       .catch(function(err) {
@@ -79,16 +79,16 @@ module.exports = function(knex) {
           .where('expiry', bigintTimestamp)
           .select('*');
       })
-      .map(function(row) {
-        expect(row.id).to.equal('positive');
+      .then(function(rows) {
+        rows.forEach((row) => expect(row.id).to.equal('positive'));
       })
       .then(function() {
         return knex(tableName)
           .where('expiry', negativeBigintTimestamp)
           .select('*');
       })
-      .map(function(row) {
-        expect(row.id).to.equal('negative');
+      .then(function(rows) {
+        rows.forEach((row) => expect(row.id).to.equal('negative'));
       })
       .catch(function(err) {
         expect(err).to.be.undefined;