use DB uuid type for entity uuids: less straightforward type wrangling

Author: brontolosone

lib/model/query/entities.js

@@ -10,7 +10,7 @@
 const config = require('config');
 const { sql } = require('slonik');
 const { Actor, Audit, Entity, Submission, Form } = require('../frames');
-const { sqlEquals, extender, unjoiner, page, markDeleted, insertMany, sqlInArray } = require('../../util/db');
+const { sqlEquals, extender, unjoiner, page, markDeleted, insertMany } = require('../../util/db');
 const { map, mergeRight, pickAll } = require('ramda');
 const { blankStringToNull, construct } = require('../../util/util');
 const { QueryOptions } = require('../../util/db');
@@ -783,7 +783,7 @@ const _get = (includeSource) => {
     ) submissions ON submissions.id = submission_defs."submissionId"
     LEFT JOIN forms ON submissions."formId" = forms.id
   `} 
-  WHERE ${sqlEquals(options.condition)} AND entities."deletedAt" is ${deleted ? sql`not` : sql``} null
+  WHERE ${sqlEquals(options.condition, { uuid: 'uuid' })} AND entities."deletedAt" is ${deleted ? sql`not` : sql``} null
   ORDER BY entities."createdAt" DESC, entities.id DESC
 `);
 };
@@ -1029,11 +1029,12 @@ const purge = (force = false, projectId = null, datasetName = null, entityUuid =
 // INTEGRITY CHECK
 
 const idFilter = (options, idCol = 'uuid') => {
-  const query = options.ifArg('id', ids => {
-    const idList = ids.split(',').map(id => id.trim());
-    return sqlInArray(sql.identifier([idCol]), idList);
-  });
-  return query.sql ? query : sql`TRUE`;
+  if (options.args.id) {
+    const idList = options.args.id.split(',').map(id => id.trim());
+    return idList.length ? sql`${sql.identifier([idCol])} = ANY (${sql.array(idList, 'uuid')})` : sql`TRUE`;
+  } else {
+    return sql`TRUE`;
+  }
 };
 
 const getEntitiesState = (dataset, options = QueryOptions.none) => ({ all }) => all(sql`

lib/util/db.js

@@ -213,16 +213,18 @@ const markUndeleted = (obj) =>
 ////////////////////////////////////////
 // query fragment util
 
-const sqlEquals = (obj) => {
+const sqlEquals = (obj, typeMap = {}) => {
   const keys = Object.keys(obj);
   if (keys.length === 0) return sql`true`;
 
   const parts = new Array(keys.length);
   for (let i = 0; i < keys.length; i += 1) {
     const k = keys[i];
     const v = obj[k];
+    const maybeType = typeMap[k];
+    const typeSpec = maybeType ? sql`::${sql.identifier([maybeType])}` : sql``;
     parts[i] = (v === null) ? sql`${sql.identifier(k.split('.'))} is null`
-      : sql`${sql.identifier(k.split('.'))}=${obj[k]}`;
+      : sql`${sql.identifier(k.split('.'))}=${obj[k]}${typeSpec}`;
   }
   return sql.join(parts, sql` and `);
 };