Merge pull request #1175 from cardstack/cs-6614-implement-search-query-support-in-postgres-adapter

Add postgres support for querying index

Author: habdelra

packages/host/app/lib/sqlite-adapter.ts

@@ -165,9 +165,19 @@ export default class SQLiteAdapter implements DBAdapter {
         }
         return `ON CONFLICT (${pkColumns})`;
       })
+      .replace(/ANY_VALUE\(([^)]*)\)/g, '$1')
       .replace(/CROSS JOIN LATERAL/g, 'CROSS JOIN')
-      .replace(/jsonb_array_each\(/g, 'json_each(')
+      .replace(/jsonb_array_elements_text\(/g, 'json_each(')
+      .replace(/jsonb_tree\(/g, 'json_tree(')
+      .replace(/([^\s]+\s[^\s]+)_array_element/g, (match, group) => {
+        if (group.startsWith('as ')) {
+          return match;
+        }
+        return `${match}.value`;
+      })
       .replace(/\.text_value/g, '.value')
+      .replace(/\.jsonb_value/g, '.value')
+      .replace(/= 'null'::jsonb/g, 'IS NULL')
       .replace(/COLLATE "POSIX"/g, '');
   }
 }

packages/host/tests/helpers/index.gts

@@ -4,8 +4,6 @@ import { findAll, waitUntil, waitFor, click } from '@ember/test-helpers';
 import { buildWaiter } from '@ember/test-waiters';
 import GlimmerComponent from '@glimmer/component';
 
-import { parse } from 'date-fns';
-
 import ms from 'ms';
 
 import {
@@ -58,6 +56,7 @@ import { WebMessageStream, messageCloseHandler } from './stream';
 import visitOperatorMode from './visit-operator-mode';
 
 export { visitOperatorMode, testRealmURL, testRealmInfo, percySnapshot };
+export * from '@cardstack/runtime-common/helpers';
 export * from '@cardstack/runtime-common/helpers/indexer';
 
 const waiter = buildWaiter('@cardstack/host/test/helpers/index:onFetch-waiter');
@@ -83,10 +82,6 @@ export function trimCardContainer(text: string) {
   );
 }
 
-export function p(dateString: string): Date {
-  return parse(dateString, 'yyyy-MM-dd', new Date());
-}
-
 export function getMonacoContent(): string {
   return (window as any).monaco.editor.getModels()[0].getValue();
 }

packages/host/tests/unit/indexer-test.ts

@@ -2,7 +2,8 @@ import { module, test } from 'qunit';
 
 import { IndexerDBClient } from '@cardstack/runtime-common';
 import { runSharedTest } from '@cardstack/runtime-common/helpers';
-import indexerTests from '@cardstack/runtime-common/tests/indexer';
+// eslint-disable-next-line ember/no-test-import-export
+import indexerTests from '@cardstack/runtime-common/tests/indexer-test';
 
 import ENV from '@cardstack/host/config/environment';
 import SQLiteAdapter from '@cardstack/host/lib/sqlite-adapter';
@@ -24,46 +25,46 @@ module('Unit | indexer', function (hooks) {
   });
 
   test('can perform invalidations for an index entry', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('does not create invalidation record for non-JSON invalidation', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('only invalidates latest version of content', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can prevent concurrent batch invalidations from colliding', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can prevent concurrent batch invalidations from colliding when making new generation', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can update an index entry', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can remove an index entry', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can create a new generation of index entries', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can get "production" index entry', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('can get work in progress index entry', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 
   test('returns undefined when getting a deleted entry', async function (assert) {
-    await runSharedTest(indexerTests, assert, client, adapter);
+    await runSharedTest(indexerTests, assert, { client, adapter });
   });
 });