match queries to indexes

getodk · Mar 28, 2024 · d3dda29 · d3dda29
1 parent 5a74cbb
commit d3dda29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/model/migrations/20240322-01-add-entity-source-index-to-audits.js b/lib/model/migrations/20240322-01-add-entity-source-index-to-audits.js
@@ -8,13 +8,11 @@
 // except according to the terms contained in the LICENSE file.
 
 const up = async (db) => {
-  await db.raw('DROP INDEX audits_details_entity_index');
   await db.raw("CREATE INDEX audits_details_entity_def_index ON audits USING HASH (((details ->> 'entityDefId')::INTEGER))");
   await db.raw("CREATE INDEX audits_details_entity_source_index ON audits USING HASH (((details ->> 'sourceId')::INTEGER))");
 };
 
 const down = async (db) => {
-  await db.raw("CREATE INDEX audits_details_entity_index ON audits USING HASH (((details ->> 'entityId')::INTEGER))");
   await db.raw('DROP INDEX audits_details_entity_def_index');
   await db.raw('DROP INDEX audits_details_entity_source_index');
 };

diff --git a/lib/model/query/audits.js b/lib/model/query/audits.js
@@ -107,7 +107,7 @@ ${extend|| sql`
   LEFT OUTER JOIN actors ON actors.id=audits."actorId"
 
   -- if event references entityId in details
-  LEFT JOIN entities ON (audits.details->'entityId')::INTEGER = entities.id AND entities."deletedAt" IS NULL
+  LEFT JOIN entities ON (audits.details->>'entityId')::INTEGER = entities.id AND entities."deletedAt" IS NULL
   -- join with current entity def even if there is a specific def linked in event
   LEFT JOIN entity_defs AS current_entity_def ON current_entity_def."entityId" = entities.id AND current
 `}
@@ -136,7 +136,7 @@ const _getByEntityId = (fields, options, entityId) => sql`
 SELECT ${fields} FROM entity_defs
 
   LEFT JOIN entity_def_sources on entity_def_sources.id = entity_defs."sourceId"
-  INNER JOIN audits ON ((audits.details->'entityDefId')::INTEGER = entity_defs.id OR (audits.details->'sourceId')::INTEGER = entity_def_sources.id)
+  INNER JOIN audits ON ((audits.details->>'entityDefId')::INTEGER = entity_defs.id OR (audits.details->>'sourceId')::INTEGER = entity_def_sources.id)
 
   LEFT JOIN actors ON actors.id=audits."actorId"