@remix-run/data-table 0.4.0 → 0.5.1

package/README.md

@@ -11,7 +11,7 @@ Typed relational query toolkit for JavaScript runtimes.
 - **Relation-First Queries**: `hasMany`, `hasOne`, `belongsTo`, `hasManyThrough`, and nested eager loading
 - **Safe Scoped Writes**: `update`/`delete` with `orderBy`/`limit` run safely in a transaction
 - **First-Class Migrations**: Plain SQL `up.sql`/`down.sql` files with a journaling runner and dry-run planning
-- **Database Lifecycle Commands**: Wipe, migrate, inspect, seed, and reset through `remix db`
+- **Database Lifecycle Commands**: Wipe, migrate, rollback, inspect, seed, and reset through `remix db`
 - **Raw SQL Escape Hatch**: Execute SQL directly with `db.exec(sql\`...\`)`
 
 `data-table` gives you two complementary APIs:
@@ -409,7 +409,7 @@ environment variable at command runtime, and paths are resolved relative to `rem
 
 ```jsonc
 {
-  "$schema": "https://remix.run/schemas/remix.json",
+  "$schema": "./node_modules/remix/schema/remix.json",
   "db": {
     "adapter": {
       "type": "postgres",
@@ -433,12 +433,16 @@ Run lifecycle commands through the Remix CLI:
 remix db status
 remix db migrate
 remix db migrate --to 20260301113000_add_user_status
+remix db rollback
+remix db rollback --step 2
+remix db rollback --to 20260301113000_add_user_status
+remix db rollback --dry-run
 remix db seed
-remix db reset
-remix db wipe
+remix db reset --force
+remix db wipe --force
 ```
 
-`--to` accepts a bare migration id (`20260301113000`) or the full directory name (`20260301113000_add_user_status`).
+`rollback` reverts the most recently applied migration by default. Bound it with either `--step <count>` or `--to <migration>`, which reverts through the target migration inclusively. Migration targets accept a bare migration id (`20260301113000`) or the full directory name (`20260301113000_add_user_status`). Use `--dry-run` to report what would be reverted without changing the database.
 
 `remix db status` reports applied migrations whose files are no longer present as `missing`. If the journal table does not exist, it reports every migration as pending without creating the table. Forward migration runs stop before executing SQL when an applied journal entry is missing from the current migration set. Rollbacks skip those orphaned journal entries so migrations that are still present can be reverted.
 
@@ -473,6 +477,15 @@ for (let script of plan.sql) console.log(script)
 
 `to` and `step` are mutually exclusive. Omit `journalTable` to use `data_table_migrations`.
 
+Hosts that embed the database CLI can invoke the same rollback behavior through `runRemixDb()`:
+
+```ts
+import { runRemixDb } from 'remix/data-table/cli'
+
+await runRemixDb({ command: 'rollback', db, migrations })
+await runRemixDb({ command: 'rollback', db, migrations, step: 2, dryRun: true })
+```
+
 Database drivers with migration locking run the complete migration and journal lifecycle through the
 connection that owns the lock. This keeps advisory locks correctly paired when the driver uses a
 connection pool, including pools configured with a single connection.

package/dist/cli.d.ts

@@ -4,6 +4,28 @@ interface DatabaseCommandOptions {
     /** Database instance used by the command. */
     db: Database;
 }
+type RollbackBoundOptions = {
+    /**
+     * Reverts back through this migration, inclusive. Accepts a bare
+     * migration id or the full `id_name` directory form.
+     */
+    to: string;
+    step?: never;
+} | {
+    to?: never;
+    /** Reverts this many migrations. Defaults to `1`. */
+    step?: number;
+};
+type RollbackCommandOptions = DatabaseCommandOptions & RollbackBoundOptions & {
+    /** Reverts applied migrations, newest first. */
+    command: 'rollback';
+    /** Migrations to revert. */
+    migrations: Migrations;
+    /** Reports what would be reverted without running it. */
+    dryRun?: boolean;
+    /** Migration journal table. */
+    journalTable?: string;
+};
 /** Structured invocation options accepted by {@link runRemixDb}. */
 export type RunRemixDbOptions = (DatabaseCommandOptions & {
     /** Applies pending migrations. */
@@ -17,7 +39,7 @@ export type RunRemixDbOptions = (DatabaseCommandOptions & {
     to?: string;
     /** Migration journal table. */
     journalTable?: string;
-}) | (DatabaseCommandOptions & {
+}) | RollbackCommandOptions | (DatabaseCommandOptions & {
     /** Wipes, migrates, and optionally seeds the database. */
     command: 'reset';
     /** Migrations to apply after wiping the database. */

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE3D,UAAU,sBAAsB;IAC9B,6CAA6C;IAC7C,EAAE,EAAE,QAAQ,CAAA;CACb;AAED,oEAAoE;AACpE,MAAM,MAAM,iBAAiB,GACzB,CAAC,sBAAsB,GAAG;IACxB,kCAAkC;IAClC,OAAO,EAAE,SAAS,CAAA;IAClB,2BAA2B;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAA;IAChB,qDAAqD;IACrD,UAAU,EAAE,UAAU,CAAA;IACtB,yDAAyD;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,4CAA4C;IAC5C,OAAO,EAAE,MAAM,CAAA;IACf,6CAA6C;IAC7C,IAAI,EAAE,IAAI,CAAA;CACX,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,8CAA8C;IAC9C,OAAO,EAAE,QAAQ,CAAA;IACjB,6BAA6B;IAC7B,UAAU,EAAE,UAAU,CAAA;IACtB,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA;AAEN;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4D5E"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE3D,UAAU,sBAAsB;IAC9B,6CAA6C;IAC7C,EAAE,EAAE,QAAQ,CAAA;CACb;AAED,KAAK,oBAAoB,GACrB;IACE;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,CAAC,EAAE,KAAK,CAAA;CACb,GACD;IACE,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,qDAAqD;IACrD,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAEL,KAAK,sBAAsB,GAAG,sBAAsB,GAClD,oBAAoB,GAAG;IACrB,gDAAgD;IAChD,OAAO,EAAE,UAAU,CAAA;IACnB,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,yDAAyD;IACzD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAEH,oEAAoE;AACpE,MAAM,MAAM,iBAAiB,GACzB,CAAC,sBAAsB,GAAG;IACxB,kCAAkC;IAClC,OAAO,EAAE,SAAS,CAAA;IAClB,2BAA2B;IAC3B,UAAU,EAAE,UAAU,CAAA;IACtB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAC,GACF,sBAAsB,GACtB,CAAC,sBAAsB,GAAG;IACxB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAA;IAChB,qDAAqD;IACrD,UAAU,EAAE,UAAU,CAAA;IACtB,yDAAyD;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,4CAA4C;IAC5C,OAAO,EAAE,MAAM,CAAA;IACf,6CAA6C;IAC7C,IAAI,EAAE,IAAI,CAAA;CACX,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,8CAA8C;IAC9C,OAAO,EAAE,QAAQ,CAAA;IACjB,6BAA6B;IAC7B,UAAU,EAAE,UAAU,CAAA;IACtB,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAC,GACF,CAAC,sBAAsB,GAAG;IACxB,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA;AAEN;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2F5E"}

package/dist/cli.js

@@ -19,6 +19,31 @@ export async function runRemixDb(options) {
         }
         return 0;
     }
+    if (options.command === 'rollback') {
+        if (options.to !== undefined && options.step !== undefined) {
+            throw new Error('Cannot combine "to" and "step" migration options in the same run');
+        }
+        let result = options.to === undefined
+            ? await options.db.migrate(options.migrations, {
+                direction: 'down',
+                step: options.step ?? 1,
+                dryRun: options.dryRun,
+                journalTable: options.journalTable,
+            })
+            : await options.db.migrate(options.migrations, {
+                direction: 'down',
+                to: options.to,
+                dryRun: options.dryRun,
+                journalTable: options.journalTable,
+            });
+        if (result.reverted.length === 0) {
+            console.log('no migrations to revert');
+        }
+        for (let entry of result.reverted) {
+            console.log((options.dryRun ? 'would revert ' : 'reverted ') + entry.id + '_' + entry.name);
+        }
+        return 0;
+    }
     if (options.command === 'reset') {
         await options.db.reset({
             migrations: options.migrations,

package/dist/lib/database/relations.js

@@ -62,10 +62,11 @@ async function loadHasManyThroughValues(database, sourceRows, relation) {
     if (!relation.through) {
         throw new DataTableQueryError('hasManyThrough relation is missing through metadata');
     }
+    let through = relation.through;
     if (sourceRows.length === 0) {
         return [];
     }
-    let throughRelation = relation.through.relation;
+    let throughRelation = through.relation;
     let sourceTuples = uniqueTuples(sourceRows, throughRelation.sourceKey);
     if (sourceTuples.length === 0) {
         return sourceRows.map(() => []);
@@ -92,12 +93,12 @@ async function loadHasManyThroughValues(database, sourceRows, relation) {
         pagedThroughRowsBySource.set(sourceKey, pagedMatchedRows);
         pagedThroughRows.push(...pagedMatchedRows);
     }
-    let throughTuples = uniqueTuples(pagedThroughRows, relation.through.throughSourceKey);
+    let throughTuples = uniqueTuples(pagedThroughRows, through.throughSourceKey);
     if (throughTuples.length === 0) {
         return sourceRows.map(() => []);
     }
     let targetQuery = createQuery(relation.targetTable);
-    let targetPredicate = buildLinkPredicate(relation.through.throughTargetKey, throughTuples);
+    let targetPredicate = buildLinkPredicate(through.throughTargetKey, throughTuples);
     if (targetPredicate) {
         targetQuery = targetQuery.where(targetPredicate);
     }
@@ -105,23 +106,41 @@ async function loadHasManyThroughValues(database, sourceRows, relation) {
         includePagination: false,
     });
     let relatedRows = await loadRowsWithRelationsForQuery(database, targetQuery);
-    let targetRowsByThrough = groupRowsByTuple(relatedRows, relation.through.throughTargetKey);
-    return sourceRows.map((sourceRow) => {
+    let sourceKeysByThroughKey = new Map();
+    let outputRowsBySourceKey = new Map();
+    for (let sourceRow of sourceRows) {
         let sourceKey = getCompositeKey(sourceRow, throughRelation.sourceKey);
         let matchedThroughRows = pagedThroughRowsBySource.get(sourceKey) ?? [];
-        let outputRows = [];
-        let seen = new Set();
+        outputRowsBySourceKey.set(sourceKey, new Map());
         for (let throughRow of matchedThroughRows) {
-            let throughKey = getCompositeKey(throughRow, relation.through.throughSourceKey);
-            let rowsForThrough = targetRowsByThrough.get(throughKey) ?? [];
-            for (let row of rowsForThrough) {
-                let rowIdentity = getCompositeKey(row, getTablePrimaryKey(relation.targetTable));
-                if (!seen.has(rowIdentity)) {
-                    seen.add(rowIdentity);
-                    outputRows.push(row);
-                }
+            let throughKey = getCompositeKey(throughRow, through.throughSourceKey);
+            let sourceKeys = sourceKeysByThroughKey.get(throughKey);
+            if (!sourceKeys) {
+                sourceKeys = new Set();
+                sourceKeysByThroughKey.set(throughKey, sourceKeys);
+            }
+            sourceKeys.add(sourceKey);
+        }
+    }
+    let targetPrimaryKey = getTablePrimaryKey(relation.targetTable);
+    for (let row of relatedRows) {
+        let throughKey = getCompositeKey(row, through.throughTargetKey);
+        let sourceKeys = sourceKeysByThroughKey.get(throughKey);
+        if (!sourceKeys) {
+            continue;
+        }
+        let rowIdentity = getCompositeKey(row, targetPrimaryKey);
+        for (let sourceKey of sourceKeys) {
+            let outputRows = outputRowsBySourceKey.get(sourceKey);
+            if (!outputRows || outputRows.has(rowIdentity)) {
+                continue;
             }
+            outputRows.set(rowIdentity, row);
         }
+    }
+    return sourceRows.map((sourceRow) => {
+        let sourceKey = getCompositeKey(sourceRow, throughRelation.sourceKey);
+        let outputRows = Array.from(outputRowsBySourceKey.get(sourceKey)?.values() ?? []);
         return applyPagination(outputRows, relation.modifiers.limit, relation.modifiers.offset);
     });
 }

package/dist/lib/migrations/runner.js

@@ -15,7 +15,7 @@ function assertMigrationOperationOptions(options) {
     }
 }
 function resolveTargetOption(migrations, to) {
-    if (!to) {
+    if (to === undefined) {
         return undefined;
     }
     // Accept either a bare migration id or the full `id_name` directory form and

package/dist/lib/operators.d.ts

@@ -42,6 +42,7 @@ export type WhereObject<column extends string = string> = Partial<Record<column,
  * User-facing where input accepted by `query.where()` and relation modifiers.
  */
 export type WhereInput<column extends string = string> = Predicate<column> | WhereObject<column>;
+type WhereInputColumn<input extends WhereInput> = input extends Predicate<infer column> ? column : keyof input & string;
 /**
  * Builds an equality predicate.
  */
@@ -121,17 +122,17 @@ export declare function isNull<column extends string | ColumnReferenceLike>(colu
  */
 export declare function notNull<column extends string | ColumnReferenceLike>(column: column): Predicate<PredicateColumn<column>>;
 /**
- * Combines predicates with logical `AND`.
- * @param predicates Child predicates.
+ * Combines where inputs with logical `AND`.
+ * @param inputs Child predicates or object shorthand filters.
  * @returns A logical `and` predicate.
  */
-export declare function and<column extends string>(...predicates: Predicate<column>[]): Predicate<column>;
+export declare function and<inputs extends WhereInput[]>(...inputs: inputs): Predicate<WhereInputColumn<inputs[number]>>;
 /**
- * Combines predicates with logical `OR`.
- * @param predicates Child predicates.
+ * Combines where inputs with logical `OR`.
+ * @param inputs Child predicates or object shorthand filters.
  * @returns A logical `or` predicate.
  */
-export declare function or<column extends string>(...predicates: Predicate<column>[]): Predicate<column>;
+export declare function or<inputs extends WhereInput[]>(...inputs: inputs): Predicate<WhereInputColumn<inputs[number]>>;
 /**
  * Returns `true` when a value is a normalized predicate object.
  * @param value Value to inspect.

package/dist/lib/operators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../src/lib/operators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../src/lib/operators.ts"],"names":[],"mappings":"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"}

package/dist/lib/operators.js

@@ -109,22 +109,26 @@ export function notNull(column) {
     return { type: 'null', operator: 'notNull', column: resolvePredicateColumn(column) };
 }
 /**
- * Combines predicates with logical `AND`.
- * @param predicates Child predicates.
+ * Combines where inputs with logical `AND`.
+ * @param inputs Child predicates or object shorthand filters.
  * @returns A logical `and` predicate.
  */
-export function and(...predicates) {
-    let filtered = predicates.filter(Boolean);
-    return { type: 'logical', operator: 'and', predicates: filtered };
+export function and(...inputs) {
+    let predicates = inputs
+        .filter(Boolean)
+        .map((input) => normalizeWhereInput(input));
+    return { type: 'logical', operator: 'and', predicates };
 }
 /**
- * Combines predicates with logical `OR`.
- * @param predicates Child predicates.
+ * Combines where inputs with logical `OR`.
+ * @param inputs Child predicates or object shorthand filters.
  * @returns A logical `or` predicate.
  */
-export function or(...predicates) {
-    let filtered = predicates.filter(Boolean);
-    return { type: 'logical', operator: 'or', predicates: filtered };
+export function or(...inputs) {
+    let predicates = inputs
+        .filter(Boolean)
+        .map((input) => normalizeWhereInput(input));
+    return { type: 'logical', operator: 'or', predicates };
 }
 /**
  * Returns `true` when a value is a normalized predicate object.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/data-table",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "A typed, relational query toolkit for JavaScript",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",

package/src/cli.ts

@@ -6,6 +6,33 @@ interface DatabaseCommandOptions {
   db: Database
 }
 
+type RollbackBoundOptions =
+  | {
+      /**
+       * Reverts back through this migration, inclusive. Accepts a bare
+       * migration id or the full `id_name` directory form.
+       */
+      to: string
+      step?: never
+    }
+  | {
+      to?: never
+      /** Reverts this many migrations. Defaults to `1`. */
+      step?: number
+    }
+
+type RollbackCommandOptions = DatabaseCommandOptions &
+  RollbackBoundOptions & {
+    /** Reverts applied migrations, newest first. */
+    command: 'rollback'
+    /** Migrations to revert. */
+    migrations: Migrations
+    /** Reports what would be reverted without running it. */
+    dryRun?: boolean
+    /** Migration journal table. */
+    journalTable?: string
+  }
+
 /** Structured invocation options accepted by {@link runRemixDb}. */
 export type RunRemixDbOptions =
   | (DatabaseCommandOptions & {
@@ -21,6 +48,7 @@ export type RunRemixDbOptions =
       /** Migration journal table. */
       journalTable?: string
     })
+  | RollbackCommandOptions
   | (DatabaseCommandOptions & {
       /** Wipes, migrates, and optionally seeds the database. */
       command: 'reset'
@@ -76,6 +104,37 @@ export async function runRemixDb(options: RunRemixDbOptions): Promise<number> {
     return 0
   }
 
+  if (options.command === 'rollback') {
+    if (options.to !== undefined && options.step !== undefined) {
+      throw new Error('Cannot combine "to" and "step" migration options in the same run')
+    }
+
+    let result =
+      options.to === undefined
+        ? await options.db.migrate(options.migrations, {
+            direction: 'down',
+            step: options.step ?? 1,
+            dryRun: options.dryRun,
+            journalTable: options.journalTable,
+          })
+        : await options.db.migrate(options.migrations, {
+            direction: 'down',
+            to: options.to,
+            dryRun: options.dryRun,
+            journalTable: options.journalTable,
+          })
+
+    if (result.reverted.length === 0) {
+      console.log('no migrations to revert')
+    }
+
+    for (let entry of result.reverted) {
+      console.log((options.dryRun ? 'would revert ' : 'reverted ') + entry.id + '_' + entry.name)
+    }
+
+    return 0
+  }
+
   if (options.command === 'reset') {
     await options.db.reset({
       migrations: options.migrations,

package/src/lib/database/relations.ts

@@ -116,11 +116,13 @@ async function loadHasManyThroughValues(
     throw new DataTableQueryError('hasManyThrough relation is missing through metadata')
   }
 
+  let through = relation.through
+
   if (sourceRows.length === 0) {
     return []
   }
 
-  let throughRelation = relation.through.relation
+  let throughRelation = through.relation
   let sourceTuples = uniqueTuples(sourceRows, throughRelation.sourceKey)
 
   if (sourceTuples.length === 0) {
@@ -163,14 +165,14 @@ async function loadHasManyThroughValues(
     pagedThroughRows.push(...pagedMatchedRows)
   }
 
-  let throughTuples = uniqueTuples(pagedThroughRows, relation.through.throughSourceKey)
+  let throughTuples = uniqueTuples(pagedThroughRows, through.throughSourceKey)
 
   if (throughTuples.length === 0) {
     return sourceRows.map(() => [])
   }
 
   let targetQuery = createQuery(relation.targetTable)
-  let targetPredicate = buildLinkPredicate(relation.through.throughTargetKey, throughTuples)
+  let targetPredicate = buildLinkPredicate(through.throughTargetKey, throughTuples)
 
   if (targetPredicate) {
     targetQuery = targetQuery.where(
@@ -183,27 +185,54 @@ async function loadHasManyThroughValues(
   })
 
   let relatedRows = await loadRowsWithRelationsForQuery(database, targetQuery)
-  let targetRowsByThrough = groupRowsByTuple(relatedRows, relation.through.throughTargetKey)
+  let sourceKeysByThroughKey = new Map<string, Set<string>>()
+  let outputRowsBySourceKey = new Map<string, Map<string, Record<string, unknown>>>()
 
-  return sourceRows.map((sourceRow) => {
+  for (let sourceRow of sourceRows) {
     let sourceKey = getCompositeKey(sourceRow, throughRelation.sourceKey)
     let matchedThroughRows = pagedThroughRowsBySource.get(sourceKey) ?? []
-    let outputRows: Record<string, unknown>[] = []
-    let seen = new Set<string>()
+
+    outputRowsBySourceKey.set(sourceKey, new Map())
 
     for (let throughRow of matchedThroughRows) {
-      let throughKey = getCompositeKey(throughRow, relation.through!.throughSourceKey)
-      let rowsForThrough = targetRowsByThrough.get(throughKey) ?? []
+      let throughKey = getCompositeKey(throughRow, through.throughSourceKey)
+      let sourceKeys = sourceKeysByThroughKey.get(throughKey)
+
+      if (!sourceKeys) {
+        sourceKeys = new Set()
+        sourceKeysByThroughKey.set(throughKey, sourceKeys)
+      }
+
+      sourceKeys.add(sourceKey)
+    }
+  }
+
+  let targetPrimaryKey = getTablePrimaryKey(relation.targetTable)
 
-      for (let row of rowsForThrough) {
-        let rowIdentity = getCompositeKey(row, getTablePrimaryKey(relation.targetTable))
+  for (let row of relatedRows) {
+    let throughKey = getCompositeKey(row, through.throughTargetKey)
+    let sourceKeys = sourceKeysByThroughKey.get(throughKey)
 
-        if (!seen.has(rowIdentity)) {
-          seen.add(rowIdentity)
-          outputRows.push(row)
-        }
+    if (!sourceKeys) {
+      continue
+    }
+
+    let rowIdentity = getCompositeKey(row, targetPrimaryKey)
+
+    for (let sourceKey of sourceKeys) {
+      let outputRows = outputRowsBySourceKey.get(sourceKey)
+
+      if (!outputRows || outputRows.has(rowIdentity)) {
+        continue
       }
+
+      outputRows.set(rowIdentity, row)
     }
+  }
+
+  return sourceRows.map((sourceRow) => {
+    let sourceKey = getCompositeKey(sourceRow, throughRelation.sourceKey)
+    let outputRows = Array.from(outputRowsBySourceKey.get(sourceKey)?.values() ?? [])
 
     return applyPagination(outputRows, relation.modifiers.limit, relation.modifiers.offset)
   })

package/src/lib/migrations/runner.ts

@@ -63,7 +63,7 @@ function resolveTargetOption(
   migrations: MigrationDescriptor[],
   to: string | undefined,
 ): string | undefined {
-  if (!to) {
+  if (to === undefined) {
     return undefined
   }
 

package/src/lib/operators.ts

@@ -66,6 +66,9 @@ export type WhereObject<column extends string = string> = Partial<Record<column,
  */
 export type WhereInput<column extends string = string> = Predicate<column> | WhereObject<column>
 
+type WhereInputColumn<input extends WhereInput> =
+  input extends Predicate<infer column> ? column : keyof input & string
+
 /**
  * Builds an equality predicate.
  */
@@ -293,23 +296,33 @@ export function notNull<column extends string | ColumnReferenceLike>(
 }
 
 /**
- * Combines predicates with logical `AND`.
- * @param predicates Child predicates.
+ * Combines where inputs with logical `AND`.
+ * @param inputs Child predicates or object shorthand filters.
  * @returns A logical `and` predicate.
  */
-export function and<column extends string>(...predicates: Predicate<column>[]): Predicate<column> {
-  let filtered = predicates.filter(Boolean)
-  return { type: 'logical', operator: 'and', predicates: filtered }
+export function and<inputs extends WhereInput[]>(
+  ...inputs: inputs
+): Predicate<WhereInputColumn<inputs[number]>> {
+  type column = WhereInputColumn<inputs[number]>
+  let predicates = inputs
+    .filter(Boolean)
+    .map((input) => normalizeWhereInput(input) as Predicate<column>)
+  return { type: 'logical', operator: 'and', predicates }
 }
 
 /**
- * Combines predicates with logical `OR`.
- * @param predicates Child predicates.
+ * Combines where inputs with logical `OR`.
+ * @param inputs Child predicates or object shorthand filters.
  * @returns A logical `or` predicate.
  */
-export function or<column extends string>(...predicates: Predicate<column>[]): Predicate<column> {
-  let filtered = predicates.filter(Boolean)
-  return { type: 'logical', operator: 'or', predicates: filtered }
+export function or<inputs extends WhereInput[]>(
+  ...inputs: inputs
+): Predicate<WhereInputColumn<inputs[number]>> {
+  type column = WhereInputColumn<inputs[number]>
+  let predicates = inputs
+    .filter(Boolean)
+    .map((input) => normalizeWhereInput(input) as Predicate<column>)
+  return { type: 'logical', operator: 'or', predicates }
 }
 
 /**