From 112c6d5605813936f044ef2ffa0995b2e49576f6 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Fri, 28 Oct 2022 13:54:42 -0700
Subject: [PATCH] address feedback

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../20201005122705_add_entity_full_name.js    |  2 +-
 .../20201007201501_index_entity_search.js     | 22 +++++++++----------
 .../20210302150147_refresh_state.js           | 19 +++++++---------
 3 files changed, 20 insertions(+), 23 deletions(-)

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 8705ae26a6..412791d8d7 100644
--- a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
+++ b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
@@ -34,7 +34,7 @@ exports.up = async function up(knex) {
   // SQLite does not support alter column
   if (!knex.client.config.client.includes('sqlite3')) {
     await knex.schema.alterTable('entities', table => {
-      table.string('full_name').notNullable().alter();
+      table.string('full_name').notNullable().alter({ alterNullable: true });
     });
   }
 
diff --git a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
index 3611c91b3d..be700a324a 100644
--- a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
+++ b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
@@ -21,17 +21,17 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('entities_search', table => {
-    if (knex.client.config.client.includes('mysql')) {
-      table.index(['key'], 'entities_search_key', {
-        indexType: 'FULLTEXT',
-      });
-      table.index(['value'], 'entities_search_value', {
-        indexType: 'FULLTEXT',
-      });
-    } else {
-      table.index(['key'], 'entities_search_key');
-      table.index(['value'], 'entities_search_value');
-    }
+    const options = knex.client.config.client.includes('mysql') ? { indexType: 'FULLTEXT', } : {}
+      table.index(
+        ['key'],
+        'entities_search_key',
+        options
+      );
+      table.index(
+        ['value'],
+        'entities_search_value',
+        options
+      );
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index bf1611a099..c3c3dc3f12 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -20,11 +20,7 @@
  * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
-  let STRING_TEXT = 'text';
-  if (knex.client.config.client.includes('mysql')) {
-    STRING_TEXT = 'string';
-  }
-
+  const isMySQL = knex.client.config.client.includes('mysql');
   await knex.schema.createTable('refresh_state', table => {
     table.comment('Location refresh states');
     table
@@ -94,23 +90,24 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.createTable('refresh_state_references', table => {
+    const textColumn = isMySQL
+        ? table.string.bind(table)
+        : table.text.bind(table);
+
     table.comment('Edges between refresh state rows');
     table
       .increments('id')
       .comment('Primary key to distinguish unique lines from each other');
-    // @ts-ignore
-    table[STRING_TEXT]('source_key')
+    textColumn('source_key')
       .nullable()
       .comment('Opaque identifier for non-entity sources');
-    // @ts-ignore
-    table[STRING_TEXT]('source_entity_ref')
+    textColumn('source_entity_ref')
       .nullable()
       .references('entity_ref')
       .inTable('refresh_state')
       .onDelete('CASCADE')
       .comment('EntityRef of entity sources');
-    // @ts-ignore
-    table[STRING_TEXT]('target_entity_ref')
+    textColumn('target_entity_ref')
       .notNullable()
       .references('entity_ref')
       .inTable('refresh_state')