fix next branch following rebase.

..
...

...

Author: igalklebanov

pnpm-lock.yaml

@@ -328,7 +328,7 @@ export class Migrator {
       await this.#ensureMigrationLockTableExists()
       await this.#ensureLockRowExists()
 
-      return await this.#runMigrations(getMigrationDirectionAndStep)
+      return await this.#runMigrations(getMigrationDirectionAndStep, options)
     } catch (error) {
       if (error instanceof MigrationResultSetError) {
         return error.resultSet

src/migration/migrator.ts

@@ -503,19 +503,21 @@ for (const dialect of DIALECTS) {
 
       expect(typeof result.bigNumber).to.equal(
         {
+          pglite: 'number',
           postgres: 'string',
           mysql: 'string',
           mssql: 'number',
           sqlite: 'number',
-        }[dialect],
+        }[variant],
       )
       expect(typeof result.number).to.equal(
         {
+          pglite: 'number',
           postgres: 'number',
           mysql: 'string',
           mssql: 'number',
           sqlite: 'number',
-        }[dialect],
+        }[variant],
       )
       expect(typeof result.dehydrated.bigNumber).to.equal('number')
       expect(typeof result.dehydrated.number).to.equal('number')
@@ -544,9 +546,9 @@ for (const dialect of DIALECTS) {
           mysql: 'object',
           mssql: 'object',
           sqlite: 'string',
-        }[dialect],
+        }[sqlSpec],
       )
-      if (dialect !== 'sqlite') {
+      if (sqlSpec !== 'sqlite') {
         expect(result.date instanceof Date).to.equal(true)
       }
       expect(typeof result.dehydrated.date).to.equal('string')
@@ -556,19 +558,24 @@ for (const dialect of DIALECTS) {
     })
 
     it('should dehydrate Buffer to string in jsonArrayFrom', async () => {
-      const buffer = {
-        postgres: sql<Buffer>`'\\xDEADBEEF'::bytea`,
-        mysql: sql<Buffer>`UNHEX('DEADBEEF')`,
-        mssql: sql<Buffer>`CAST('DEADBEEF' AS VARBINARY)`,
-        sqlite: sql<Buffer>`X'DEADBEEF'`,
-      }[dialect].as('buffer')
+      const buffer = (
+        {
+          pglite: sql<Uint8Array>`'\\xDEADBEEF'::bytea`,
+          postgres: sql<Buffer>`'\\xDEADBEEF'::bytea`,
+          mysql: sql<Buffer>`UNHEX('DEADBEEF')`,
+          mssql: sql<Buffer>`CAST('DEADBEEF' AS VARBINARY)`,
+          sqlite: sql<Buffer>`X'DEADBEEF'`,
+        }[variant] satisfies RawBuilder<Buffer | Uint8Array> as RawBuilder<
+          Buffer | Uint8Array
+        >
+      ).as('buffer')
 
       const result = await db
         .selectNoFrom([
           buffer,
           jsonObjectFrom(
             db.selectNoFrom([
-              dialect === 'sqlite'
+              sqlSpec === 'sqlite'
                 ? expressionBuilder()
                     .cast<string>(buffer.expression, 'text')
                     .as('buffer')
@@ -581,10 +588,14 @@ for (const dialect of DIALECTS) {
         .executeTakeFirstOrThrow()
 
       expect(typeof result.buffer).to.equal('object')
-      expect(Buffer.isBuffer(result.buffer)).to.equal(true)
+      expect(
+        variant === 'pglite'
+          ? ArrayBuffer.isView(result.buffer)
+          : Buffer.isBuffer(result.buffer),
+      ).to.equal(true)
       expect(typeof result.dehydrated.buffer).to.equal('string')
 
-      const expectedType0: Buffer = result.buffer
+      const expectedType0: Buffer | Uint8Array = result.buffer
       const expectedType1: string = result.dehydrated.buffer
     })
   })

test/node/src/json.test.ts

@@ -1,5 +1,6 @@
 import * as path from 'node:path'
 import { promises as fs } from 'node:fs'
+import { setTimeout } from 'node:timers/promises'
 
 import {
   FileMigrationProvider,
@@ -1078,7 +1079,7 @@ for (const dialect of DIALECTS) {
       })
     })
 
-    if (dialect === 'postgres' || dialect === 'mssql') {
+    if (sqlSpec === 'postgres' || sqlSpec === 'mssql') {
       describe('custom migration tables in a custom schema', () => {
         it('should create custom migration tables in custom schema', async () => {
           const [migrator, executedUpMethods] = createMigrations(
@@ -1172,7 +1173,7 @@ for (const dialect of DIALECTS) {
             ...migrations,
             [config.name]: {
               async up(_db): Promise<void> {
-                await sleep(20)
+                await setTimeout(20)
 
                 if (config.error) {
                   throw new Error(config.error)
@@ -1182,7 +1183,7 @@ for (const dialect of DIALECTS) {
               },
 
               async down(_db): Promise<void> {
-                await sleep(20)
+                await setTimeout(20)
 
                 if (config.error) {
                   throw new Error(config.error)
@@ -1218,10 +1219,6 @@ for (const dialect of DIALECTS) {
         (it) => it.name === tableName && (!schema || it.schema === schema),
       )
     }
-
-    function sleep(millis: number): Promise<void> {
-      return new Promise((resolve) => setTimeout(resolve, millis))
-    }
   })
 }
 

test/node/src/migration.test.ts

@@ -437,7 +437,7 @@ for (const dialect of DIALECTS) {
       })
     }
 
-    if (dialect === 'sqlite') {
+    if (sqlSpec === 'sqlite') {
       it('should order and limit the amount of updated rows and return', async () => {
         const query = ctx.db
           .updateTable('person')