Fix bug when mysql apply migration

adapters/mysql.js

@@ -29,7 +29,7 @@ module.exports = function (config, logger) {
             return ensureMigrationTableExists().then(function () {
                 return exec('select * from __migrations__');
             }).then(function (rows) {
-                return rows.map(function (row) { return row.id; });
+                return rows.map(function (row) { return String(row.id); });
             });
         },
         applyMigration: function applyMigration(migration, sql) {

adapters/pg.js

@@ -28,7 +28,7 @@ module.exports = function (config, logger) {
             return ensureMigrationTableExists().then(function () {
                 return exec('select * from __migrations__');
             }).then(function (result) {
-                return result.rows.map(function (row) { return row.id; });
+                return result.rows.map(function (row) { return String(row.id); });
             });
         },
         applyMigration: function applyMigration(migration, sql) {

commands/run-migrations-command.js

@@ -34,7 +34,7 @@ function getPending(migrationsList, appliedMigrationIds, minMigrationTime) {
     var pending = [];
     migrationsList.forEach(function (migration) {
         var id = migration.match(/^(\d+)/)[0];
-        if ((!minMigrationTime || id >= minMigrationTime) && !~appliedMigrationIds.indexOf(id) && migration.match(/^\d+\_up.*$/)) {
+        if ((!minMigrationTime || id >= minMigrationTime) && !appliedMigrationIds.includes(id) && migration.match(/^\d+\_up.*$/)) {
             pending.push(migration);
         }
     });

config_test.js

@@ -0,0 +1,22 @@
+var path = require('path');
+
+module.exports = {
+    mysql: {
+        migrationsDir: path.resolve(process.cwd(), 'mysql-migrations'),
+        adapter: 'mysql',
+        user: 'root',
+        host: 'localhost',
+        db: 'sql_migrations',
+        password: 'root',
+        port: 3306
+    },
+    postgres: {
+        migrationsDir: path.resolve(process.cwd(), 'migrations'),
+        adapter: 'pg',
+        user: 'postgres',
+        host: 'localhost',
+        db: 'sql_migrations',
+        password: 'postgres',
+        port: 5432
+    }
+}

docker-compose.yaml

@@ -0,0 +1,17 @@
+version: '3'
+
+services:
+  mysql:
+    image: mysql:5.7
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=sql_migrations
+    ports:
+      - "3306:3306"
+  postgresql:
+    image: postgres:9.6
+    environment:
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=sql_migrations
+    ports:
+      - "5432:5432"

migrate-mysql.js

@@ -0,0 +1,3 @@
+const config = require('./config_test').mysql
+
+require('./').run(config);

migrate.js

@@ -1,10 +1,3 @@
-var path = require('path');
+const config = require('./config_test').postgres
 
-require('./').run({
-    migrationsDir: path.resolve(process.cwd, 'migrations'),
-    user: 'dabramov',
-    host: 'localhost',
-    db: 'sql_migrations',
-    password: 'pgpassword',
-    port: 5432
-});
+require('./').run(config);

migrations/1415848008750_up_migrate.sql

@@ -1 +1 @@
-create table "testtesttest" (id int);
+create table if not exists "testtesttest" (id int);

mysql-migrations/1415847181182_up_test.sql

@@ -0,0 +1 @@
+select 2;

mysql-migrations/1415848008750_down_migrate.sql

@@ -0,0 +1 @@
+drop table "testtesttest";

mysql-migrations/1415848008750_up_migrate.sql

@@ -0,0 +1 @@
+create table if not exists testtesttest (id int);

mysql-migrations/1415856540610_up_test2.sql

@@ -0,0 +1 @@
+select 1;

mysql-migrations/1562632680494_up_test3.sql

@@ -0,0 +1,4 @@
+create procedure sp_test_echo()
+begin
+    select "hello world";
+end;