Insert lock row fix during migration

knex · Nov 30, 2021 · c0bdcf1 · c0bdcf1
1 parent bd1c31a
commit c0bdcf1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/migrations/migrate/migration-list-resolver.js b/lib/migrations/migrate/migration-list-resolver.js
@@ -11,12 +11,10 @@ function listAll(migrationSource, loadExtensions) {
 async function listCompleted(tableName, schemaName, trxOrKnex) {
   await ensureTable(tableName, schemaName, trxOrKnex);
 
-  const completedMigrations = await trxOrKnex
+  return await trxOrKnex
     .from(getTableName(tableName, schemaName))
     .orderBy('id')
     .select('name');
-
-  return completedMigrations;
 }
 
 // Gets the migration list from the migration directory specified in config, as well as

diff --git a/lib/migrations/migrate/table-creator.js b/lib/migrations/migrate/table-creator.js
@@ -55,11 +55,12 @@ function _createMigrationLockTable(tableName, schemaName, trxOrKnex) {
 function _insertLockRowIfNeeded(tableName, schemaName, trxOrKnex) {
   const lockTableWithSchema = getLockTableNameWithSchema(tableName, schemaName);
   return trxOrKnex
-    .from(trxOrKnex.raw('?? (??)', [lockTableWithSchema, 'is_locked']))
-    .insert(function () {
-      return this.select(trxOrKnex.raw('?', [0])).whereNotExists(function () {
-        return this.select('*').from(lockTableWithSchema);
-      });
+    .select('*')
+    .from(lockTableWithSchema)
+    .then((data) => {
+      return !data.length
+        ? trxOrKnex.from(lockTableWithSchema).insert({ is_locked: 0 })
+        : null;
     });
 }