diff --git a/plugins/catalog-backend/migrations/20200807120600_entitySearch.js b/plugins/catalog-backend/migrations/20200807120600_entitySearch.js index 9c7d966087..5acfbeb9ba 100644 --- a/plugins/catalog-backend/migrations/20200807120600_entitySearch.js +++ b/plugins/catalog-backend/migrations/20200807120600_entitySearch.js @@ -23,7 +23,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_search', table => { - table.text('value').nullable().alter({ alterType: true }); + table.string('value').nullable().alter({ alterType: true }); }); } }; diff --git a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js index ea26067a06..59fd34b700 100644 --- a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js +++ b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js @@ -21,11 +21,8 @@ */ exports.up = async function up(knex) { await knex.schema.alterTable('entities_search', table => { - const options = knex.client.config.client.includes('mysql') - ? { indexType: 'FULLTEXT' } - : {}; - table.index(['key'], 'entities_search_key', options); - table.index(['value'], 'entities_search_value', options); + table.index(['key'], 'entities_search_key'); + table.index(['value'], 'entities_search_value'); }); }; diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts index 90e40377f2..4c31f10d1f 100644 --- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts +++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts @@ -267,7 +267,10 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog { .select('refresh_state_references.source_entity_ref'); }); await this.database('refresh_state') - .update({ result_hash: 'child-was-deleted' }) + .update({ + result_hash: 'child-was-deleted', + next_update_at: this.database.fn.now(), + }) .whereIn( 'entity_id', results.map(key => key.entity_id), @@ -276,6 +279,7 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog { await this.database('refresh_state') .update({ result_hash: 'child-was-deleted', + next_update_at: this.database.fn.now(), }) .whereIn('entity_ref', function parents(builder) { return builder