From 532672460a1a3df7f6dc5f9be1d4f04f0d3c5d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 30 Dec 2020 09:58:54 +0100
Subject: [PATCH] catalog-backend: unbreak sqlite in create-app repos

---
 .../migrations/20200702153613_entities.js            | 12 ++++--------
 .../migrations/20200807120600_entitySearch.js        | 10 ++++------
 .../20201005122705_add_entity_full_name.js           |  5 ++---
 .../migrations/20201006130744_entity_data_column.js  |  5 +----
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20200702153613_entities.js b/plugins/catalog-backend/migrations/20200702153613_entities.js
index c97331796d..9acd7564db 100644
--- a/plugins/catalog-backend/migrations/20200702153613_entities.js
+++ b/plugins/catalog-backend/migrations/20200702153613_entities.js
@@ -20,16 +20,14 @@
  * @param {import('knex')} knex
  */
 exports.up = async function up(knex) {
-  // Drop constraints (Postgres)
-  try {
+  // SQLite does not support FK and PK
+  if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable('entities_search', table => {
       table.dropForeign(['entity_id']);
     });
     await knex.schema.alterTable('entities', table => {
       table.dropPrimary('entities_pkey');
     });
-  } catch (e) {
-    // SQLite does not support FK and PK, carry on
   }
   await knex.schema.alterTable('entities', table => {
     table.dropUnique([], 'entities_unique_name');
@@ -131,16 +129,14 @@ exports.up = async function up(knex) {
  * @param {import('knex')} knex
  */
 exports.down = async function down(knex) {
-  // Drop constraints (Postgres)
-  try {
+  // SQLite does not support FK and PK
+  if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable('entities_search', table => {
       table.dropForeign(['entity_id']);
     });
     await knex.schema.alterTable('entities', table => {
       table.dropPrimary('entities_pkey');
     });
-  } catch (e) {
-    // SQLite does not support FK and PK, carry on
   }
   await knex.schema.alterTable('entities', table => {
     table.dropUnique([], 'entities_unique_name');
diff --git a/plugins/catalog-backend/migrations/20200807120600_entitySearch.js b/plugins/catalog-backend/migrations/20200807120600_entitySearch.js
index 6e02975f92..b3a9673641 100644
--- a/plugins/catalog-backend/migrations/20200807120600_entitySearch.js
+++ b/plugins/catalog-backend/migrations/20200807120600_entitySearch.js
@@ -20,12 +20,11 @@
  * @param {import('knex')} knex
  */
 exports.up = async function up(knex) {
-  try {
+  // Sqlite does not support alter column.
+  if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable('entities_search', table => {
       table.text('value').nullable().alter();
     });
-  } catch (e) {
-    // Sqlite does not support alter column.
   }
 };
 
@@ -33,11 +32,10 @@ exports.up = async function up(knex) {
  * @param {import('knex')} knex
  */
 exports.down = async function down(knex) {
-  try {
+  // Sqlite does not support alter column.
+  if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable('entities_search', table => {
       table.string('value').nullable().alter();
     });
-  } catch (e) {
-    // Sqlite does not support alter column.
   }
 };
diff --git a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
index 26cc98e74e..4c1ea76de4 100644
--- a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
+++ b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
@@ -30,12 +30,11 @@ exports.up = async function up(knex) {
     ),
   });
 
-  try {
+  // SQLite does not support alter column
+  if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable('entities', table => {
       table.text('full_name').notNullable().alter();
     });
-  } catch (e) {
-    // SQLite does not support alter column, ignore
   }
 
   await knex.schema.alterTable('entities', table => {
diff --git a/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js b/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js
index fdabf72fce..a326a08a8b 100644
--- a/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js
+++ b/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js
@@ -40,10 +40,7 @@ exports.up = async function up(knex) {
     table.dropColumn('spec');
   });
 
-  // SQLite does not support ALTER COLUMN. Note that we do not use the try/
-  // catch method as in other migrations, because if the transaction is
-  // partially failed, it will further mess up the already messed-up
-  // statement below this.
+  // SQLite does not support ALTER COLUMN.
   if (knex.client.config.client !== 'sqlite3') {
     await knex.schema.alterTable('entities', table => {
       table.text('data').notNullable().alter();