@expo/entity-database-adapter-knex 0.63.0 → 0.64.0

package/src/__tests__/fixtures/StubPostgresDatabaseAdapter.ts

@@ -76,7 +76,7 @@ export class StubPostgresDatabaseAdapter<
   ): Promise<object[]> {
     const objectCollection = this.getObjectCollectionForTable(tableName);
     const results = StubPostgresDatabaseAdapter.uniqBy(tableTuples, (tuple) =>
-      tuple.join(':'),
+      JSON.stringify(tuple),
     ).reduce(
       (acc, tableTuple) => {
         return acc.concat(
@@ -202,6 +202,30 @@ export class StubPostgresDatabaseAdapter<
     throw new Error('SQL fragments not supported for StubDatabaseAdapter');
   }
 
+  protected async countByFieldEqualityConjunctionInternalAsync(
+    queryInterface: any,
+    tableName: string,
+    tableFieldSingleValueEqualityOperands: TableFieldSingleValueEqualityCondition[],
+    tableFieldMultiValueEqualityOperands: TableFieldMultiValueEqualityCondition[],
+  ): Promise<number> {
+    const results = await this.fetchManyByFieldEqualityConjunctionInternalAsync(
+      queryInterface,
+      tableName,
+      tableFieldSingleValueEqualityOperands,
+      tableFieldMultiValueEqualityOperands,
+      { orderBy: undefined, offset: undefined, limit: undefined },
+    );
+    return results.length;
+  }
+
+  protected countBySQLFragmentInternalAsync(
+    _queryInterface: any,
+    _tableName: string,
+    _sqlFragment: SQLFragment<TFields>,
+  ): Promise<number> {
+    throw new Error('SQL fragment count not supported for StubDatabaseAdapter');
+  }
+
   private generateRandomID(): any {
     const idSchemaField = this.entityConfiguration2.schema.get(this.entityConfiguration2.idField);
     invariant(

package/src/internal/EntityKnexDataManager.ts

@@ -3,6 +3,7 @@ import {
   EntityDatabaseAdapterPaginationCursorInvalidError,
   EntityMetricsLoadType,
   getDatabaseFieldForEntityField,
+  timeAndLogCountEventAsync,
   timeAndLogLoadEventAsync,
 } from '@expo/entity';
 import assert from 'assert';
@@ -190,6 +191,23 @@ export class EntityKnexDataManager<
     );
   }
 
+  async countByFieldEqualityConjunctionAsync<N extends keyof TFields>(
+    queryContext: EntityQueryContext,
+    fieldEqualityOperands: readonly FieldEqualityCondition<TFields, N>[],
+  ): Promise<number> {
+    return await timeAndLogCountEventAsync(
+      this.metricsAdapter,
+      EntityMetricsLoadType.COUNT_EQUALITY_CONJUNCTION,
+      this.entityClassName,
+      queryContext,
+    )(
+      this.databaseAdapter.countByFieldEqualityConjunctionAsync(
+        queryContext,
+        fieldEqualityOperands,
+      ),
+    );
+  }
+
   async loadManyBySQLFragmentAsync(
     queryContext: EntityQueryContext,
     sqlFragment: SQLFragment<TFields>,
@@ -211,6 +229,18 @@ export class EntityKnexDataManager<
     );
   }
 
+  async countBySQLFragmentAsync(
+    queryContext: EntityQueryContext,
+    sqlFragment: SQLFragment<TFields>,
+  ): Promise<number> {
+    return await timeAndLogCountEventAsync(
+      this.metricsAdapter,
+      EntityMetricsLoadType.COUNT_SQL,
+      this.entityClassName,
+      queryContext,
+    )(this.databaseAdapter.countBySQLFragmentAsync(queryContext, sqlFragment));
+  }
+
   /**
    * Load a page of objects using cursor-based pagination with unified pagination specification.
    *
@@ -450,17 +480,16 @@ export class EntityKnexDataManager<
     baseWhere: SQLFragment<TFields> | undefined,
     cursorCondition: SQLFragment<TFields> | null,
   ): SQLFragment<TFields> {
-    const conditions = [baseWhere, cursorCondition].filter((it) => !!it);
-    if (conditions.length === 0) {
-      return sql`TRUE`;
+    if (!baseWhere) {
+      return cursorCondition ?? sql`TRUE`;
     }
-    if (conditions.length === 1) {
-      return conditions[0]!;
+
+    if (!cursorCondition) {
+      return baseWhere;
     }
-    // Wrap baseWhere in parens if combining with cursor condition
-    // We know we have exactly 2 conditions at this point
-    const [first, second] = conditions;
-    return sql`(${first}) AND ${second}`;
+
+    // Wrap baseWhere in parens when combining with cursor condition
+    return sql`(${baseWhere}) AND ${cursorCondition}`;
   }
 
   private augmentOrderByIfNecessary(