fhir-persistence 0.4.0 → 0.6.0

package/dist/cjs/index.d.ts

@@ -324,7 +324,7 @@ export declare function buildWhereClauseV2(params: ParsedSearchParam[], registry
  * - SQLite: json_each() for array columns
  * - PostgreSQL: native ARRAY operators
  */
-export declare function buildWhereFragmentV2(impl: SearchParameterImpl, param: ParsedSearchParam, dialect?: SqlDialect): WhereFragment | null;
+export declare function buildWhereFragmentV2(impl: SearchParameterImpl, param: ParsedSearchParam, dialect?: SqlDialect, resourceType?: string): WhereFragment | null;
 
 declare interface BundleLink {
     relation: string;

package/dist/esm/index.d.ts

@@ -324,7 +324,7 @@ export declare function buildWhereClauseV2(params: ParsedSearchParam[], registry
  * - SQLite: json_each() for array columns
  * - PostgreSQL: native ARRAY operators
  */
-export declare function buildWhereFragmentV2(impl: SearchParameterImpl, param: ParsedSearchParam, dialect?: SqlDialect): WhereFragment | null;
+export declare function buildWhereFragmentV2(impl: SearchParameterImpl, param: ParsedSearchParam, dialect?: SqlDialect, resourceType?: string): WhereFragment | null;
 
 declare interface BundleLink {
     relation: string;

package/dist/esm/index.mjs

@@ -5077,12 +5077,12 @@ function arrayContainsLikeV2(col, value, dialect) {
   }
   return { sql: `EXISTS (SELECT 1 FROM json_each(${col}) WHERE json_each.value LIKE ?)`, values: [value] };
 }
-function buildWhereFragmentV2(impl, param, dialect) {
+function buildWhereFragmentV2(impl, param, dialect, resourceType) {
   if (param.modifier === "missing") {
     return buildMissingFragmentV2(impl, param);
   }
   if (impl.strategy === "lookup-table") {
-    return buildLookupTableFragmentV2(impl, param);
+    return buildLookupTableFragmentV2(impl, param, resourceType ?? "Resource");
   }
   if (impl.strategy === "token-column") {
     return buildTokenColumnFragmentV2(impl, param, dialect);
@@ -5110,7 +5110,7 @@ function buildMissingFragmentV2(impl, param) {
   const col = quoteColumn(impl.columnName);
   return { sql: isMissing ? `${col} IS NULL` : `${col} IS NOT NULL`, values: [] };
 }
-function buildLookupTableFragmentV2(impl, param) {
+function buildLookupTableFragmentV2(impl, param, resourceType) {
   const mapping = LOOKUP_TABLE_MAP[impl.code];
   if (!mapping) {
     const sortCol = quoteColumn(`__${impl.columnName}Sort`);
@@ -5120,25 +5120,26 @@ function buildLookupTableFragmentV2(impl, param) {
   }
   const { table, column } = mapping;
   const colRef = `__lookup."${column}"`;
+  const outerIdRef = `"${resourceType}"."id"`;
   if (param.modifier === "exact") {
     if (param.values.length === 1) {
-      return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = "id" AND ${colRef} = ?)`, values: [param.values[0]] };
+      return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = ${outerIdRef} AND ${colRef} = ?)`, values: [param.values[0]] };
     }
     const conds2 = param.values.map(() => `${colRef} = ?`);
-    return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = "id" AND (${conds2.join(" OR ")}))`, values: [...param.values] };
+    return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = ${outerIdRef} AND (${conds2.join(" OR ")}))`, values: [...param.values] };
   }
   if (param.modifier === "contains") {
     if (param.values.length === 1) {
-      return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = "id" AND LOWER(${colRef}) LIKE ?)`, values: [`%${param.values[0].toLowerCase()}%`] };
+      return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = ${outerIdRef} AND LOWER(${colRef}) LIKE ?)`, values: [`%${param.values[0].toLowerCase()}%`] };
     }
     const conds2 = param.values.map(() => `LOWER(${colRef}) LIKE ?`);
-    return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = "id" AND (${conds2.join(" OR ")}))`, values: param.values.map((v) => `%${v.toLowerCase()}%`) };
+    return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = ${outerIdRef} AND (${conds2.join(" OR ")}))`, values: param.values.map((v) => `%${v.toLowerCase()}%`) };
   }
   if (param.values.length === 1) {
-    return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = "id" AND LOWER(${colRef}) LIKE ?)`, values: [`${param.values[0].toLowerCase()}%`] };
+    return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = ${outerIdRef} AND LOWER(${colRef}) LIKE ?)`, values: [`${param.values[0].toLowerCase()}%`] };
   }
   const conds = param.values.map(() => `LOWER(${colRef}) LIKE ?`);
-  return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = "id" AND (${conds.join(" OR ")}))`, values: param.values.map((v) => `${v.toLowerCase()}%`) };
+  return { sql: `EXISTS (SELECT 1 FROM "${table}" __lookup WHERE __lookup."resourceId" = ${outerIdRef} AND (${conds.join(" OR ")}))`, values: param.values.map((v) => `${v.toLowerCase()}%`) };
 }
 function buildStringFragmentV2(impl, param) {
   const col = quoteColumn(impl.columnName);
@@ -5307,7 +5308,7 @@ function buildWhereClauseV2(params, registry, resourceType, dialect) {
     }
     const impl = resolveImplV2(param, registry, resourceType);
     if (!impl) continue;
-    const fragment = buildWhereFragmentV2(impl, param, dialect);
+    const fragment = buildWhereFragmentV2(impl, param, dialect, resourceType);
     if (fragment) {
       fragments.push(fragment);
     }
@@ -7155,6 +7156,14 @@ function generateMigration(deltas, dialect) {
   const down = [];
   const reindexDeltas = [];
   const descriptions = [];
+  const needsPgExtensions = deltas.some((d) => d.kind === "ADD_TABLE" || d.kind === "ADD_INDEX");
+  if (dialect === "postgres" && needsPgExtensions) {
+    up.push("CREATE EXTENSION IF NOT EXISTS pg_trgm;");
+    up.push("CREATE EXTENSION IF NOT EXISTS btree_gin;");
+    up.push(
+      `CREATE OR REPLACE FUNCTION token_array_to_text(arr text[]) RETURNS text LANGUAGE sql IMMUTABLE AS $$ SELECT array_to_string(arr, ' ') $$;`
+    );
+  }
   for (const delta of deltas) {
     switch (delta.kind) {
       case "ADD_TABLE": {