@expo/entity-database-adapter-knex 0.46.0 → 0.48.0

package/package.json

@@ -1,15 +1,18 @@
 {
   "name": "@expo/entity-database-adapter-knex",
-  "version": "0.46.0",
+  "version": "0.48.0",
   "description": "Knex database adapter for @expo/entity",
   "files": [
     "build",
+    "!*.tsbuildinfo",
+    "!__*",
     "src"
   ],
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "scripts": {
     "build": "tsc --build",
+    "prepack": "rm -rf build && yarn build",
     "clean": "yarn build --clean",
     "lint": "yarn run --top-level eslint src",
     "lint-fix": "yarn lint --fix",
@@ -25,14 +28,14 @@
   "author": "Expo",
   "license": "MIT",
   "dependencies": {
-    "@expo/entity": "^0.46.0",
+    "@expo/entity": "^0.48.0",
     "knex": "^3.1.0"
   },
   "devDependencies": {
-    "@expo/entity-testing-utils": "^0.46.0",
+    "@expo/entity-testing-utils": "^0.48.0",
     "@jest/globals": "^30.0.0",
     "pg": "8.14.1",
     "typescript": "^5.8.3"
   },
-  "gitHead": "79f61f8d7f7f024e4e9a557473a5737eedb3ffe6"
+  "gitHead": "7b4bec8f841fecdb30af306441b540c0efae1603"
 }

package/src/__integration-tests__/PostgresEntityIntegration-test.ts

@@ -256,6 +256,33 @@ describe('postgres entity integration', () => {
     });
   });
 
+  describe.only('BYTEA fields', () => {
+    it('supports BYTEA fields', async () => {
+      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
+
+      const buffer = Buffer.from('hello world');
+      let entity = await enforceAsyncResult(
+        PostgresTestEntity.creatorWithAuthorizationResults(vc1)
+          .setField('binaryField', buffer)
+          .createAsync(),
+      );
+      expect(entity.getField('binaryField')).toEqual(buffer);
+
+      // load the entity in a different viewer context to ensure field deserialization works from db
+      const vc2 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
+      const entityLoaded = await PostgresTestEntity.loader(vc2).loadByIDAsync(entity.getID());
+      expect(entityLoaded.getField('binaryField')).toEqual(buffer);
+
+      const updatedBuffer = Buffer.from('updated hello world');
+      entity = await enforceAsyncResult(
+        PostgresTestEntity.updaterWithAuthorizationResults(entity)
+          .setField('binaryField', updatedBuffer)
+          .updateAsync(),
+      );
+      expect(entity.getField('binaryField')).toEqual(updatedBuffer);
+    });
+  });
+
   it('supports single field and composite field equality loading', async () => {
     const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
 

package/src/__testfixtures__/PostgresTestEntity.ts

@@ -11,6 +11,7 @@ import {
   StringField,
   UUIDField,
   ViewerContext,
+  BufferField,
 } from '@expo/entity';
 import { Knex } from 'knex';
 
@@ -29,6 +30,7 @@ type PostgresTestEntityFields = {
   dateField: Date | null;
   maybeJsonArrayField: string[] | { hello: string } | null;
   bigintField: string | null;
+  binaryField: Buffer | null;
 };
 
 export class PostgresTestEntity extends Entity<PostgresTestEntityFields, 'id', ViewerContext> {
@@ -61,6 +63,7 @@ export class PostgresTestEntity extends Entity<PostgresTestEntityFields, 'id', V
         table.dateTime('date_field', { useTz: true });
         table.jsonb('maybe_json_array_field');
         table.bigint('bigint_field');
+        table.binary('binary_field');
       });
     }
     await knex.into(tableName).truncate();
@@ -153,6 +156,9 @@ export const postgresTestEntityConfiguration = new EntityConfiguration<
     bigintField: new BigIntField({
       columnName: 'bigint_field',
     }),
+    binaryField: new BufferField({
+      columnName: 'binary_field',
+    }),
   },
   databaseAdapterFlavor: 'postgres',
   cacheAdapterFlavor: 'redis',

package/build/src/__integration-tests__/EntityCreationUtils-test.d.ts

@@ -1 +0,0 @@
-export {};

package/build/src/__integration-tests__/EntityCreationUtils-test.js

@@ -1,105 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const entity_1 = require("@expo/entity");
-const globals_1 = require("@jest/globals");
-const knex_1 = __importDefault(require("knex"));
-const nullthrows_1 = __importDefault(require("nullthrows"));
-const PostgresUniqueTestEntity_1 = require("../__testfixtures__/PostgresUniqueTestEntity");
-const createKnexIntegrationTestEntityCompanionProvider_1 = require("../__testfixtures__/createKnexIntegrationTestEntityCompanionProvider");
-(0, globals_1.describe)(entity_1.createWithUniqueConstraintRecoveryAsync, () => {
-    let knexInstance;
-    (0, globals_1.beforeAll)(() => {
-        knexInstance = (0, knex_1.default)({
-            client: 'pg',
-            connection: {
-                user: (0, nullthrows_1.default)(process.env['PGUSER']),
-                password: (0, nullthrows_1.default)(process.env['PGPASSWORD']),
-                host: 'localhost',
-                port: parseInt((0, nullthrows_1.default)(process.env['PGPORT']), 10),
-                database: (0, nullthrows_1.default)(process.env['PGDATABASE']),
-            },
-        });
-    });
-    (0, globals_1.beforeEach)(async () => {
-        await PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createOrTruncatePostgresTableAsync(knexInstance);
-    });
-    (0, globals_1.afterAll)(async () => {
-        await PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.dropPostgresTableAsync(knexInstance);
-        await knexInstance.destroy();
-    });
-    globals_1.describe.each([true, false])('is parallel creations %p', (parallel) => {
-        (0, globals_1.it)('recovers when the same entity is created twice outside of transaction', async () => {
-            const vc1 = new entity_1.ViewerContext((0, createKnexIntegrationTestEntityCompanionProvider_1.createKnexIntegrationTestEntityCompanionProvider)(knexInstance));
-            const args = {
-                name: 'unique',
-            };
-            let createdEntities;
-            if (parallel) {
-                createdEntities = await Promise.all([
-                    (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args),
-                    (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args),
-                ]);
-            }
-            else {
-                createdEntities = [
-                    await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args),
-                    await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args),
-                ];
-            }
-            (0, globals_1.expect)(createdEntities[0].getID()).toEqual(createdEntities[1].getID());
-        });
-        (0, globals_1.it)('recovers when the same entity is created twice within same transaction', async () => {
-            const vc1 = new entity_1.ViewerContext((0, createKnexIntegrationTestEntityCompanionProvider_1.createKnexIntegrationTestEntityCompanionProvider)(knexInstance));
-            const args = {
-                name: 'unique',
-            };
-            const createdEntities = await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-                if (parallel) {
-                    return await Promise.all([
-                        (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext),
-                        (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext),
-                    ]);
-                }
-                else {
-                    return [
-                        await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext),
-                        await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext),
-                    ];
-                }
-            });
-            (0, globals_1.expect)((0, nullthrows_1.default)(createdEntities[0]).getID()).toEqual((0, nullthrows_1.default)(createdEntities[1]).getID());
-        });
-        (0, globals_1.it)('recovers when the same entity is created twice within two transactions', async () => {
-            const vc1 = new entity_1.ViewerContext((0, createKnexIntegrationTestEntityCompanionProvider_1.createKnexIntegrationTestEntityCompanionProvider)(knexInstance));
-            const args = {
-                name: 'unique',
-            };
-            let createdEntities;
-            if (parallel) {
-                createdEntities = await Promise.all([
-                    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-                        return await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext);
-                    }),
-                    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-                        return await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext);
-                    }),
-                ]);
-            }
-            else {
-                createdEntities = [
-                    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-                        return await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext);
-                    }),
-                    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-                        return await (0, entity_1.createWithUniqueConstraintRecoveryAsync)(vc1, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.getByNameAsync, args, PostgresUniqueTestEntity_1.PostgresUniqueTestEntity.createWithNameAsync, args, queryContext);
-                    }),
-                ];
-            }
-            (0, globals_1.expect)((0, nullthrows_1.default)(createdEntities[0]).getID()).toEqual((0, nullthrows_1.default)(createdEntities[1]).getID());
-        });
-    });
-});
-//# sourceMappingURL=EntityCreationUtils-test.js.map

package/build/src/__integration-tests__/EntityCreationUtils-test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"EntityCreationUtils-test.js","sourceRoot":"","sources":["../../../src/__integration-tests__/EntityCreationUtils-test.ts"],"names":[],"mappings":"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"}

package/build/src/__integration-tests__/PostgresEntityIntegration-test.d.ts

@@ -1 +0,0 @@
-export {};