feat: dataloaders within transactions

2026-11-13 20:28:06 -10:00 · 2020-12-10 15:34:56 -08:00
201 changed files with 7435 additions and 15954 deletions
@@ -10,8 +10,7 @@
  "rules": {
    "no-restricted-imports": ["error",{ "paths": [".", "..", "../.."] }],
    "tsdoc/syntax": "warn",
-    "no-console": "warn",
-    "handle-callback-err": "off"
+    "no-console": "warn"
  },
  "overrides": [
    {
@@ -3,16 +3,16 @@ name: docs
 on:
  push:
    branches:
-      - main
+      - master

 jobs:
  deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
-          node-version: 18.x
+          node-version: 12.x
      - name: Cache Node.js modules
        uses: actions/cache@v1
        with:
@@ -2,7 +2,7 @@ name: tests

 on:
  push:
-    branches: [ main ]
+    branches: [ master ]
  pull_request:

 jobs:
@@ -14,7 +14,7 @@ jobs:
        ref: ${{ github.event.pull_request.head.sha }}
    - uses: actions/setup-node@v1
      with:
-        node-version: 18.x
+        node-version: 12.x
    - name: Cache Node.js modules
      uses: actions/cache@v1
      with:
@@ -3,337 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package root
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package root
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* add example of redis mget batching using @expo/batcher ([#199](https://github.com/expo/entity/issues/199)) ([684f91b](https://github.com/expo/entity/commit/684f91b1f270851dbe331df2e2620664eea17266))
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-
-### Features
-
-* add BigIntField ([#193](https://github.com/expo/entity/issues/193)) ([acbad82](https://github.com/expo/entity/commit/acbad826a37bb5a054b4dcf9be91d11aa5f7f29a))
-* nested transactions ([#194](https://github.com/expo/entity/issues/194)) ([a77b914](https://github.com/expo/entity/commit/a77b914ad6dc018d1e309c9caf4971088a553ecf))
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-
-### Features
-
-* add orderByRaw to loadManyByRawWhereClauseAsync ([#185](https://github.com/expo/entity/issues/185)) ([2817d78](https://github.com/expo/entity/commit/2817d78392dfecd0093111c24d581bdf01dba06d))
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-
-### Features
-
-* recache to higher cache levels when loading from a composed cache ([#182](https://github.com/expo/entity/pull/182))
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Bug Fixes
-
-* fix workflow branch specification ([#179](https://github.com/expo/entity/issues/179)) ([25d14bf](https://github.com/expo/entity/commit/25d14bf8c1688524ad488aa2b63221393a4f0b05))
-
-
-### Features
-
-* add EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY ([#178](https://github.com/expo/entity/issues/178)) ([a0c35dd](https://github.com/expo/entity/commit/a0c35ddd7bca05d0c3f41dcf48e16d058918231c))
-* update ioredis to v5, make it a devDependency of the cache packages ([#172](https://github.com/expo/entity/issues/172)) ([9fcfbf7](https://github.com/expo/entity/commit/9fcfbf746a61554cefedf7fb0f1a3a9056b58ffe))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-
-### Bug Fixes
-
-* lock lru-cache to v6.0.0 ([#170](https://github.com/expo/entity/issues/170)) ([293868b](https://github.com/expo/entity/commit/293868b1a73df9f749216af68b1ae94ac22ac2b9))
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-
-### Bug Fixes
-
-* lru-cache yarn workspace version resolution ([#168](https://github.com/expo/entity/issues/168)) ([e76ca8c](https://github.com/expo/entity/commit/e76ca8c2f72da84aa372a64ef1898ade220ed0a8))
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-
-### Bug Fixes
-
-* add composed cache to index ([#166](https://github.com/expo/entity/issues/166)) ([5c82edc](https://github.com/expo/entity/commit/5c82edcd9f26854878d29950a05852e117bbd723))
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-
-### Features
-
-* add local memory cache package  ([#158](https://github.com/expo/entity/issues/158)) ([85d3575](https://github.com/expo/entity/commit/85d35752fa0919a62efb776a762a6829e83ca7af))
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157)) 
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Breaking changes
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. Affects any classes extending the EntityCacheAdapter and relying on the transformation behavior of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-
-### Features
-
-* Upgrade knex to 1.x in `@expo/entity-database-adapter-knex` ([#150](https://github.com/expo/entity/issues/150)) ([e1b0ee5](https://github.com/expo/entity/commit/e1b0ee528175646239d88aa71ffce73983eeb52f))
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-
-### Features
-
-* add pre-commit callbacks on EntityQueryContext ([#147](https://github.com/expo/entity/issues/147)) ([f1d9847](https://github.com/expo/entity/commit/f1d9847210f5775de964509e44ce493e44482b21))
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-
-### Bug Fixes
-
-* separate post-commit invalidation callbacks from trigger and user callbacks ([#144](https://github.com/expo/entity/issues/144)) ([efa131e](https://github.com/expo/entity/commit/efa131ef29532accf0e51b6d867ffe15a27b4c90))
-
-
-### Features
-
-* add cascading deletion info ([#145](https://github.com/expo/entity/issues/145)) ([3727191](https://github.com/expo/entity/commit/372719176742d3ead6b7cbca29cb66b09b3fe09c))
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-
-### Features
-
-* add authorization metrics ([#142](https://github.com/expo/entity/issues/142)) ([7cf54d8](https://github.com/expo/entity/commit/7cf54d83c52e104159a3e2e675cdda2d29afe204))
-* add IP support ([#138](https://github.com/expo/entity/issues/138)) ([1405a91](https://github.com/expo/entity/commit/1405a9126ee3a56c3e2a38bf3b697283744f5b5d))
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* expose describeFieldTestCase for use in other packages ([#139](https://github.com/expo/entity/issues/139)) ([1220477](https://github.com/expo/entity/commit/1220477aa331349b482ad015b44f76fa2bda7b90))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-* use better QueryContext types for transactional triggers and validators ([#136](https://github.com/expo/entity/issues/136)) ([5c7efe1](https://github.com/expo/entity/commit/5c7efe1678424ff907687e9327175bdc2538c3e0))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-
-### Features
-
-* Add IntField and FloatField, deprecate NumberField ([#131](https://github.com/expo/entity/issues/131)) ([2f2d963](https://github.com/expo/entity/commit/2f2d963cf92c6575d78f8eeca344a4aadcc9b8d9))
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-
-### Features
-
-* allow null field values in loadManyByFieldEqualityConjunctionAsync ([#130](https://github.com/expo/entity/issues/130)) ([2f37dc6](https://github.com/expo/entity/commit/2f37dc6a37d368b12b3c8375e04f0777fd448797))
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-* upgrade some other packages to fix dependabot alerts ([#126](https://github.com/expo/entity/issues/126)) ([226bffe](https://github.com/expo/entity/commit/226bffe0a95d7b8a3e9e9d46aebdb0edf1eeec1a))
-* use column name instead of field name for redis cache key ([#124](https://github.com/expo/entity/issues/124)) ([d78f452](https://github.com/expo/entity/commit/d78f452bb3ac5527069813a03f5b2264375bd8ab))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-
-### Bug Fixes
-
-* typescript typedef of EntityMutationInfo ([#121](https://github.com/expo/entity/issues/121)) ([8e8f0dc](https://github.com/expo/entity/commit/8e8f0dc8636e343e29a6012d155e4111477a8989))
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-
-### Bug Fixes
-
-* mutation validator and trigger cyclic import structure ([#118](https://github.com/expo/entity/issues/118)) ([b11dbc0](https://github.com/expo/entity/commit/b11dbc087ba5ad13c748032698dd73279b7960b0))
-
-
-### Features
-
-* add mutation type to validator and trigger execute functions ([#119](https://github.com/expo/entity/issues/119)) ([ef40fa5](https://github.com/expo/entity/commit/ef40fa5e9cdf53e25e78a9423c698e6d1c9737af))
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Bug Fixes
-
-* allow undefined value for all fields ([#114](https://github.com/expo/entity/issues/114)) ([022e0e9](https://github.com/expo/entity/commit/022e0e9b88a5e84e0c1bc6c8810c850beb05f0cf))
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* move runInTransaction to ViewerContext ([#108](https://github.com/expo/entity/issues/108)) ([b7309e1](https://github.com/expo/entity/commit/b7309e18a2dd780b64cd306d566de1f12bf8df3a))
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-### Features
-
-* better typing on filterMap for use with predicates ([#106](https://github.com/expo/entity/issues/106)) ([01b3bfe](https://github.com/expo/entity/commit/01b3bfef7c6da55e7d89d8cccb52a0050187aee8))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Bug Fixes
-
-* add type generic default in test utils ([#104](https://github.com/expo/entity/issues/104)) ([fe2917e](https://github.com/expo/entity/commit/fe2917e6b5af808f166aa354d476e168c41e6d21))
-* maps utils invariants for collections containing undefined values ([#103](https://github.com/expo/entity/issues/103)) ([29c1a43](https://github.com/expo/entity/commit/29c1a434ab6cd8d30e9f0e7c742065c8d46d8d8a))
-* remove any cast from EntityLoader ([#100](https://github.com/expo/entity/issues/100)) ([b8e07f9](https://github.com/expo/entity/commit/b8e07f9ddc4077768980c000d61f5ddcc824e2e3))
-
-
-### Features
-
-* better cache adapter error handling ([#102](https://github.com/expo/entity/issues/102)) ([15546aa](https://github.com/expo/entity/commit/15546aad97734ab9ac67f1c012485f096a0e94f1))
-* better database adapter error handling ([#101](https://github.com/expo/entity/issues/101)) ([5208aee](https://github.com/expo/entity/commit/5208aeedb0192f0460ba3d575770a04175f5c3aa))
-
-
-
-
-
 # [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)


@@ -4,7 +4,7 @@ Entity is a privacy-aware data layer for defining, caching, and authorizing acce

 [![tests](https://github.com/expo/entity/workflows/tests/badge.svg)](https://github.com/expo/entity/actions?query=workflow%3Atests)
 [![docs](https://github.com/expo/entity/workflows/docs/badge.svg)](https://expo.github.io/entity/)
-[![codecov](https://codecov.io/gh/expo/entity/branch/main/graph/badge.svg)](https://codecov.io/gh/expo/entity)
+[![codecov](https://codecov.io/gh/expo/entity/branch/master/graph/badge.svg)](https://codecov.io/gh/expo/entity)
 [![npm](https://img.shields.io/npm/v/@expo/entity)](https://www.npmjs.com/package/@expo/entity)
 [![NPM](https://img.shields.io/npm/l/@expo/entity)](https://www.npmjs.com/package/@expo/entity)

@@ -80,10 +80,18 @@ Note: The entity framework instance should not be shared across multiple request

 ## Releasing

-To release a new version:
-1. `git checkout main`
-1. `yarn lerna publish [patch|minor|major] -- --conventional-commits`
+To release a new version, let's say `v1.0.0` for example:
+1. `git checkout -b bump-v1.0.0`
+1. `yarn lerna version minor -- --no-push --conventional-commits`
+1. `git push -u origin bump-v1.0.0`
+1. Create a PR from the `bump-v1.0.0` branch, wait for tests, and commit the PR using GitHub interface.
+1. `git checkout master && git pull`
+1. `git tag -d v1.0.0`
+1. `git tag v1.0.0`
+1. `git push origin v1.0.0`
 1. In GitHub release interface, create a new release from the tag, copy changelog changes to release description.
+1. `yarn clean && yarn tsc`
+1. In each public subpackage, run `npm publish` and enter 2FA token.

 ## License

@@ -4,5 +4,5 @@
  ],
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.31.0"
+  "version": "0.10.0"
 }
@@ -1,14 +1,11 @@
 {
  "name": "root",
  "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
  "scripts": {
    "tsc": "lerna run tsc",
    "clean": "lerna run clean",
    "lint": "lerna run lint",
-    "lint-fix": "lerna run lint-fix",
    "test": "lerna run test",
    "integration": "./resources/run-with-docker lerna run integration-no-setup",
    "prepublish": "lerna link && lerna run clean",
@@ -16,41 +13,33 @@
    "barrelsby": "lerna run barrelsby"
  },
  "devDependencies": {
-    "@expo/batcher": "^1.0.0",
    "@expo/entity": "file:packages/entity",
    "@expo/results": "^1.0.0",
    "@types/invariant": "^2.2.33",
+    "@types/ioredis": "^4.17.3",
    "@types/jest": "^26.0.10",
-    "@types/jsbn": "^1.2.29",
-    "@types/lru-cache": "^5.1.1",
    "@types/node": "^14.6.0",
    "@types/uuid": "^8.3.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
+    "@typescript-eslint/parser": "^3.10.1",
    "barrelsby": "^2.2.0",
    "eslint": "^7.7.0",
-    "eslint-config-universe": "^7.0.0",
-    "eslint-plugin-tsdoc": "^0.2.16",
-    "ioredis": "^5.2.5",
-    "jest": "^26.6.3",
-    "lerna": "^5.4.0",
-    "lru-cache": "^6.0.0",
-    "nullthrows": "^1.1.1",
-    "pg": "^8.6.0",
-    "prettier": "^2.3.2",
-    "ts-jest": "~26.4.4",
+    "eslint-config-universe": "^4.0.0",
+    "eslint-plugin-tsdoc": "^0.2.6",
+    "jest": "^26.4.2",
+    "lerna": "^3.22.1",
+    "pg": "^8.3.2",
+    "prettier": "^2.1.0",
+    "ts-jest": "~26.2.0",
    "ts-mockito": "^2.6.1",
-    "typedoc": "^0.23.10",
-    "typescript": "^4.6.3",
+    "typedoc": "^0.17.6",
+    "typedoc-plugin-lerna-packages": "^0.3.0",
+    "typescript": "^4.0.2",
    "uuid": "^8.3.0"
  },
  "dependencies": {
    "@expo/entity": "file:packages/entity",
-    "@expo/entity-cache-adapter-local-memory": "file:packages/entity-cache-adapter-local-memory",
    "@expo/entity-cache-adapter-redis": "file:packages/entity-cache-adapter-redis",
-    "@expo/entity-database-adapter-knex": "file:packages/entity-database-adapter-knex",
-    "@expo/entity-ip-address-field": "file:packages/entity-ip-address-field",
-    "@expo/entity-secondary-cache-local-memory": "file:packages/entity-secondary-cache-local-memory",
-    "@expo/entity-secondary-cache-redis": "file:packages/entity-secondary-cache-redis"
+    "@expo/entity-database-adapter-knex": "file:packages/entity-database-adapter-knex"
  }
 }
@@ -1,108 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-
-### Bug Fixes
-
-* lock lru-cache to v6.0.0 ([#170](https://github.com/expo/entity/issues/170)) ([293868b](https://github.com/expo/entity/commit/293868b1a73df9f749216af68b1ae94ac22ac2b9))
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-
-### Bug Fixes
-
-* lru-cache yarn workspace version resolution ([#168](https://github.com/expo/entity/issues/168)) ([e76ca8c](https://github.com/expo/entity/commit/e76ca8c2f72da84aa372a64ef1898ade220ed0a8))
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-
-### Features
-
-* add local memory cache package  ([#158](https://github.com/expo/entity/issues/158)) ([85d3575](https://github.com/expo/entity/commit/85d35752fa0919a62efb776a762a6829e83ca7af))
@@ -1,49 +0,0 @@
-# `@expo/entity-cache-adapter-local-memory`
-
-Cross-request [LRU](https://github.com/isaacs/node-lru-cache) cache adapter for `@expo/entity`. Use
-this cache with caution - it is nonstandard. The cache is shared between requests in the node process.
-
-Note: This uses version 6.0.0 of `node-lru-cache` since it the most tuned version for our use case (low TTL + LRU). Upgrading
-to 7.x will cause high memory usage for the entity cache adapter use case since it allocates fixed-size data structures up front to tune for the non-TTL use case: https://github.com/isaacs/node-lru-cache/issues/208.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_cache_adapter_local_memory.html)
-
-## Why NOT use this cache
-
-Because this is an in-memory cache, cross-machine invalidation is not possible. Do not use this cache
-if you have the following use cases:
-
- The objects stored are mutable
- Reading a stale object from the cache is not acceptable in your application
- Cross-machine invalidation is not possible
-
-## Typical use cases
-
-If your application sees many requests fetching the same objects, you can save a trip to your cache
-cluster and backing datastore by using this in-memory cache. Here are some good use cases:
-
- The objects stored are mostly immutable, and reading a stale object for a short TTL is acceptable
- You have a low TTL setting in your cache
-
-## Usage
-
-During `EntityCompanionProvider` instantiation:
-
-```typescript
-export const createDefaultEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    {
-      ...
-    },
-    {
-      ['local-memory']: {
-        cacheAdapterProvider: new LocalMemoryCacheAdapterProvider.getProvider(),
-      },
-    }
-  );
-};
-
-```
@@ -1,38 +0,0 @@
-{
-  "name": "@expo/entity-cache-adapter-local-memory",
-  "version": "0.31.0",
-  "description": "Cross-request local memory cache adapter for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
-  },
-  "engines": {
-    "node": ">=12"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*"
-  },
-  "dependencies": {
-    "lru-cache": "^6.0.0"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.31.0"
-  }
-}
@@ -1,82 +0,0 @@
-import { CacheLoadResult, CacheStatus, IEntityGenericCacher } from '@expo/entity';
-import LRUCache from 'lru-cache';
-
-// Sentinel value we store in local memory to negatively cache a database miss.
-// The sentinel value is distinct from any (positively) cached value.
-export const DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = Symbol('doesNotExist');
-type LocalMemoryCacheValue<TFields> = Readonly<TFields> | typeof DOES_NOT_EXIST_LOCAL_MEMORY_CACHE;
-export type LocalMemoryCache<TFields> = LRUCache<string, LocalMemoryCacheValue<TFields>>;
-
-export default class GenericLocalMemoryCacher<TFields> implements IEntityGenericCacher<TFields> {
-  constructor(private readonly localMemoryCache: LocalMemoryCache<TFields>) {}
-
-  static createLRUCache<TFields>(
-    options: { maxSize?: number; ttlSeconds?: number } = {}
-  ): LocalMemoryCache<TFields> {
-    const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
-    const DEFAULT_LRU_CACHE_SIZE = 10000;
-    const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
-      length: (value) => (value === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE ? 0 : 1),
-      maxAge: maxAgeSeconds * 1000, // convert to ms
-    });
-  }
-
-  static createNoOpCache<TFields>(): LocalMemoryCache<TFields> {
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: 0,
-      maxAge: -1,
-    });
-  }
-
-  public async loadManyAsync(
-    keys: readonly string[]
-  ): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>> {
-    const cacheResults = new Map<string, CacheLoadResult<TFields>>();
-    for (const key of keys) {
-      const cacheResult = this.localMemoryCache.get(key);
-      if (cacheResult === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE) {
-        cacheResults.set(key, {
-          status: CacheStatus.NEGATIVE,
-        });
-      } else if (cacheResult) {
-        cacheResults.set(key, {
-          status: CacheStatus.HIT,
-          item: cacheResult as unknown as TFields,
-        });
-      } else {
-        cacheResults.set(key, {
-          status: CacheStatus.MISS,
-        });
-      }
-    }
-    return cacheResults;
-  }
-
-  public async cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void> {
-    for (const [key, item] of objectMap) {
-      this.localMemoryCache.set(key, item);
-    }
-  }
-
-  public async cacheDBMissesAsync(keys: readonly string[]): Promise<void> {
-    for (const key of keys) {
-      this.localMemoryCache.set(key, DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    }
-  }
-
-  public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
-    for (const key of keys) {
-      this.localMemoryCache.del(key);
-    }
-  }
-
-  public makeCacheKey(parts: string[]): string {
-    const delimiter = ':';
-    const escapedParts = parts.map((part) =>
-      part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-    );
-    return escapedParts.join(delimiter);
-  }
-}
@@ -1,80 +0,0 @@
-import { EntityCacheAdapter, CacheLoadResult, EntityConfiguration, mapKeys } from '@expo/entity';
-import invariant from 'invariant';
-
-import GenericLocalMemoryCacher, { LocalMemoryCache } from './GenericLocalMemoryCacher';
-
-export default class LocalMemoryCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
-  private readonly genericLocalMemoryCacher: GenericLocalMemoryCacher<TFields>;
-
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    localMemoryCache: LocalMemoryCache<TFields>
-  ) {
-    super(entityConfiguration);
-    this.genericLocalMemoryCacher = new GenericLocalMemoryCacher(localMemoryCache);
-  }
-
-  public async loadManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult<TFields>>> {
-    const localMemoryCacheKeyToFieldValueMapping = new Map(
-      fieldValues.map((fieldValue) => [this.makeCacheKey(fieldName, fieldValue), fieldValue])
-    );
-    const cacheResults = await this.genericLocalMemoryCacher.loadManyAsync(
-      Array.from(localMemoryCacheKeyToFieldValueMapping.keys())
-    );
-
-    return mapKeys(cacheResults, (cacheKey) => {
-      const fieldValue = localMemoryCacheKeyToFieldValueMapping.get(cacheKey);
-      invariant(
-        fieldValue !== undefined,
-        'Unspecified cache key %s returned from generic local memory cacher',
-        cacheKey
-      );
-      return fieldValue;
-    });
-  }
-
-  public async cacheManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    objectMap: ReadonlyMap<NonNullable<TFields[N]>, Readonly<TFields>>
-  ): Promise<void> {
-    await this.genericLocalMemoryCacher.cacheManyAsync(
-      mapKeys(objectMap, (fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
-  }
-
-  public async cacheDBMissesAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    await this.genericLocalMemoryCacher.cacheDBMissesAsync(
-      fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
-  }
-
-  public async invalidateManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    await this.genericLocalMemoryCacher.invalidateManyAsync(
-      fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
-  }
-
-  private makeCacheKey<N extends keyof TFields>(
-    fieldName: N,
-    fieldValue: NonNullable<TFields[N]>
-  ): string {
-    const columnName = this.entityConfiguration.entityToDBFieldsKeyMapping.get(fieldName);
-    invariant(columnName, `database field mapping missing for ${String(fieldName)}`);
-    const parts = [
-      this.entityConfiguration.tableName,
-      `${this.entityConfiguration.cacheKeyVersion}`,
-      columnName,
-      String(fieldValue),
-    ];
-    return this.genericLocalMemoryCacher.makeCacheKey(parts);
-  }
-}
@@ -1,45 +0,0 @@
-import {
-  computeIfAbsent,
-  EntityCacheAdapter,
-  EntityConfiguration,
-  IEntityCacheAdapterProvider,
-} from '@expo/entity';
-
-import GenericLocalMemoryCacher, { LocalMemoryCache } from './GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapter from './LocalMemoryCacheAdapter';
-
-export default class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvider {
-  // local memory cache adapters should be shared/reused across requests
-  static localMemoryCacheAdapterMap = new Map<string, LocalMemoryCacheAdapter<any>>();
-
-  static getNoOpProvider(): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields>() =>
-      GenericLocalMemoryCacher.createNoOpCache<TFields>()
-    );
-  }
-
-  static getProvider(
-    options: { maxSize?: number; ttlSeconds?: number } = {}
-  ): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields>() =>
-      GenericLocalMemoryCacher.createLRUCache<TFields>(options)
-    );
-  }
-
-  private constructor(
-    private readonly localMemoryCacheCreator: <TFields>() => LocalMemoryCache<TFields>
-  ) {}
-
-  public getCacheAdapter<TFields>(
-    entityConfiguration: EntityConfiguration<TFields>
-  ): EntityCacheAdapter<TFields> {
-    return computeIfAbsent(
-      LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap,
-      entityConfiguration.tableName,
-      () => {
-        const localMemoryCache = this.localMemoryCacheCreator<TFields>();
-        return new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
-      }
-    );
-  }
-}
@@ -1,28 +0,0 @@
-import GenericLocalMemoryCacher from '../GenericLocalMemoryCacher';
-
-describe(GenericLocalMemoryCacher, () => {
-  describe(GenericLocalMemoryCacher.createLRUCache, () => {
-    it('creates a cache with default options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache();
-      expect(cache.max).toBe(10000);
-      expect(cache.maxAge).toBe(10000);
-    });
-
-    it('respects specified options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache({
-        ttlSeconds: 3,
-        maxSize: 10,
-      });
-      expect(cache.max).toBe(10);
-      expect(cache.maxAge).toBe(3000);
-    });
-  });
-
-  describe(GenericLocalMemoryCacher.createNoOpCache, () => {
-    it('creates a no-op cache', () => {
-      const cache = GenericLocalMemoryCacher.createNoOpCache<{ hello: 'world' }>();
-      cache.set('a', { hello: 'world' });
-      expect(cache.get('a')).toBeUndefined();
-    });
-  });
-});
@@ -1,174 +0,0 @@
-import { CacheStatus, ViewerContext } from '@expo/entity';
-import { v4 as uuidv4 } from 'uuid';
-
-import GenericLocalMemoryCacher from '../GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapter from '../LocalMemoryCacheAdapter';
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
-import LocalMemoryTestEntity from '../testfixtures/LocalMemoryTestEntity';
-import {
-  createLocalMemoryTestEntityCompanionProvider,
-  createNoopLocalMemoryIntegrationTestEntityCompanionProvider,
-} from '../testfixtures/createLocalMemoryTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(LocalMemoryCacheAdapter, () => {
-  beforeEach(async () => {
-    LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.clear();
-  });
-
-  it('has correct caching behavior', async () => {
-    const viewerContext = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      LocalMemoryTestEntity,
-      LocalMemoryTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const entitySpecificGenericCacher =
-      LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.get(
-        LocalMemoryTestEntity.getCompanionDefinition().entityConfiguration.tableName
-      )!['genericLocalMemoryCacher'];
-    const cachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValue = cachedResult.get(cacheKeyMaker('id', entity1.getID()))!;
-    expect(cachedValue).toMatchObject({
-      status: CacheStatus.HIT,
-      item: {
-        id: entity1.getID(),
-        name: 'blah',
-        dateField: date,
-      },
-    });
-
-    // simulate non existent db fetch, should write negative result ('') to cache
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', nonExistentId),
-    ]);
-    expect(nonExistentCachedResult.get(cacheKeyMaker('id', nonExistentId))).toMatchObject({
-      status: CacheStatus.NEGATIVE,
-    });
-
-    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await LocalMemoryTestEntity.loader(
-      viewerContext
-    ).loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult2.ok).toBe(false);
-
-    // invalidate from cache to ensure it invalidates correctly
-    await LocalMemoryTestEntity.loader(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
-    const cachedResultMiss = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValueMiss = cachedResultMiss.get(cacheKeyMaker('id', entity1.getID()));
-    expect(cachedValueMiss).toMatchObject({ status: CacheStatus.MISS });
-  });
-
-  it('shares the cache between different requests', async () => {
-    const genericLocalMemoryCacherLoadManySpy = jest.spyOn(
-      GenericLocalMemoryCacher.prototype as unknown as any,
-      'loadManyAsync'
-    );
-    const viewerContext = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    // load entity with a different request
-    const viewerContext2 = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
-    const entity1WithVc2 = await LocalMemoryTestEntity.loader(viewerContext2)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      LocalMemoryTestEntity,
-      LocalMemoryTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-    expect(entity1WithVc2.getAllFields()).toMatchObject({
-      id: entity1WithVc2.getID(),
-      name: 'blah',
-      dateField: date,
-    });
-    expect(genericLocalMemoryCacherLoadManySpy).toBeCalledWith([
-      cacheKeyMaker('id', entity1WithVc2.getID()),
-    ]);
-    expect(genericLocalMemoryCacherLoadManySpy).toBeCalledTimes(2);
-  });
-
-  it('respects the parameters of a noop cache', async () => {
-    const viewerContext = new TestViewerContext(
-      createNoopLocalMemoryIntegrationTestEntityCompanionProvider()
-    );
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      LocalMemoryTestEntity,
-      LocalMemoryTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity will try to put it in cache but it's a noop cache, so it should be a miss
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const entitySpecificGenericCacher =
-      LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.get(
-        LocalMemoryTestEntity.getCompanionDefinition().entityConfiguration.tableName
-      )!['genericLocalMemoryCacher'];
-    const cachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValue = cachedResult.get(cacheKeyMaker('id', entity1.getID()))!;
-    expect(cachedValue).toMatchObject({
-      status: CacheStatus.MISS,
-    });
-
-    // a non existent db fetch should try to write negative result ('') but it's a noop cache, so it should be a miss
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', nonExistentId),
-    ]);
-    expect(nonExistentCachedResult.get(cacheKeyMaker('id', nonExistentId))).toMatchObject({
-      status: CacheStatus.MISS,
-    });
-  });
-});
@@ -1,107 +0,0 @@
-import { CacheStatus, UUIDField, EntityConfiguration } from '@expo/entity';
-
-import GenericLocalMemoryCacher, {
-  DOES_NOT_EXIST_LOCAL_MEMORY_CACHE,
-} from '../GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapter from '../LocalMemoryCacheAdapter';
-
-type BlahFields = {
-  id: string;
-};
-
-const entityConfiguration = new EntityConfiguration<BlahFields>({
-  idField: 'id',
-  tableName: 'blah',
-  schema: {
-    id: new UUIDField({ columnName: 'id', cache: true }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'local-memory',
-});
-
-describe(LocalMemoryCacheAdapter, () => {
-  describe('loadManyAsync', () => {
-    it('returns appropriate cache results', async () => {
-      const cacheAdapter = new LocalMemoryCacheAdapter(
-        entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache()
-      );
-
-      const cacheHits = new Map<string, Readonly<BlahFields>>([['test-id-1', { id: 'test-id-1' }]]);
-      await cacheAdapter.cacheManyAsync('id', cacheHits);
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', [
-        'test-id-1',
-        'test-id-2',
-        'test-id-3',
-      ]);
-
-      expect(results.get('test-id-1')).toMatchObject({
-        status: CacheStatus.HIT,
-        item: { id: 'test-id-1' },
-      });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.NEGATIVE });
-      expect(results.get('test-id-3')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.size).toBe(3);
-    });
-
-    it('returns empty map when passed empty array of fieldValues', async () => {
-      const cacheAdapter = new LocalMemoryCacheAdapter(
-        entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache()
-      );
-      const results = await cacheAdapter.loadManyAsync('id', []);
-      expect(results).toEqual(new Map());
-    });
-  });
-
-  describe('cacheManyAsync', () => {
-    it('correctly caches all objects', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
-
-      const cacheAdapter = new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
-      await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
-
-      const cacheKey = cacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(localMemoryCache.get(cacheKey)).toMatchObject({
-        id: 'test-id-1',
-      });
-    });
-  });
-
-  describe('cacheDBMissesAsync', () => {
-    it('correctly caches misses', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
-
-      const cacheAdapter = new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-1']);
-
-      const cacheKey = cacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(localMemoryCache.get(cacheKey)).toEqual(DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    });
-  });
-
-  describe('invalidateManyAsync', () => {
-    it('invalidates correctly', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
-
-      const cacheAdapter = new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
-      await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-      await cacheAdapter.invalidateManyAsync('id', ['test-id-1', 'test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', ['test-id-1', 'test-id-2']);
-      expect(results.get('test-id-1')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.MISS });
-    });
-
-    it('returns when passed empty array of fieldValues', async () => {
-      const cacheAdapter = new LocalMemoryCacheAdapter(
-        entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache<BlahFields>({})
-      );
-      await cacheAdapter.invalidateManyAsync('id', []);
-    });
-  });
-});
@@ -1,10 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-cache-adapter-local-memory
- */
-
-export { default as GenericLocalMemoryCacher } from './GenericLocalMemoryCacher';
-export * from './GenericLocalMemoryCacher';
-export { default as LocalMemoryCacheAdapter } from './LocalMemoryCacheAdapter';
-export { default as LocalMemoryCacheAdapterProvider } from './LocalMemoryCacheAdapterProvider';
@@ -1,100 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  DateField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-
-export type LocalMemoryTestEntityFields = {
-  id: string;
-  name: string;
-  dateField: Date | null;
-};
-
-export default class LocalMemoryTestEntity extends Entity<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    LocalMemoryTestEntityFields,
-    string,
-    ViewerContext,
-    LocalMemoryTestEntity,
-    LocalMemoryTestEntityPrivacyPolicy
-  > {
-    return localMemoryTestEntityCompanionDefinition;
-  }
-}
-
-export class LocalMemoryTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext,
-  LocalMemoryTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-}
-
-export const localMemoryTestEntityConfiguration =
-  new EntityConfiguration<LocalMemoryTestEntityFields>({
-    idField: 'id',
-    tableName: 'local_memory_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-        cache: true,
-      }),
-      dateField: new DateField({
-        columnName: 'date_field',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'local-memory',
-  });
-
-const localMemoryTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: LocalMemoryTestEntity,
-  entityConfiguration: localMemoryTestEntityConfiguration,
-  privacyPolicyClass: LocalMemoryTestEntityPrivacyPolicy,
-});
@@ -1,48 +0,0 @@
-import {
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-} from '@expo/entity';
-
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
-
-export const createLocalMemoryTestEntityCompanionProvider = (
-  localMemoryOptions: { maxSize?: number; ttlSeconds?: number } = {},
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  const localMemoryCacheAdapterProvider =
-    localMemoryOptions.maxSize === 0 && localMemoryOptions.ttlSeconds === 0
-      ? LocalMemoryCacheAdapterProvider.getNoOpProvider()
-      : LocalMemoryCacheAdapterProvider.getProvider(localMemoryOptions);
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'local-memory',
-        {
-          cacheAdapterProvider: localMemoryCacheAdapterProvider,
-        },
-      ],
-    ])
-  );
-};
-
-export const createNoopLocalMemoryIntegrationTestEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return createLocalMemoryTestEntityCompanionProvider(
-    { maxSize: 0, ttlSeconds: 0 },
-    metricsAdapter
-  );
-};
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}
@@ -3,243 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* add example of redis mget batching using @expo/batcher ([#199](https://github.com/expo/entity/issues/199)) ([684f91b](https://github.com/expo/entity/commit/684f91b1f270851dbe331df2e2620664eea17266))
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Features
-
-* update ioredis to v5, make it a devDependency of the cache packages ([#172](https://github.com/expo/entity/issues/172)) ([9fcfbf7](https://github.com/expo/entity/commit/9fcfbf746a61554cefedf7fb0f1a3a9056b58ffe))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157)) 
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Chores
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-* use column name instead of field name for redis cache key ([#124](https://github.com/expo/entity/issues/124)) ([d78f452](https://github.com/expo/entity/commit/d78f452bb3ac5527069813a03f5b2264375bd8ab))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Features
-
-* better cache adapter error handling ([#102](https://github.com/expo/entity/issues/102)) ([15546aa](https://github.com/expo/entity/commit/15546aad97734ab9ac67f1c012485f096a0e94f1))
-
-
-
-
-
 # [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)

 **Note:** Version bump only for package @expo/entity-cache-adapter-redis
@@ -12,7 +12,7 @@ During `EntityCompanionProvider` instantiation:
 import Redis from 'ioredis';

 const redisCacheAdapterContext = {
-  redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
+  redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
  makeKeyFn(...parts: string[]): string {
    const delimiter = ':';
    const escapedParts = parts.map((part) =>
@@ -35,7 +35,7 @@ export const createDefaultEntityCompanionProvider = (
      ...
    },
    {
-      ['redis']: {
+      [CacheAdapterFlavor.REDIS]: {
        cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
      },
    }
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity-cache-adapter-redis",
-  "version": "0.31.0",
+  "version": "0.10.0",
  "description": "Redis cache adapter for @expo/entity",
  "files": [
    "build",
@@ -11,8 +11,7 @@
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
+    "lint": "eslint src --ext '.ts'",
    "test": "jest --rootDir . --config ../../resources/jest.config.js",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
@@ -27,11 +26,12 @@
  "author": "Expo",
  "license": "MIT",
  "peerDependencies": {
-    "@expo/entity": "*",
-    "ioredis": ">=5"
+    "@expo/entity": "*"
+  },
+  "dependencies": {
+    "ioredis": "^4.17.3"
  },
  "devDependencies": {
-    "@expo/entity": "^0.31.0",
-    "ioredis": "^5.2.5"
+    "@expo/entity": "^0.10.0"
  }
 }
@@ -1,134 +0,0 @@
-import {
-  CacheLoadResult,
-  CacheStatus,
-  EntityConfiguration,
-  transformCacheObjectToFields,
-  transformFieldsToCacheObject,
-  IEntityGenericCacher,
-} from '@expo/entity';
-
-import { redisTransformerMap } from './RedisCommon';
-import wrapNativeRedisCallAsync from './errors/wrapNativeRedisCallAsync';
-
-// Sentinel value we store in Redis to negatively cache a database miss.
-// The sentinel value is distinct from any (positively) cached value.
-const DOES_NOT_EXIST_REDIS = '';
-
-export interface IRedisTransaction {
-  set(key: string, value: string, secondsToken: 'EX', seconds: number): this;
-  exec(): Promise<any>;
-}
-
-export interface IRedis {
-  mget(...args: [...keys: string[]]): Promise<(string | null)[]>;
-  multi(): IRedisTransaction;
-  del(...args: [...keys: string[]]): Promise<any>;
-}
-
-export interface GenericRedisCacheContext {
-  /**
-   * Instance of ioredis.Redis
-   */
-  redisClient: IRedis;
-
-  /**
-   * TTL for caching database hits. Successive entity loads within this TTL
-   * will be read from cache (unless invalidated).
-   */
-  ttlSecondsPositive: number;
-
-  /**
-   * TTL for negatively caching database misses. Successive entity loads within
-   * this TTL will be assumed not present in the database (unless invalidated).
-   */
-  ttlSecondsNegative: number;
-}
-
-export default class GenericRedisCacher<TFields> implements IEntityGenericCacher<TFields> {
-  constructor(
-    private readonly context: GenericRedisCacheContext,
-    private readonly entityConfiguration: EntityConfiguration<TFields>
-  ) {}
-
-  public async loadManyAsync(
-    keys: readonly string[]
-  ): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>> {
-    if (keys.length === 0) {
-      return new Map();
-    }
-
-    const redisResults = await wrapNativeRedisCallAsync(() =>
-      this.context.redisClient.mget(...keys)
-    );
-
-    const results = new Map<string, CacheLoadResult<TFields>>();
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i]!;
-      const redisResult = redisResults[i];
-
-      if (redisResult === DOES_NOT_EXIST_REDIS) {
-        results.set(key, {
-          status: CacheStatus.NEGATIVE,
-        });
-      } else if (redisResult) {
-        results.set(key, {
-          status: CacheStatus.HIT,
-          item: transformCacheObjectToFields(
-            this.entityConfiguration,
-            redisTransformerMap,
-            JSON.parse(redisResult)
-          ),
-        });
-      } else {
-        results.set(key, {
-          status: CacheStatus.MISS,
-        });
-      }
-    }
-    return results;
-  }
-
-  public async cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void> {
-    if (objectMap.size === 0) {
-      return;
-    }
-
-    let redisTransaction = this.context.redisClient.multi();
-    objectMap.forEach((object, key) => {
-      redisTransaction = redisTransaction.set(
-        key,
-        JSON.stringify(
-          transformFieldsToCacheObject(this.entityConfiguration, redisTransformerMap, object)
-        ),
-        'EX',
-        this.context.ttlSecondsPositive
-      );
-    });
-    await wrapNativeRedisCallAsync(() => redisTransaction.exec());
-  }
-
-  public async cacheDBMissesAsync(keys: readonly string[]): Promise<void> {
-    if (keys.length === 0) {
-      return;
-    }
-
-    let redisTransaction = this.context.redisClient.multi();
-    keys.forEach((key) => {
-      redisTransaction = redisTransaction.set(
-        key,
-        DOES_NOT_EXIST_REDIS,
-        'EX',
-        this.context.ttlSecondsNegative
-      );
-    });
-    await wrapNativeRedisCallAsync(() => redisTransaction.exec());
-  }
-
-  public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
-    if (keys.length === 0) {
-      return;
-    }
-
-    await wrapNativeRedisCallAsync(() => this.context.redisClient.del(...keys));
-  }
-}
@@ -1,13 +1,23 @@
-import { EntityCacheAdapter, EntityConfiguration, CacheLoadResult, mapKeys } from '@expo/entity';
-import invariant from 'invariant';
+import {
+  EntityCacheAdapter,
+  EntityConfiguration,
+  FieldTransformerMap,
+  CacheLoadResult,
+  CacheStatus,
+} from '@expo/entity';
+import { Redis } from 'ioredis';

-import GenericRedisCacher, { IRedis } from './GenericRedisCacher';
+import { redisTransformerMap } from './RedisCommon';
+
+// Sentinel value we store in Redis to negatively cache a database miss.
+// The sentinel value is distinct from any (positively) cached value.
+const DOES_NOT_EXIST_REDIS = '';

 export interface RedisCacheAdapterContext {
  /**
   * Instance of ioredis.Redis
   */
-  redisClient: IRedis;
+  redisClient: Redis;

  /**
   * Create a key string for key parts (cache key prefix, versions, entity name, etc).
@@ -41,83 +51,114 @@ export interface RedisCacheAdapterContext {
 }

 export default class RedisCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
-  private readonly genericRedisCacher: GenericRedisCacher<TFields>;
  constructor(
    entityConfiguration: EntityConfiguration<TFields>,
    private readonly context: RedisCacheAdapterContext
  ) {
    super(entityConfiguration);
+  }

-    this.genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: context.redisClient,
-        ttlSecondsNegative: context.ttlSecondsNegative,
-        ttlSecondsPositive: context.ttlSecondsPositive,
-      },
-      entityConfiguration
-    );
+  public getFieldTransformerMap(): FieldTransformerMap {
+    return redisTransformerMap;
  }

  public async loadManyAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult<TFields>>> {
-    const redisCacheKeyToFieldValueMapping = new Map(
-      fieldValues.map((fieldValue) => [this.makeCacheKey(fieldName, fieldValue), fieldValue])
-    );
-    const cacheResults = await this.genericRedisCacher.loadManyAsync(
-      Array.from(redisCacheKeyToFieldValueMapping.keys())
-    );
+  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult>> {
+    if (fieldValues.length === 0) {
+      return new Map();
+    }

-    return mapKeys(cacheResults, (redisCacheKey) => {
-      const fieldValue = redisCacheKeyToFieldValueMapping.get(redisCacheKey);
-      invariant(
-        fieldValue !== undefined,
-        'Unspecified cache key %s returned from generic Redis cacher',
-        redisCacheKey
-      );
-      return fieldValue;
-    });
+    const redisKeys = fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue));
+    const redisResults = await this.context.redisClient.mget(...redisKeys);
+
+    const results = new Map<NonNullable<TFields[N]>, CacheLoadResult>();
+    for (let i = 0; i < fieldValues.length; i++) {
+      const fieldValue = fieldValues[i];
+      const redisResult = redisResults[i];
+
+      if (redisResult === DOES_NOT_EXIST_REDIS) {
+        results.set(fieldValue, {
+          status: CacheStatus.NEGATIVE,
+        });
+      } else if (redisResult) {
+        results.set(fieldValue, {
+          status: CacheStatus.HIT,
+          item: JSON.parse(redisResult),
+        });
+      } else {
+        results.set(fieldValue, {
+          status: CacheStatus.MISS,
+        });
+      }
+    }
+    return results;
  }

  public async cacheManyAsync<N extends keyof TFields>(
    fieldName: N,
-    objectMap: ReadonlyMap<NonNullable<TFields[N]>, Readonly<TFields>>
+    objectMap: ReadonlyMap<NonNullable<TFields[N]>, object>
  ): Promise<void> {
-    await this.genericRedisCacher.cacheManyAsync(
-      mapKeys(objectMap, (fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
+    if (objectMap.size === 0) {
+      return;
+    }
+
+    let redisTransaction = this.context.redisClient.multi();
+    objectMap.forEach((object, fieldValue) => {
+      const redisKey = this.makeCacheKey(fieldName, fieldValue);
+      redisTransaction = redisTransaction.set(
+        redisKey,
+        JSON.stringify(object),
+        'EX',
+        this.context.ttlSecondsPositive
+      );
+    });
+    await redisTransaction.exec();
  }

  public async cacheDBMissesAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<void> {
-    await this.genericRedisCacher.cacheDBMissesAsync(
-      fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
+    if (fieldValues.length === 0) {
+      return;
+    }
+
+    let redisTransaction = this.context.redisClient.multi();
+    fieldValues.forEach((fieldValue) => {
+      const redisKey = this.makeCacheKey(fieldName, fieldValue);
+      redisTransaction = redisTransaction.set(
+        redisKey,
+        DOES_NOT_EXIST_REDIS,
+        'EX',
+        this.context.ttlSecondsNegative
+      );
+    });
+    await redisTransaction.exec();
  }

  public async invalidateManyAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<void> {
-    await this.genericRedisCacher.invalidateManyAsync(
-      fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
+    if (fieldValues.length === 0) {
+      return;
+    }
+
+    const redisKeys = fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue));
+    await this.context.redisClient.del(...redisKeys);
  }

  private makeCacheKey<N extends keyof TFields>(
    fieldName: N,
    fieldValue: NonNullable<TFields[N]>
  ): string {
-    const columnName = this.entityConfiguration.entityToDBFieldsKeyMapping.get(fieldName);
-    invariant(columnName, `database field mapping missing for ${String(fieldName)}`);
    return this.context.makeKeyFn(
      this.context.cacheKeyPrefix,
      this.entityConfiguration.tableName,
-      `v2.${this.entityConfiguration.cacheKeyVersion}`,
-      columnName,
+      `v${this.entityConfiguration.cacheKeyVersion}`,
+      fieldName as string,
      String(fieldValue)
    );
  }
@@ -1,164 +0,0 @@
-import { Batcher } from '@expo/batcher';
-import { ViewerContext, zipToMap } from '@expo/entity';
-import invariant from 'invariant';
-import Redis from 'ioredis';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import { IRedis, IRedisTransaction } from '../GenericRedisCacher';
-import RedisCacheAdapter, { RedisCacheAdapterContext } from '../RedisCacheAdapter';
-import RedisTestEntity from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class BatchedRedis implements IRedis {
-  private readonly mgetBatcher = new Batcher<string[], (string | null)[]>(
-    this.batchMgetAsync.bind(this),
-    {
-      maxBatchInterval: 0,
-    }
-  );
-
-  constructor(private readonly redis: Redis) {}
-
-  private async batchMgetAsync(keySets: string[][]): Promise<(string | null)[][]> {
-    // ordered distinct keys to fetch
-    const allKeysToFetch = [...new Set(keySets.flat())];
-
-    // fetch the distinct keys
-    const allResults = await this.redis.mget(...allKeysToFetch);
-
-    // put them into a map for fast lookup
-    const keysToResults = zipToMap(allKeysToFetch, allResults);
-
-    // re-associate them with original key sets
-    return keySets.map((keySet) =>
-      keySet.map((key) => {
-        const result = keysToResults.get(key);
-        invariant(result !== undefined, 'result should not be undefined');
-        return result;
-      })
-    );
-  }
-
-  async mget(...args: string[]): Promise<(string | null)[]> {
-    return await this.mgetBatcher.batchAsync(args);
-  }
-
-  multi(): IRedisTransaction {
-    return this.redis.multi();
-  }
-
-  async del(...args: string[]): Promise<void> {
-    await this.redis.del(...args);
-  }
-}
-
-describe(RedisCacheAdapter, () => {
-  const redis = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  const redisClient = new BatchedRedis(redis);
-
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    redisCacheAdapterContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redis.flushdb();
-  });
-
-  afterAll(async () => {
-    redis.disconnect();
-  });
-
-  it('has correct caching behavior', async () => {
-    // simulate two requests
-    const viewerContext = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-
-    const mgetSpy = jest.spyOn(redis, 'mget');
-
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      RedisTestEntity,
-      RedisTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache. load by multiple requests and multiple fields in same tick to ensure batch works
-    mgetSpy.mockClear();
-    const viewerContext1 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const viewerContext2 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const viewerContext3 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const [entity1, entity2, entity3] = await Promise.all([
-      RedisTestEntity.loader(viewerContext1).enforcing().loadByIDAsync(entity1Created.getID()),
-      RedisTestEntity.loader(viewerContext2).enforcing().loadByIDAsync(entity1Created.getID()),
-      RedisTestEntity.loader(viewerContext3)
-        .enforcing()
-        .loadByFieldEqualingAsync('name', entity1Created.getField('name')),
-    ]);
-
-    expect(mgetSpy).toHaveBeenCalledTimes(1);
-    expect(mgetSpy.mock.calls[0]).toHaveLength(2); // should dedupe the first two loads
-    expect(entity1.getID()).toEqual(entity2.getID());
-    expect(entity2.getID()).toEqual(nullthrows(entity3).getID());
-
-    const cacheKeyEntity1 = cacheKeyMaker('id', entity1Created.getID());
-    const cachedJSON = await redis.get(cacheKeyEntity1);
-    const cachedValue = JSON.parse(cachedJSON!);
-    expect(cachedValue).toMatchObject({
-      id: entity1.getID(),
-      name: 'blah',
-    });
-
-    const cacheKeyEntity1NameField = cacheKeyMaker('name', entity1Created.getField('name'));
-    await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('name', entity1Created.getField('name'));
-    await expect(redis.get(cacheKeyEntity1NameField)).resolves.toEqual(cachedJSON);
-
-    // simulate non existent db fetch, should write negative result ('') to cache
-    const nonExistentId = uuidv4();
-    const entityNonExistentResult = await RedisTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
-    expect(entityNonExistentResult.ok).toBe(false);
-    const cacheKeyNonExistent = cacheKeyMaker('id', nonExistentId);
-    const nonExistentCachedValue = await redis.get(cacheKeyNonExistent);
-    expect(nonExistentCachedValue).toEqual('');
-    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await RedisTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
-    expect(entityNonExistentResult2.ok).toBe(false);
-
-    // invalidate from cache to ensure it invalidates correctly in both caches
-    await RedisTestEntity.loader(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
-    await expect(redis.get(cacheKeyEntity1)).resolves.toBeNull();
-    await expect(redis.get(cacheKeyEntity1NameField)).resolves.toBeNull();
-  });
-});
@@ -1,126 +0,0 @@
-import { CacheStatus, ViewerContext } from '@expo/entity';
-import Redis from 'ioredis';
-import { URL } from 'url';
-
-import GenericRedisCacher from '../GenericRedisCacher';
-import { RedisCacheAdapterContext } from '../RedisCacheAdapter';
-import RedisTestEntity, {
-  redisTestEntityConfiguration,
-  RedisTestEntityFields,
-} from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(GenericRedisCacher, () => {
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    redisCacheAdapterContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redisClient.flushdb();
-  });
-  afterAll(async () => {
-    redisClient.disconnect();
-  });
-
-  it('has correct caching and loading behavior', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: redisCacheAdapterContext.redisClient,
-        ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
-        ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
-      },
-      redisTestEntityConfiguration
-    );
-    const date = new Date();
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-    const testKey = `test-id-key-${entity1Created.getID()}`;
-    const objectMap = new Map<string, Readonly<RedisTestEntityFields>>([
-      [testKey, entity1Created.getAllFields()],
-    ]);
-    await genericRedisCacher.cacheManyAsync(objectMap);
-
-    const cachedJSON = await redisClient.get(testKey);
-    const cachedValue = JSON.parse(cachedJSON!);
-    expect(cachedValue).toMatchObject({
-      id: entity1Created.getID(),
-      dateField: date.toISOString(),
-    });
-
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult).toMatchObject({
-      status: CacheStatus.HIT,
-      item: entity1Created.getAllFields(),
-    });
-    expect(loadedObjectMap.size).toBe(1);
-  });
-  it('has correct negative caching behaviour', async () => {
-    const genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: redisCacheAdapterContext.redisClient,
-        ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
-        ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
-      },
-      redisTestEntityConfiguration
-    );
-
-    const testKey = `test-id-key-non-existent-id`;
-    await genericRedisCacher.cacheDBMissesAsync([testKey]);
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult.status).toBe(CacheStatus.NEGATIVE);
-  });
-  it('has correct invalidation behaviour', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: redisCacheAdapterContext.redisClient,
-        ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
-        ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
-      },
-      redisTestEntityConfiguration
-    );
-    const date = new Date();
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-    const testKey = `test-id-key-${entity1Created.getID()}`;
-    const objectMap = new Map<string, Readonly<RedisTestEntityFields>>([
-      [testKey, entity1Created.getAllFields()],
-    ]);
-    await genericRedisCacher.cacheManyAsync(objectMap);
-
-    await genericRedisCacher.invalidateManyAsync([testKey]);
-
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult.status).toBe(CacheStatus.MISS);
-  });
-});
@@ -11,12 +11,11 @@ import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtur
 class TestViewerContext extends ViewerContext {}

 describe(RedisCacheAdapter, () => {
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
  let redisCacheAdapterContext: RedisCacheAdapterContext;

  beforeAll(() => {
    redisCacheAdapterContext = {
-      redisClient,
+      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
      makeKeyFn(...parts: string[]): string {
        const delimiter = ':';
        const escapedParts = parts.map((part) =>
@@ -32,32 +31,34 @@ describe(RedisCacheAdapter, () => {
  });

  beforeEach(async () => {
-    await redisClient.flushdb();
+    await redisCacheAdapterContext.redisClient.flushdb();
  });
  afterAll(async () => {
-    redisClient.disconnect();
+    redisCacheAdapterContext.redisClient.disconnect();
  });

  it('has correct caching behavior', async () => {
-    const viewerContext = new TestViewerContext(
+    const vc1 = new TestViewerContext(
      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
    );
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
+    const cacheAdapter = vc1.entityCompanionProvider.getCompanionForEntity(
      RedisTestEntity,
      RedisTestEntity.getCompanionDefinition()
    )['tableDataCoordinator']['cacheAdapter'];
    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);

-    const entity1Created = await RedisTestEntity.creator(viewerContext)
+    const entity1Created = await RedisTestEntity.creator(vc1)
      .setField('name', 'blah')
      .enforceCreateAsync();

    // loading an entity should put it in cache
-    const entity1 = await RedisTestEntity.loader(viewerContext)
+    const entity1 = await RedisTestEntity.loader(vc1)
      .enforcing()
      .loadByIDAsync(entity1Created.getID());

-    const cachedJSON = await redisClient.get(cacheKeyMaker('id', entity1.getID()));
+    const cachedJSON = await redisCacheAdapterContext.redisClient.get(
+      cacheKeyMaker('id', entity1.getID())
+    );
    const cachedValue = JSON.parse(cachedJSON!);
    expect(cachedValue).toMatchObject({
      id: entity1.getID(),
@@ -67,39 +68,37 @@ describe(RedisCacheAdapter, () => {
    // simulate non existent db fetch, should write negative result ('') to cache
    const nonExistentId = uuidv4();

-    const entityNonExistentResult = await RedisTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
+    const entityNonExistentResult = await RedisTestEntity.loader(vc1).loadByIDAsync(nonExistentId);
    expect(entityNonExistentResult.ok).toBe(false);

-    const nonExistentCachedValue = await redisClient.get(cacheKeyMaker('id', nonExistentId));
+    const nonExistentCachedValue = await redisCacheAdapterContext.redisClient.get(
+      cacheKeyMaker('id', nonExistentId)
+    );
    expect(nonExistentCachedValue).toEqual('');

    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await RedisTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
+    const entityNonExistentResult2 = await RedisTestEntity.loader(vc1).loadByIDAsync(nonExistentId);
    expect(entityNonExistentResult2.ok).toBe(false);

    // invalidate from cache to ensure it invalidates correctly
-    await RedisTestEntity.loader(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
-    const cachedValueNull = await redisClient.get(cacheKeyMaker('id', entity1.getID()));
+    await RedisTestEntity.loader(vc1).invalidateFieldsAsync(entity1.getAllFields());
+    const cachedValueNull = await redisCacheAdapterContext.redisClient.get(
+      cacheKeyMaker('id', entity1.getID())
+    );
    expect(cachedValueNull).toBe(null);
  });

  it('caches and restores date fields', async () => {
-    const viewerContext = new TestViewerContext(
+    const vc1 = new TestViewerContext(
      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
    );
    const date = new Date();
    const entity1 = await enforceAsyncResult(
-      RedisTestEntity.creator(viewerContext).setField('dateField', date).createAsync()
+      RedisTestEntity.creator(vc1).setField('dateField', date).createAsync()
    );
    expect(entity1.getField('dateField')).toEqual(date);

-    const entity2 = await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
+    const entity2 = await RedisTestEntity.loader(vc1).enforcing().loadByIDAsync(entity1.getID());
    expect(entity2.getField('dateField')).toEqual(date);

    // simulate new request
@@ -109,26 +108,4 @@ describe(RedisCacheAdapter, () => {
    const entity3 = await RedisTestEntity.loader(vc2).enforcing().loadByIDAsync(entity1.getID());
    expect(entity3.getField('dateField')).toEqual(date);
  });
-
-  it('caches and restores empty string field keys', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const entity1 = await enforceAsyncResult(
-      RedisTestEntity.creator(viewerContext).setField('name', '').createAsync()
-    );
-    const entity2 = await RedisTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('name', '');
-    expect(entity2?.getID()).toEqual(entity1.getID());
-
-    // simulate new request
-    const vc2 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const entity3 = await RedisTestEntity.loader(vc2)
-      .enforcing()
-      .loadByFieldEqualingAsync('name', '');
-    expect(entity3?.getID()).toEqual(entity1.getID());
-  });
 });
@@ -1,47 +0,0 @@
-import { EntityCacheAdapterTransientError, ViewerContext } from '@expo/entity';
-import Redis from 'ioredis';
-import { URL } from 'url';
-
-import RedisCacheAdapter, { RedisCacheAdapterContext } from '../RedisCacheAdapter';
-import RedisTestEntity from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(RedisCacheAdapter, () => {
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    redisCacheAdapterContext = {
-      redisClient,
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redisClient.flushdb();
-  });
-
-  it('throws when redis is disconnected', async () => {
-    redisClient.disconnect();
-
-    const vc1 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-
-    await expect(
-      RedisTestEntity.creator(vc1).setField('name', 'blah').enforceCreateAsync()
-    ).rejects.toThrow(EntityCacheAdapterTransientError);
-  });
-});
@@ -1,4 +1,10 @@
-import { CacheStatus, UUIDField, EntityConfiguration } from '@expo/entity';
+import {
+  CacheStatus,
+  UUIDField,
+  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
+} from '@expo/entity';
 import { Redis, Pipeline } from 'ioredis';
 import { mock, when, instance, anything, verify } from 'ts-mockito';

@@ -14,8 +20,8 @@ const entityConfiguration = new EntityConfiguration<BlahFields>({
  schema: {
    id: new UUIDField({ columnName: 'id', cache: true }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 describe(RedisCacheAdapter, () => {
@@ -1,39 +0,0 @@
-import { EntityCacheAdapterTransientError } from '@expo/entity';
-
-import wrapNativeRedisCallAsync from '../wrapNativeRedisCallAsync';
-
-describe(wrapNativeRedisCallAsync, () => {
-  it('rethrows literals', async () => {
-    const throwingFn = async (): Promise<void> => {
-      // eslint-disable-next-line no-throw-literal,@typescript-eslint/no-throw-literal
-      throw 'hello';
-    };
-
-    let capturedThrownThing: any;
-    try {
-      await wrapNativeRedisCallAsync(throwingFn);
-    } catch (e) {
-      capturedThrownThing = e;
-    }
-    expect(capturedThrownThing).not.toBeInstanceOf(Error);
-    expect(capturedThrownThing).toEqual('hello');
-  });
-
-  it('wraps errors with stacks', async () => {
-    const throwingFn = async (): Promise<void> => {
-      const e = new Error('hello');
-      e.stack = 'world';
-      throw e;
-    };
-
-    let capturedThrownThing: any;
-    try {
-      await wrapNativeRedisCallAsync(throwingFn);
-    } catch (e) {
-      capturedThrownThing = e;
-    }
-    expect(capturedThrownThing).toBeInstanceOf(EntityCacheAdapterTransientError);
-    expect(capturedThrownThing.message).toEqual('hello');
-    expect(capturedThrownThing.stack).toEqual('world');
-  });
-});
@@ -1,17 +0,0 @@
-import { EntityCacheAdapterTransientError } from '@expo/entity';
-
-export default async function wrapNativeRedisCallAsync<T>(fn: () => Promise<T>): Promise<T> {
-  try {
-    return await fn();
-  } catch (e) {
-    if (!(e instanceof Error)) {
-      throw e;
-    }
-
-    const error = new EntityCacheAdapterTransientError(e.message, e);
-    if (e.stack) {
-      error.stack = e.stack;
-    }
-    throw error;
-  }
-}
@@ -1,12 +1,8 @@
-/* eslint-disable tsdoc/syntax */
 /**
- * @packageDocumentation
- * @module @expo/entity-cache-adapter-redis
+ * Automatically generated by barrelsby.
 */

 export { default as RedisCacheAdapter } from './RedisCacheAdapter';
 export * from './RedisCacheAdapter';
 export { default as RedisCacheAdapterProvider } from './RedisCacheAdapterProvider';
 export * from './RedisCommon';
-export { default as GenericRedisCacher } from './GenericRedisCacher';
-export * from './GenericRedisCacher';
@@ -6,6 +6,8 @@ import {
  DateField,
  StringField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
 } from '@expo/entity';
@@ -28,13 +30,13 @@ export default class RedisTestEntity extends Entity<RedisTestEntityFields, strin
  }
 }

-export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
+class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  RedisTestEntityFields,
  string,
  ViewerContext,
  RedisTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -42,7 +44,7 @@ export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      RedisTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -50,7 +52,7 @@ export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      RedisTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -58,7 +60,7 @@ export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      RedisTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      RedisTestEntityFields,
      string,
@@ -78,14 +80,13 @@ export const redisTestEntityConfiguration = new EntityConfiguration<RedisTestEnt
    }),
    name: new StringField({
      columnName: 'name',
-      cache: true,
    }),
    dateField: new DateField({
      columnName: 'date_field',
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 const redisTestEntityCompanionDefinition = new EntityCompanionDefinition({
@@ -2,6 +2,8 @@ import {
  NoOpEntityMetricsAdapter,
  IEntityMetricsAdapter,
  EntityCompanionProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
  StubQueryContextProvider,
  StubDatabaseAdapterProvider,
 } from '@expo/entity';
@@ -9,31 +11,22 @@ import {
 import { RedisCacheAdapterContext } from '../RedisCacheAdapter';
 import RedisCacheAdapterProvider from '../RedisCacheAdapterProvider';

-// share across all in calls in test to simulate postgres
-const adapterProvider = new StubDatabaseAdapterProvider();
-
 export const createRedisIntegrationTestEntityCompanionProvider = (
  redisCacheAdapterContext: RedisCacheAdapterContext,
  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider,
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
-        },
-      ],
-    ])
+    {
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new StubDatabaseAdapterProvider(),
+        queryContextProvider: StubQueryContextProvider,
+      },
+    },
+    {
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
+      },
+    }
  );
 };
@@ -3,265 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-
-### Features
-
-* add BigIntField ([#193](https://github.com/expo/entity/issues/193)) ([acbad82](https://github.com/expo/entity/commit/acbad826a37bb5a054b4dcf9be91d11aa5f7f29a))
-* nested transactions ([#194](https://github.com/expo/entity/issues/194)) ([a77b914](https://github.com/expo/entity/commit/a77b914ad6dc018d1e309c9caf4971088a553ecf))
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-
-### Features
-
-* add orderByRaw to loadManyByRawWhereClauseAsync ([#185](https://github.com/expo/entity/issues/185)) ([2817d78](https://github.com/expo/entity/commit/2817d78392dfecd0093111c24d581bdf01dba06d))
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-
-### Features
-
-* Upgrade knex to 1.x in `@expo/entity-database-adapter-knex` ([#150](https://github.com/expo/entity/issues/150)) ([e1b0ee5](https://github.com/expo/entity/commit/e1b0ee528175646239d88aa71ffce73983eeb52f))
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-
-### Features
-
-* add pre-commit callbacks on EntityQueryContext ([#147](https://github.com/expo/entity/issues/147)) ([f1d9847](https://github.com/expo/entity/commit/f1d9847210f5775de964509e44ce493e44482b21))
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-
-### Features
-
-* add cascading deletion info ([#145](https://github.com/expo/entity/issues/145)) ([3727191](https://github.com/expo/entity/commit/372719176742d3ead6b7cbca29cb66b09b3fe09c))
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-
-### Features
-
-* Add IntField and FloatField, deprecate NumberField ([#131](https://github.com/expo/entity/issues/131)) ([2f2d963](https://github.com/expo/entity/commit/2f2d963cf92c6575d78f8eeca344a4aadcc9b8d9))
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-
-### Features
-
-* allow null field values in loadManyByFieldEqualityConjunctionAsync ([#130](https://github.com/expo/entity/issues/130)) ([2f37dc6](https://github.com/expo/entity/commit/2f37dc6a37d368b12b3c8375e04f0777fd448797))
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-
-### Bug Fixes
-
-* typescript typedef of EntityMutationInfo ([#121](https://github.com/expo/entity/issues/121)) ([8e8f0dc](https://github.com/expo/entity/commit/8e8f0dc8636e343e29a6012d155e4111477a8989))
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-
-### Bug Fixes
-
-* mutation validator and trigger cyclic import structure ([#118](https://github.com/expo/entity/issues/118)) ([b11dbc0](https://github.com/expo/entity/commit/b11dbc087ba5ad13c748032698dd73279b7960b0))
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* move runInTransaction to ViewerContext ([#108](https://github.com/expo/entity/issues/108)) ([b7309e1](https://github.com/expo/entity/commit/b7309e18a2dd780b64cd306d566de1f12bf8df3a))
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Features
-
-* better cache adapter error handling ([#102](https://github.com/expo/entity/issues/102)) ([15546aa](https://github.com/expo/entity/commit/15546aad97734ab9ac67f1c012485f096a0e94f1))
-* better database adapter error handling ([#101](https://github.com/expo/entity/issues/101)) ([5208aee](https://github.com/expo/entity/commit/5208aeedb0192f0460ba3d575770a04175f5c3aa))
-
-
-
-
-
 # [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)

 **Note:** Version bump only for package @expo/entity-database-adapter-knex
@@ -9,16 +9,16 @@
 During `EntityCompanionProvider` instantiation:

 ```typescript
-import { knex, Knex } from 'knex';
+import Knex from 'knex';

-const knexInstance = knex({
+const knexInstance = Knex({
  client: 'pg',
  connection: {
-    user: process.env['PGUSER'],
-    password: process.env['PGPASSWORD'],
-    host: process.env['PGHOST'],
-    port: parseInt(nullthrows(process.env['PGPORT']), 10),
-    database: process.env['PGDATABASE'],
+    user: process.env.PGUSER,
+    password: process.env.PGPASSWORD,
+    host: process.env.PGHOST,
+    port: parseInt(process.env.PGPORT!, 10),
+    database: process.env.PGDATABASE,
  },
 });

@@ -29,7 +29,7 @@ export const createDefaultEntityCompanionProvider = (
    metricsAdapter,
    {
      // add the knex database adapter flavor
-      ['postgres']: {
+      [DatabaseAdapterFlavor.POSTGRES]: {
        adapter: PostgresEntityDatabaseAdapter,
        queryContextProvider: new PostgresEntityQueryContextProvider(knexInstance),
      },
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity-database-adapter-knex",
-  "version": "0.31.0",
+  "version": "0.10.0",
  "description": "Knex database adapter for @expo/entity",
  "files": [
    "build",
@@ -11,8 +11,7 @@
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
+    "lint": "eslint src --ext '.ts'",
    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
@@ -30,10 +29,9 @@
    "@expo/entity": "*"
  },
  "dependencies": {
-    "knex": "^2.4.1"
+    "knex": "^0.21.5"
  },
  "devDependencies": {
-    "@expo/entity": "^0.31.0",
-    "pg": "^8.7.1"
+    "@expo/entity": "^0.10.0"
  }
 }
@@ -1,29 +0,0 @@
-import { EntityFieldDefinition } from '@expo/entity';
-
-/**
- * EntityFieldDefinition for a Postres column with a JS JSON array type.
- */
-export class JSONArrayField extends EntityFieldDefinition<any[]> {
-  protected validateInputValueInternal(value: any[]): boolean {
-    return Array.isArray(value);
-  }
-}
-
-/**
- * EntityFieldDefinition for a Postgres column that may be a JS JSON array type.
- * Does not do any validation.
- */
-export class MaybeJSONArrayField extends EntityFieldDefinition<any | any[]> {
-  protected validateInputValueInternal(_value: any): boolean {
-    return true;
-  }
-}
-
-/**
- * EntityFieldDefinition for a Postgres BIGINT column.
- */
-export class BigIntField extends EntityFieldDefinition<string> {
-  protected validateInputValueInternal(value: string): boolean {
-    return typeof value === 'string';
-  }
-}
@@ -2,15 +2,13 @@ import {
  EntityDatabaseAdapter,
  FieldTransformerMap,
  FieldTransformer,
+  JSONArrayField,
+  MaybeJSONArrayField,
  TableQuerySelectionModifiers,
  TableFieldSingleValueEqualityCondition,
  TableFieldMultiValueEqualityCondition,
-  TableQuerySelectionModifiersWithOrderByRaw,
 } from '@expo/entity';
-import { Knex } from 'knex';
-
-import { JSONArrayField, MaybeJSONArrayField } from './EntityFields';
-import wrapNativePostgresCallAsync from './errors/wrapNativePostgresCallAsync';
+import Knex from 'knex';

 export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDatabaseAdapter<TFields> {
  protected getFieldTransformerMap(): FieldTransformerMap {
@@ -45,26 +43,10 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba
    tableField: string,
    tableValues: readonly any[]
  ): Promise<object[]> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface
-        .select()
-        .from(tableName)
-        .whereRaw('?? = ANY(?)', [tableField, tableValues as any[]])
-    );
-  }
-
-  private applyQueryModifiersToQueryOrderByRaw(
-    query: Knex.QueryBuilder,
-    querySelectionModifiers: TableQuerySelectionModifiersWithOrderByRaw
-  ): Knex.QueryBuilder {
-    let ret = this.applyQueryModifiersToQuery(query, querySelectionModifiers);
-
-    const { orderByRaw } = querySelectionModifiers;
-    if (orderByRaw !== undefined) {
-      ret = ret.orderByRaw(orderByRaw);
-    }
-
-    return ret;
+    return await queryInterface
+      .select()
+      .from(tableName)
+      .whereRaw('?? = ANY(?)', [tableField, tableValues as any[]]);
  }

  private applyQueryModifiersToQuery(
@@ -103,39 +85,20 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba

    if (tableFieldSingleValueEqualityOperands.length > 0) {
      const whereObject: { [key: string]: any } = {};
-      const nonNullTableFieldSingleValueEqualityOperands =
-        tableFieldSingleValueEqualityOperands.filter(({ tableValue }) => tableValue !== null);
-      const nullTableFieldSingleValueEqualityOperands =
-        tableFieldSingleValueEqualityOperands.filter(({ tableValue }) => tableValue === null);
-
-      if (nonNullTableFieldSingleValueEqualityOperands.length > 0) {
-        for (const { tableField, tableValue } of nonNullTableFieldSingleValueEqualityOperands) {
-          whereObject[tableField] = tableValue;
-        }
-        query = query.where(whereObject);
-      }
-      if (nullTableFieldSingleValueEqualityOperands.length > 0) {
-        for (const { tableField } of nullTableFieldSingleValueEqualityOperands) {
-          query = query.whereNull(tableField);
-        }
+      for (const { tableField, tableValue } of tableFieldSingleValueEqualityOperands) {
+        whereObject[tableField] = tableValue;
      }
+      query = query.where(whereObject);
    }

    if (tableFieldMultiValueEqualityOperands.length > 0) {
      for (const { tableField, tableValues } of tableFieldMultiValueEqualityOperands) {
-        const nonNullTableValues = tableValues.filter((tableValue) => tableValue !== null);
-        query = query.where((builder) => {
-          builder.whereRaw('?? = ANY(?)', [tableField, [...nonNullTableValues]]);
-          // there was at least one null, allow null in this equality clause
-          if (nonNullTableValues.length !== tableValues.length) {
-            builder.orWhereNull(tableField);
-          }
-        });
+        query = query.whereRaw('?? = ANY(?)', [tableField, tableValues]);
      }
    }

    query = this.applyQueryModifiersToQuery(query, querySelectionModifiers);
-    return await wrapNativePostgresCallAsync(() => query);
+    return await query;
  }

  protected async fetchManyByRawWhereClauseInternalAsync(
@@ -143,14 +106,14 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba
    tableName: string,
    rawWhereClause: string,
    bindings: object | any[],
-    querySelectionModifiers: TableQuerySelectionModifiersWithOrderByRaw
+    querySelectionModifiers: TableQuerySelectionModifiers
  ): Promise<object[]> {
    let query = queryInterface
      .select()
      .from(tableName)
      .whereRaw(rawWhereClause, bindings as any);
-    query = this.applyQueryModifiersToQueryOrderByRaw(query, querySelectionModifiers);
-    return await wrapNativePostgresCallAsync(() => query);
+    query = this.applyQueryModifiersToQuery(query, querySelectionModifiers);
+    return await query;
  }

  protected async insertInternalAsync(
@@ -158,9 +121,7 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba
    tableName: string,
    object: object
  ): Promise<object[]> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface.insert(object).into(tableName).returning('*')
-    );
+    return await queryInterface.insert(object).into(tableName).returning('*');
  }

  protected async updateInternalAsync(
@@ -170,9 +131,11 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba
    id: any,
    object: object
  ): Promise<object[]> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface.update(object).into(tableName).where(tableIdField, id).returning('*')
-    );
+    return await queryInterface
+      .update(object)
+      .into(tableName)
+      .where(tableIdField, id)
+      .returning('*');
  }

  protected async deleteInternalAsync(
@@ -181,8 +144,6 @@ export default class PostgresEntityDatabaseAdapter<TFields> extends EntityDataba
    tableIdField: string,
    id: any
  ): Promise<number> {
-    return await wrapNativePostgresCallAsync(() =>
-      queryInterface.into(tableName).where(tableIdField, id).del()
-    );
+    return await queryInterface.into(tableName).where(tableIdField, id).del();
  }
 }
@@ -7,8 +7,7 @@ import {
 import PostgresEntityDatabaseAdapter from './PostgresEntityDatabaseAdapter';

 export default class PostgresEntityDatabaseAdapterProvider
-  implements IEntityDatabaseAdapterProvider
-{
+  implements IEntityDatabaseAdapterProvider {
  getDatabaseAdapter<TFields>(
    entityConfiguration: EntityConfiguration<TFields>
  ): EntityDatabaseAdapter<TFields> {
@@ -1,5 +1,5 @@
 import { EntityQueryContextProvider } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 /**
 * Query context provider for knex (postgres).
@@ -18,10 +18,4 @@ export default class PostgresEntityQueryContextProvider extends EntityQueryConte
  ) => Promise<T> {
    return (transactionScope) => this.knexInstance.transaction(transactionScope);
  }
-
-  protected createNestedTransactionRunner<T>(
-    outerQueryInterface: any
-  ): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T> {
-    return (transactionScope) => (outerQueryInterface as Knex).transaction(transactionScope);
-  }
 }
@@ -5,8 +5,7 @@ import {
  ViewerContext,
 } from '@expo/entity';
 import { enforceAsyncResult } from '@expo/results';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
+import Knex from 'knex';

 import PostgresTestEntity from '../testfixtures/PostgresTestEntity';
 import PostgresTriggerTestEntity from '../testfixtures/PostgresTriggerTestEntity';
@@ -17,14 +16,14 @@ describe('postgres entity integration', () => {
  let knexInstance: Knex;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
  });
@@ -95,7 +94,7 @@ describe('postgres entity integration', () => {
    const errorToThrow = new Error('Intentional error');

    await expect(
-      vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
+      PostgresTestEntity.runInTransactionAsync(vc1, async (queryContext) => {
        // put another in the DB that will be rolled back due to error thrown
        await enforceAsyncResult(
          PostgresTestEntity.creator(vc1, queryContext).setField('name', 'hello').createAsync()
@@ -157,27 +156,6 @@ describe('postgres entity integration', () => {
    });
  });

-  describe('BIGINT fields', () => {
-    it('supports BIGINT fields', async () => {
-      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-      let entity = await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1).setField('bigintField', '72057594037928038').createAsync()
-      );
-      expect(entity.getField('bigintField')).toEqual('72057594037928038');
-
-      entity = await enforceAsyncResult(
-        PostgresTestEntity.updater(entity).setField('bigintField', '10').updateAsync()
-      );
-      expect(entity.getField('bigintField')).toEqual('10');
-
-      entity = await enforceAsyncResult(
-        PostgresTestEntity.updater(entity).setField('bigintField', '-10').updateAsync()
-      );
-      expect(entity.getField('bigintField')).toEqual('-10');
-    });
-  });
-
  describe('conjunction field equality loading', () => {
    it('supports single fieldValue and multiple fieldValues', async () => {
      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
@@ -253,59 +231,6 @@ describe('postgres entity integration', () => {
      expect(results).toHaveLength(2);
      expect(results.map((e) => e.getField('name'))).toEqual(['b', 'a']);
    });
-
-    it('supports null field values', async () => {
-      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', 'a')
-          .setField('hasADog', true)
-          .createAsync()
-      );
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', 'b')
-          .setField('hasADog', true)
-          .createAsync()
-      );
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', null)
-          .setField('hasADog', true)
-          .createAsync()
-      );
-      await enforceAsyncResult(
-        PostgresTestEntity.creator(vc1)
-          .setField('name', null)
-          .setField('hasADog', false)
-          .createAsync()
-      );
-
-      const results = await PostgresTestEntity.loader(vc1)
-        .enforcing()
-        .loadManyByFieldEqualityConjunctionAsync([{ fieldName: 'name', fieldValue: null }]);
-      expect(results).toHaveLength(2);
-      expect(results[0]!.getField('name')).toBeNull();
-
-      const results2 = await PostgresTestEntity.loader(vc1)
-        .enforcing()
-        .loadManyByFieldEqualityConjunctionAsync(
-          [
-            { fieldName: 'name', fieldValues: ['a', null] },
-            { fieldName: 'hasADog', fieldValue: true },
-          ],
-          {
-            orderBy: [
-              {
-                fieldName: 'name',
-                order: OrderByOrdering.DESCENDING,
-              },
-            ],
-          }
-        );
-      expect(results2).toHaveLength(2);
-      expect(results2.map((e) => e.getField('name'))).toEqual([null, 'a']);
-    });
  });

  describe('raw where clause loading', () => {
@@ -400,15 +325,6 @@ describe('postgres entity integration', () => {

      expect(resultsMultipleOrderBy).toHaveLength(3);
      expect(resultsMultipleOrderBy.map((e) => e.getField('name'))).toEqual(['c', 'b', 'a']);
-
-      const resultsOrderByRaw = await PostgresTestEntity.loader(vc1)
-        .enforcing()
-        .loadManyByRawWhereClauseAsync('has_a_dog = ?', [true], {
-          orderByRaw: 'has_a_dog ASC, name DESC',
-        });
-
-      expect(resultsOrderByRaw).toHaveLength(3);
-      expect(resultsOrderByRaw.map((e) => e.getField('name'))).toEqual(['c', 'b', 'a']);
    });
  });

@@ -630,61 +546,4 @@ describe('postgres entity integration', () => {
      });
    });
  });
-
-  describe('queryContext callback behavior', () => {
-    it('calls callbacks correctly', async () => {
-      const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-      let preCommitCallCount = 0;
-      let preCommitInnerCallCount = 0;
-      let postCommitCallCount = 0;
-
-      await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-        queryContext.appendPostCommitCallback(async () => {
-          postCommitCallCount++;
-        });
-        queryContext.appendPreCommitCallback(async () => {
-          preCommitCallCount++;
-        }, 0);
-
-        await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-          innerQueryContext.appendPostCommitCallback(async () => {
-            postCommitCallCount++;
-          });
-          innerQueryContext.appendPreCommitCallback(async () => {
-            preCommitInnerCallCount++;
-          }, 0);
-        });
-
-        // this one throws so its post commit shouldn't execute
-        try {
-          await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-            innerQueryContext.appendPostCommitCallback(async () => {
-              postCommitCallCount++;
-            });
-            innerQueryContext.appendPreCommitCallback(async () => {
-              preCommitInnerCallCount++;
-              throw Error('wat');
-            }, 0);
-          });
-        } catch {}
-      });
-
-      await expect(
-        vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-          queryContext.appendPostCommitCallback(async () => {
-            postCommitCallCount++;
-          });
-          queryContext.appendPreCommitCallback(async () => {
-            preCommitCallCount++;
-            throw Error('wat');
-          }, 0);
-        })
-      ).rejects.toThrowError('wat');
-
-      expect(preCommitCallCount).toBe(2);
-      expect(preCommitInnerCallCount).toBe(2);
-      expect(postCommitCallCount).toBe(2);
-    });
-  });
 });
@@ -1,101 +0,0 @@
-import { ViewerContext } from '@expo/entity';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-
-import PostgresEntityQueryContextProvider from '../PostgresEntityQueryContextProvider';
-import PostgresUniqueTestEntity from '../testfixtures/PostgresUniqueTestEntity';
-import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';
-
-describe(PostgresEntityQueryContextProvider, () => {
-  let knexInstance: Knex;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-  });
-
-  beforeEach(async () => {
-    await PostgresUniqueTestEntity.createOrTruncatePostgresTable(knexInstance);
-  });
-
-  afterAll(async () => {
-    await PostgresUniqueTestEntity.dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-  });
-
-  it('supports nested transactions', async () => {
-    const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-    await PostgresUniqueTestEntity.creator(vc1).setField('name', 'unique').enforceCreateAsync();
-
-    const id = (
-      await PostgresUniqueTestEntity.creator(vc1).setField('name', 'wat').enforceCreateAsync()
-    ).getID();
-
-    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-      const entity = await PostgresUniqueTestEntity.loader(vc1, queryContext)
-        .enforcing()
-        .loadByIDAsync(id);
-      await PostgresUniqueTestEntity.updater(entity, queryContext)
-        .setField('name', 'wat2')
-        .enforceUpdateAsync();
-
-      // ensure the outer transaction is not aborted due to postgres error in inner transaction,
-      // in this case the error triggered is a unique constraint violation
-      try {
-        await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-          const entity = await PostgresUniqueTestEntity.loader(vc1, innerQueryContext)
-            .enforcing()
-            .loadByIDAsync(id);
-          await PostgresUniqueTestEntity.updater(entity, innerQueryContext)
-            .setField('name', 'unique')
-            .enforceUpdateAsync();
-        });
-      } catch {}
-
-      const entity2 = await PostgresUniqueTestEntity.loader(vc1, queryContext)
-        .enforcing()
-        .loadByIDAsync(id);
-      await PostgresUniqueTestEntity.updater(entity2, queryContext)
-        .setField('name', 'wat3')
-        .enforceUpdateAsync();
-    });
-
-    const entityLoaded = await PostgresUniqueTestEntity.loader(vc1).enforcing().loadByIDAsync(id);
-    expect(entityLoaded.getField('name')).toEqual('wat3');
-  });
-
-  it('supports multi-nested transactions', async () => {
-    const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-    const id = (
-      await PostgresUniqueTestEntity.creator(vc1).setField('name', 'wat').enforceCreateAsync()
-    ).getID();
-
-    await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
-      await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
-        await innerQueryContext.runInNestedTransactionAsync(async (innerQueryContex2) => {
-          await innerQueryContex2.runInNestedTransactionAsync(async (innerQueryContex3) => {
-            const entity = await PostgresUniqueTestEntity.loader(vc1, innerQueryContex3)
-              .enforcing()
-              .loadByIDAsync(id);
-            await PostgresUniqueTestEntity.updater(entity, innerQueryContex3)
-              .setField('name', 'wat3')
-              .enforceUpdateAsync();
-          });
-        });
-      });
-    });
-
-    const entityLoaded = await PostgresUniqueTestEntity.loader(vc1).enforcing().loadByIDAsync(id);
-    expect(entityLoaded.getField('name')).toEqual('wat3');
-  });
-});
@@ -1,7 +1,6 @@
 import { ViewerContext } from '@expo/entity';
 import { enforceAsyncResult } from '@expo/results';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
+import Knex from 'knex';

 import InvalidTestEntity from '../testfixtures/InvalidTestEntity';
 import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';
@@ -10,14 +9,14 @@ describe('postgres entity integration', () => {
  let knexInstance: Knex;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
  });
@@ -1,171 +0,0 @@
-import {
-  ViewerContext,
-  EntityDatabaseAdapterCheckConstraintError,
-  EntityDatabaseAdapterExclusionConstraintError,
-  EntityDatabaseAdapterForeignKeyConstraintError,
-  EntityDatabaseAdapterNotNullConstraintError,
-  EntityDatabaseAdapterTransientError,
-  EntityDatabaseAdapterUniqueConstraintError,
-  EntityDatabaseAdapterUnknownError,
-} from '@expo/entity';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
-
-import ErrorsTestEntity from '../testfixtures/ErrorsTestEntity';
-import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';
-
-describe('postgres errors', () => {
-  let knexInstance: Knex;
-
-  beforeAll(() => {
-    knexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-    });
-  });
-
-  beforeEach(async () => {
-    await ErrorsTestEntity.createOrTruncatePostgresTable(knexInstance);
-  });
-
-  afterAll(async () => {
-    await ErrorsTestEntity.dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-  });
-
-  it('throws EntityDatabaseAdapterTransientError on Knex timeout', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await ErrorsTestEntity.creator(vc)
-      .setField('id', 1)
-      .setField('fieldNonNull', 'hello')
-      .enforceCreateAsync();
-
-    const shortTimeoutKnexInstance = knex({
-      client: 'pg',
-      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
-        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
-      },
-      acquireConnectionTimeout: 1,
-    });
-    const vc2 = new ViewerContext(
-      createKnexIntegrationTestEntityCompanionProvider(shortTimeoutKnexInstance)
-    );
-    await expect(ErrorsTestEntity.loader(vc2).enforcing().loadByIDAsync(1)).rejects.toThrow(
-      EntityDatabaseAdapterTransientError
-    );
-    await shortTimeoutKnexInstance.destroy();
-  });
-
-  it('throws EntityDatabaseAdapterNotNullConstraintError when not null is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', null as any)
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterNotNullConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterForeignKeyConstraintError when foreign key is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldForeignKey', 2)
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterForeignKeyConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterUniqueConstraintError when primary key unique constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-
-    await ErrorsTestEntity.creator(vc)
-      .setField('id', 1)
-      .setField('fieldNonNull', 'hello')
-      .enforceCreateAsync();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterUniqueConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterUniqueConstraintError when unique constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await ErrorsTestEntity.creator(vc)
-      .setField('id', 2)
-      .setField('fieldNonNull', 'hello')
-      .setField('fieldUnique', 'hello')
-      .enforceCreateAsync();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldUnique', 'hello')
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterUniqueConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterCheckConstraintError when check constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('checkLessThan5', 2)
-        .enforceCreateAsync()
-    ).resolves.toBeTruthy();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 2)
-        .setField('fieldNonNull', 'hello')
-        .setField('checkLessThan5', 10)
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterCheckConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterExclusionConstraintError when exclusion constraint is violated', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldExclusion', 'what')
-        .enforceCreateAsync()
-    ).resolves.toBeTruthy();
-
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 2)
-        .setField('fieldNonNull', 'hello')
-        .setField('fieldExclusion', 'what')
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterExclusionConstraintError);
-  });
-
-  it('throws EntityDatabaseAdapterUnknownError otherwise', async () => {
-    const vc = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
-    await expect(
-      ErrorsTestEntity.creator(vc)
-        .setField('id', 1)
-        .setField('fieldNonNull', 'hello')
-        .setField('nonExistentColumn', 'what')
-        .enforceCreateAsync()
-    ).rejects.toThrow(EntityDatabaseAdapterUnknownError);
-  });
-});
@@ -1,19 +0,0 @@
-import { describeFieldTestCase } from '@expo/entity';
-
-import { BigIntField, JSONArrayField, MaybeJSONArrayField } from '../EntityFields';
-
-describeFieldTestCase(
-  new JSONArrayField({ columnName: 'wat' }),
-  [[[1, 2]] as any, [['hello']] as any],
-  [1, 'hello']
-);
-describeFieldTestCase(
-  new MaybeJSONArrayField({ columnName: 'wat' }),
-  [1, 'hello', [['hello']]],
-  []
-);
-describeFieldTestCase(
-  new BigIntField({ columnName: 'wat' }),
-  ['123457682149816498126412896', '123', '-1', '-124147812641876482716841'],
-  [1, false, -1, 1e6, {}]
-);
@@ -1,19 +0,0 @@
-import wrapNativePostgresCallAsync from '../wrapNativePostgresCallAsync';
-
-describe(wrapNativePostgresCallAsync, () => {
-  it('rethrows literals', async () => {
-    const throwingFn = async (): Promise<void> => {
-      // eslint-disable-next-line no-throw-literal,@typescript-eslint/no-throw-literal
-      throw 'hello';
-    };
-
-    let capturedThrownThing: any;
-    try {
-      await wrapNativePostgresCallAsync(throwingFn);
-    } catch (e) {
-      capturedThrownThing = e;
-    }
-    expect(capturedThrownThing).not.toBeInstanceOf(Error);
-    expect(capturedThrownThing).toEqual('hello');
-  });
-});
@@ -1,55 +0,0 @@
-import {
-  EntityDatabaseAdapterError,
-  EntityDatabaseAdapterCheckConstraintError,
-  EntityDatabaseAdapterExclusionConstraintError,
-  EntityDatabaseAdapterForeignKeyConstraintError,
-  EntityDatabaseAdapterNotNullConstraintError,
-  EntityDatabaseAdapterTransientError,
-  EntityDatabaseAdapterUniqueConstraintError,
-  EntityDatabaseAdapterUnknownError,
-} from '@expo/entity';
-import { knex } from 'knex';
-
-function wrapNativePostgresError(
-  error: Error & { code?: string }
-): EntityDatabaseAdapterError & Error {
-  const ret = translatePostgresError(error);
-  if (error.stack) {
-    ret.stack = error.stack;
-  }
-  return ret;
-}
-
-function translatePostgresError(
-  error: Error & { code?: string }
-): EntityDatabaseAdapterError & Error {
-  if (error instanceof knex.KnexTimeoutError) {
-    return new EntityDatabaseAdapterTransientError(error.message, error);
-  }
-
-  switch (error.code) {
-    case '23502':
-      return new EntityDatabaseAdapterNotNullConstraintError(error.message, error);
-    case '23503':
-      return new EntityDatabaseAdapterForeignKeyConstraintError(error.message, error);
-    case '23505':
-      return new EntityDatabaseAdapterUniqueConstraintError(error.message, error);
-    case '23514':
-      return new EntityDatabaseAdapterCheckConstraintError(error.message, error);
-    case '23P01':
-      return new EntityDatabaseAdapterExclusionConstraintError(error.message, error);
-    default:
-      return new EntityDatabaseAdapterUnknownError(error.message, error);
-  }
-}
-
-export default async function wrapNativePostgresCallAsync<T>(fn: () => Promise<T>): Promise<T> {
-  try {
-    return await fn();
-  } catch (e) {
-    if (!(e instanceof Error)) {
-      throw e;
-    }
-    throw wrapNativePostgresError(e);
-  }
-}
@@ -1,10 +1,3 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-database-adapter-knex
- */
-
 export { default as PostgresEntityDatabaseAdapter } from './PostgresEntityDatabaseAdapter';
 export { default as PostgresEntityDatabaseAdapterProvider } from './PostgresEntityDatabaseAdapterProvider';
 export { default as PostgresEntityQueryContextProvider } from './PostgresEntityQueryContextProvider';
-export * from './EntityFields';
@@ -1,177 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-  IntField,
-} from '@expo/entity';
-import { Knex } from 'knex';
-
-type ErrorsTestEntityFields = {
-  id: number;
-  fieldNonNull: string;
-  fieldForeignKey: number | null;
-  fieldUnique: string | null;
-  checkLessThan5: number | null;
-  fieldExclusion: string | null;
-  nonExistentColumn: string | null;
-};
-
-const foreignTableName = 'foreign_table';
-
-export default class ErrorsTestEntity extends Entity<
-  ErrorsTestEntityFields,
-  number,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    ErrorsTestEntityFields,
-    number,
-    ViewerContext,
-    ErrorsTestEntity,
-    ErrorsTestEntityPrivacyPolicy
-  > {
-    return errorsTestEntityCompanionDefinition;
-  }
-
-  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    await knex.raw('CREATE EXTENSION IF NOT EXISTS "btree_gist"'); // for gist exclusion on varchar
-
-    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
-
-    const hasForeignTable = await knex.schema.hasTable(foreignTableName);
-    if (!hasForeignTable) {
-      await knex.schema.createTable(foreignTableName, (table) => {
-        table.integer('id').primary();
-      });
-    }
-
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (!hasTable) {
-      await knex.schema.createTable(tableName, (table) => {
-        table.integer('id').primary();
-        table.string('field_non_null').notNullable();
-        table.integer('field_foreign_key').references(`${foreignTableName}.id`);
-        table.string('field_unique').unique();
-        table.integer('check_less_than_5');
-        table.string('field_exclusion');
-      });
-
-      await knex.raw(
-        `
-        ALTER TABLE :tableName:
-        ADD CONSTRAINT check_less_than_5_check_constraint
-        CHECK (check_less_than_5 IS NULL OR check_less_than_5 < 5);`,
-        {
-          tableName,
-        }
-      );
-
-      await knex.raw(
-        `
-        ALTER TABLE :tableName:
-        ADD CONSTRAINT field_exclusion_exclusion_constraint
-        EXCLUDE USING gist (field_exclusion WITH =);
-        `,
-        {
-          tableName,
-        }
-      );
-    }
-
-    await knex(tableName).delete();
-    await knex(foreignTableName).delete();
-  }
-
-  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (hasTable) {
-      await knex.schema.dropTable(tableName);
-    }
-
-    const hasForeignTable = await knex.schema.hasTable(foreignTableName);
-    if (hasForeignTable) {
-      await knex.schema.dropTable(foreignTableName);
-    }
-  }
-}
-
-class ErrorsTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  ErrorsTestEntityFields,
-  number,
-  ViewerContext,
-  ErrorsTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      ErrorsTestEntityFields,
-      number,
-      ViewerContext,
-      ErrorsTestEntity
-    >(),
-  ];
-}
-
-export const ErrorsTestEntityConfiguration = new EntityConfiguration<ErrorsTestEntityFields>({
-  idField: 'id',
-  tableName: 'postgres_test_entities',
-  schema: {
-    id: new IntField({
-      columnName: 'id',
-    }),
-    fieldNonNull: new StringField({
-      columnName: 'field_non_null',
-    }),
-    fieldForeignKey: new IntField({
-      columnName: 'field_foreign_key',
-    }),
-    fieldUnique: new StringField({
-      columnName: 'field_unique',
-    }),
-    checkLessThan5: new IntField({
-      columnName: 'check_less_than_5',
-    }),
-    fieldExclusion: new StringField({
-      columnName: 'field_exclusion',
-    }),
-    nonExistentColumn: new StringField({
-      columnName: 'non_existent_column',
-    }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
-});
-
-const errorsTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: ErrorsTestEntity,
-  entityConfiguration: ErrorsTestEntityConfiguration,
-  privacyPolicyClass: ErrorsTestEntityPrivacyPolicy,
-});
@@ -4,11 +4,13 @@ import {
  ViewerContext,
  StringField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
-  IntField,
+  NumberField,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 type InvalidTestEntityFields = {
  id: number;
@@ -57,7 +59,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  InvalidTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -65,7 +67,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      InvalidTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -73,7 +75,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      InvalidTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -81,7 +83,7 @@ class InvalidTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      InvalidTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      InvalidTestEntityFields,
      number,
@@ -95,15 +97,15 @@ export const invalidTestEntityConfiguration = new EntityConfiguration<InvalidTes
  idField: 'id',
  tableName: 'postgres_test_entities',
  schema: {
-    id: new IntField({
+    id: new NumberField({
      columnName: 'id',
    }),
    name: new StringField({
      columnName: 'name',
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 const invalidTestEntityCompanionDefinition = new EntityCompanionDefinition({
@@ -6,15 +6,17 @@ import {
  StringField,
  BooleanField,
  StringArrayField,
+  JSONArrayField,
  JSONObjectField,
  DateField,
+  MaybeJSONArrayField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
 } from '@expo/entity';
-import { Knex } from 'knex';
-
-import { BigIntField, JSONArrayField, MaybeJSONArrayField } from '../EntityFields';
+import Knex from 'knex';

 type PostgresTestEntityFields = {
  id: string;
@@ -28,7 +30,6 @@ type PostgresTestEntityFields = {
  } | null;
  dateField: Date | null;
  maybeJsonArrayField: string[] | { hello: string } | null;
-  bigintField: string | null;
 };

 export default class PostgresTestEntity extends Entity<
@@ -47,11 +48,13 @@ export default class PostgresTestEntity extends Entity<
  }

  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
+    await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (!hasTable) {
      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+        table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
        table.string('name');
        table.boolean('has_a_dog');
        table.boolean('has_a_cat');
@@ -60,7 +63,6 @@ export default class PostgresTestEntity extends Entity<
        table.jsonb('json_object_field');
        table.dateTime('date_field', { useTz: true });
        table.jsonb('maybe_json_array_field');
-        table.bigint('bigint_field');
      });
    }
    await knex.into(tableName).truncate();
@@ -81,7 +83,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  PostgresTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -89,7 +91,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -97,7 +99,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -105,7 +107,7 @@ class PostgresTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTestEntityFields,
      string,
@@ -147,12 +149,9 @@ export const postgresTestEntityConfiguration = new EntityConfiguration<PostgresT
    maybeJsonArrayField: new MaybeJSONArrayField({
      columnName: 'maybe_json_array_field',
    }),
-    bigintField: new BigIntField({
-      columnName: 'bigint_field',
-    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 const postgresTestEntityCompanionDefinition = new EntityCompanionDefinition({
@@ -5,14 +5,15 @@ import {
  UUIDField,
  StringField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
  EntityMutationTrigger,
  EntityQueryContext,
  EntityNonTransactionalMutationTrigger,
-  EntityTriggerMutationInfo,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 type PostgresTriggerTestEntityFields = {
  id: string;
@@ -35,11 +36,13 @@ export default class PostgresTriggerTestEntity extends Entity<
  }

  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
+    await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (!hasTable) {
      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+        table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
        table.string('name');
      });
    }
@@ -61,7 +64,7 @@ class PostgresTriggerTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  PostgresTriggerTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTriggerTestEntityFields,
      string,
@@ -69,7 +72,7 @@ class PostgresTriggerTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTriggerTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTriggerTestEntityFields,
      string,
@@ -77,7 +80,7 @@ class PostgresTriggerTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTriggerTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTriggerTestEntityFields,
      string,
@@ -85,7 +88,7 @@ class PostgresTriggerTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresTriggerTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresTriggerTestEntityFields,
      string,
@@ -108,13 +111,7 @@ class ThrowConditionallyTrigger extends EntityMutationTrigger<
  async executeAsync(
    _viewerContext: ViewerContext,
    _queryContext: EntityQueryContext,
-    entity: PostgresTriggerTestEntity,
-    _mutationInfo: EntityTriggerMutationInfo<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >
+    entity: PostgresTriggerTestEntity
  ): Promise<void> {
    if (entity.getField(this.fieldName) === this.badValue) {
      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
@@ -142,28 +139,29 @@ class ThrowConditionallyNonTransactionalTrigger extends EntityNonTransactionalMu
  }
 }

-export const postgresTestEntityConfiguration =
-  new EntityConfiguration<PostgresTriggerTestEntityFields>({
-    idField: 'id',
-    tableName: 'postgres_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
+export const postgresTestEntityConfiguration = new EntityConfiguration<
+  PostgresTriggerTestEntityFields
+>({
+  idField: 'id',
+  tableName: 'postgres_test_entities',
+  schema: {
+    id: new UUIDField({
+      columnName: 'id',
+      cache: true,
+    }),
+    name: new StringField({
+      columnName: 'name',
+    }),
+  },
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
+});

 const postgresTestEntityCompanionDefinition = new EntityCompanionDefinition({
  entityClass: PostgresTriggerTestEntity,
  entityConfiguration: postgresTestEntityConfiguration,
  privacyPolicyClass: PostgresTriggerTestEntityPrivacyPolicy,
-  mutationTriggers: () => ({
+  mutationTriggers: {
    beforeCreate: [new ThrowConditionallyTrigger('name', 'beforeCreate')],
    afterCreate: [new ThrowConditionallyTrigger('name', 'afterCreate')],
    beforeUpdate: [new ThrowConditionallyTrigger('name', 'beforeUpdate')],
@@ -173,5 +171,5 @@ const postgresTestEntityCompanionDefinition = new EntityCompanionDefinition({
    beforeAll: [new ThrowConditionallyTrigger('name', 'beforeAll')],
    afterAll: [new ThrowConditionallyTrigger('name', 'afterAll')],
    afterCommit: [new ThrowConditionallyNonTransactionalTrigger('name', 'afterCommit')],
-  }),
+  },
 });
@@ -1,115 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-import { Knex } from 'knex';
-
-type PostgresUniqueTestEntityFields = {
-  id: string;
-  name: string | null;
-};
-
-export default class PostgresUniqueTestEntity extends Entity<
-  PostgresUniqueTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    PostgresUniqueTestEntityFields,
-    string,
-    ViewerContext,
-    PostgresUniqueTestEntity,
-    PostgresUniqueTestEntityPrivacyPolicy
-  > {
-    return postgresTestEntityCompanionDefinition;
-  }
-
-  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
-    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (!hasTable) {
-      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-        table.string('name').unique();
-      });
-    }
-    await knex.into(tableName).truncate();
-  }
-
-  public static async dropPostgresTable(knex: Knex): Promise<void> {
-    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
-    const hasTable = await knex.schema.hasTable(tableName);
-    if (hasTable) {
-      await knex.schema.dropTable(tableName);
-    }
-  }
-}
-
-class PostgresUniqueTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  PostgresUniqueTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresUniqueTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresUniqueTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresUniqueTestEntity
-    >(),
-  ];
-}
-
-export const postgresTestEntityConfiguration =
-  new EntityConfiguration<PostgresUniqueTestEntityFields>({
-    idField: 'id',
-    tableName: 'postgres_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
-
-const postgresTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: PostgresUniqueTestEntity,
-  entityConfiguration: postgresTestEntityConfiguration,
-  privacyPolicyClass: PostgresUniqueTestEntityPrivacyPolicy,
-});
@@ -5,13 +5,14 @@ import {
  UUIDField,
  StringField,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  EntityCompanionDefinition,
  Entity,
  EntityMutationTrigger,
  EntityQueryContext,
-  EntityValidatorMutationInfo,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 type PostgresValidatorTestEntityFields = {
  id: string;
@@ -34,11 +35,13 @@ export default class PostgresValidatorTestEntity extends Entity<
  }

  public static async createOrTruncatePostgresTable(knex: Knex): Promise<void> {
+    await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
    const tableName = this.getCompanionDefinition().entityConfiguration.tableName;
    const hasTable = await knex.schema.hasTable(tableName);
    if (!hasTable) {
      await knex.schema.createTable(tableName, (table) => {
-        table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+        table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
        table.string('name');
      });
    }
@@ -60,7 +63,7 @@ class PostgresValidatorTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  PostgresValidatorTestEntity
 > {
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresValidatorTestEntityFields,
      string,
@@ -68,7 +71,7 @@ class PostgresValidatorTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresValidatorTestEntity
    >(),
  ];
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresValidatorTestEntityFields,
      string,
@@ -76,7 +79,7 @@ class PostgresValidatorTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresValidatorTestEntity
    >(),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresValidatorTestEntityFields,
      string,
@@ -84,7 +87,7 @@ class PostgresValidatorTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
      PostgresValidatorTestEntity
    >(),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AlwaysAllowPrivacyPolicyRule<
      PostgresValidatorTestEntityFields,
      string,
@@ -110,13 +113,7 @@ class ThrowConditionallyTrigger extends EntityMutationTrigger<
  async executeAsync(
    _viewerContext: ViewerContext,
    _queryContext: EntityQueryContext,
-    entity: PostgresValidatorTestEntity,
-    _mutationInfo: EntityValidatorMutationInfo<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >
+    entity: PostgresValidatorTestEntity
  ): Promise<void> {
    if (entity.getField(this.fieldName) === this.badValue) {
      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
@@ -124,26 +121,27 @@ class ThrowConditionallyTrigger extends EntityMutationTrigger<
  }
 }

-export const postgresTestEntityConfiguration =
-  new EntityConfiguration<PostgresValidatorTestEntityFields>({
-    idField: 'id',
-    tableName: 'postgres_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
-  });
+export const postgresTestEntityConfiguration = new EntityConfiguration<
+  PostgresValidatorTestEntityFields
+>({
+  idField: 'id',
+  tableName: 'postgres_test_entities',
+  schema: {
+    id: new UUIDField({
+      columnName: 'id',
+      cache: true,
+    }),
+    name: new StringField({
+      columnName: 'name',
+    }),
+  },
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
+});

 const postgresTestEntityCompanionDefinition = new EntityCompanionDefinition({
  entityClass: PostgresValidatorTestEntity,
  entityConfiguration: postgresTestEntityConfiguration,
  privacyPolicyClass: PostgresValidatorTestEntityPrivacyPolicy,
-  mutationValidators: () => [new ThrowConditionallyTrigger('name', 'beforeCreateAndBeforeUpdate')],
+  mutationValidators: [new ThrowConditionallyTrigger('name', 'beforeCreateAndBeforeUpdate')],
 });
@@ -2,9 +2,11 @@ import {
  NoOpEntityMetricsAdapter,
  IEntityMetricsAdapter,
  EntityCompanionProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
  InMemoryFullCacheStubCacheAdapterProvider,
 } from '@expo/entity';
-import { Knex } from 'knex';
+import Knex from 'knex';

 import PostgresEntityDatabaseAdapterProvider from '../PostgresEntityDatabaseAdapterProvider';
 import PostgresEntityQueryContextProvider from '../PostgresEntityQueryContextProvider';
@@ -15,22 +17,16 @@ export const createKnexIntegrationTestEntityCompanionProvider = (
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
-          queryContextProvider: new PostgresEntityQueryContextProvider(knex),
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
-        },
-      ],
-    ])
+    {
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
+        queryContextProvider: new PostgresEntityQueryContextProvider(knex),
+      },
+    },
+    {
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
+      },
+    }
  );
 };
@@ -3,236 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-
-### Features
-
-* nested transactions ([#194](https://github.com/expo/entity/issues/194)) ([a77b914](https://github.com/expo/entity/commit/a77b914ad6dc018d1e309c9caf4971088a553ecf))
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Bug Fixes
-
-* remove any cast from EntityLoader ([#100](https://github.com/expo/entity/issues/100)) ([b8e07f9](https://github.com/expo/entity/commit/b8e07f9ddc4077768980c000d61f5ddcc824e2e3))
-
-
-
-
-
 # [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)

 **Note:** Version bump only for package @expo/entity-example
@@ -1,13 +1,12 @@
 {
  "name": "@expo/entity-example",
  "private": true,
-  "version": "0.31.0",
+  "version": "0.10.0",
  "description": "An example integration of the @expo/entity framework",
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
+    "lint": "eslint src --ext '.ts'",
    "test": "jest --rootDir . --config ../../resources/jest.config.js",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
@@ -23,7 +22,7 @@
  "author": "Expo",
  "license": "MIT",
  "dependencies": {
-    "@expo/entity": "^0.31.0",
+    "@expo/entity": "^0.10.0",
    "apollo-server-koa": "^2.16.1",
    "graphql": "^15.3.0",
    "koa": "^2.13.0",
@@ -1,5 +1,4 @@
 import { createUnitTestEntityCompanionProvider } from '@expo/entity';
-import { v4 as uuidv4 } from 'uuid';

 import NoteEntity from '../entities/NoteEntity';
 import { UserViewerContext } from '../viewerContexts';
@@ -7,18 +6,17 @@ import { UserViewerContext } from '../viewerContexts';
 describe(NoteEntity, () => {
  test('demonstrate usage of business logic test utilities', async () => {
    const companionProvider = createUnitTestEntityCompanionProvider();
-    const userId = uuidv4();
-    const viewerContext = new UserViewerContext(companionProvider, userId);
+    const viewerContext = new UserViewerContext(companionProvider, '4');

    const createdEntityResult = await NoteEntity.creator(viewerContext)
-      .setField('userID', userId)
+      .setField('userID', '4')
      .setField('body', 'image')
      .setField('title', 'page')
      .createAsync();
    expect(createdEntityResult.ok).toBe(true);

    const createdEntityResultImpersonate = await NoteEntity.creator(viewerContext)
-      .setField('userID', uuidv4()) // a different user
+      .setField('userID', '5')
      .setField('body', 'image')
      .setField('title', 'page')
      .createAsync();
@@ -1,6 +1,5 @@
 import http from 'http';
 import request from 'supertest';
-import { v4 as uuidv4 } from 'uuid';

 import app from '../app';

@@ -8,15 +7,14 @@ describe('graphql', () => {
  it('allows CRUD of user notes', async () => {
    const server = request(http.createServer(app.callback()));

-    const userId = uuidv4();
-    const responseEmpty = await server.post('/graphql').set('totally-secure-user-id', userId).send({
+    const responseEmpty = await server.post('/graphql').set('totally-secure-user-id', '4').send({
      query: `query { me { notes { id } } }`,
    });
    expect(responseEmpty.body.data.me.notes).toEqual([]);

    const createResponse1 = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
        variables: {
@@ -33,7 +31,7 @@ describe('graphql', () => {

    const createResponse2 = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
        variables: {
@@ -44,17 +42,14 @@ describe('graphql', () => {
        },
      });

-    const responseLength2 = await server
-      .post('/graphql')
-      .set('totally-secure-user-id', userId)
-      .send({
-        query: `query { me { notes { id } } }`,
-      });
+    const responseLength2 = await server.post('/graphql').set('totally-secure-user-id', '4').send({
+      query: `query { me { notes { id } } }`,
+    });
    expect(responseLength2.body.data.me.notes).toHaveLength(2);

    const responseGetSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `query($id: ID!) { noteByID(id: $id) { id, title, body } }`,
        variables: {
@@ -69,7 +64,7 @@ describe('graphql', () => {

    const responseUpdateSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($id: ID!, $note: NoteInput!) { updateNote(id: $id, note: $note) { id, title, body } }`,
        variables: {
@@ -89,7 +84,7 @@ describe('graphql', () => {

    const responseDeleteSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($id: ID!) { deleteNote(id: $id) { id, title, body } }`,
        variables: {
@@ -107,12 +102,9 @@ describe('graphql', () => {
      body: 'boarding',
    });

-    const responseLength1 = await server
-      .post('/graphql')
-      .set('totally-secure-user-id', userId)
-      .send({
-        query: `query { me { notes { id } } }`,
-      });
+    const responseLength1 = await server.post('/graphql').set('totally-secure-user-id', '4').send({
+      query: `query { me { notes { id } } }`,
+    });
    expect(responseLength1.body.data.me.notes).toHaveLength(1);
  });

@@ -135,11 +127,9 @@ describe('graphql', () => {
  it('disallows cross-user note impersonation', async () => {
    const server = request(http.createServer(app.callback()));

-    const userId = uuidv4();
-    const userId2 = uuidv4();
    const createResponse1 = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        query: `mutation($note: NoteInput!) { addNote(note: $note) { id, title, body } }`,
        variables: {
@@ -153,7 +143,7 @@ describe('graphql', () => {
    // notes are public
    const responseGetSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send({
        query: `query($id: ID!) { noteByID(id: $id) { id, title, body } }`,
        variables: {
@@ -169,7 +159,7 @@ describe('graphql', () => {
    // but can only be updated by the owner
    const responseUpdateSingle = await server
      .post('/graphql')
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send({
        query: `mutation($id: ID!, $note: NoteInput!) { updateNote(id: $id, note: $note) { id, title, body } }`,
        variables: {
@@ -1,6 +1,5 @@
 import http from 'http';
 import request from 'supertest';
-import { v4 as uuidv4 } from 'uuid';

 import app from '../app';

@@ -12,74 +11,59 @@ describe('notesRouter', () => {

  it('allows CRUD of user notes', async () => {
    const server = request(http.createServer(app.callback()));
-
-    const userId = uuidv4();
-
-    const responseEmpty = await server.get('/notes/').set('totally-secure-user-id', userId).send();
+    const responseEmpty = await server.get('/notes/').set('totally-secure-user-id', '4').send();
    expect(responseEmpty.body.notes).toEqual([]);

-    const createResponse1 = await server
-      .post('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send({
-        title: 'track',
-        body: 'language',
-      });
+    const createResponse1 = await server.post('/notes/').set('totally-secure-user-id', '4').send({
+      title: 'track',
+      body: 'language',
+    });
    expect(createResponse1.body.note).toMatchObject({
-      userID: userId,
+      userID: '4',
      title: 'track',
      body: 'language',
    });

-    const createResponse2 = await server
-      .post('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send({
-        title: 'nine',
-        body: 'lotion',
-      });
+    const createResponse2 = await server.post('/notes/').set('totally-secure-user-id', '4').send({
+      title: 'nine',
+      body: 'lotion',
+    });

-    const responseLength2 = await server
-      .get('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send();
+    const responseLength2 = await server.get('/notes/').set('totally-secure-user-id', '4').send();
    expect(responseLength2.body.notes).toHaveLength(2);

    const responseGetSingle = await server
      .get(`/notes/${createResponse2.body.note.id}`)
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send();
    expect(responseGetSingle.body.note).toMatchObject({
      id: createResponse2.body.note.id,
-      userID: userId,
+      userID: '4',
      title: 'nine',
      body: 'lotion',
    });

    const responseUpdateSingle = await server
      .put(`/notes/${createResponse2.body.note.id}`)
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send({
        title: 'wave',
        body: 'boarding',
      });
    expect(responseUpdateSingle.body.note).toMatchObject({
      id: responseGetSingle.body.note.id,
-      userID: userId,
+      userID: '4',
      title: 'wave',
      body: 'boarding',
    });

    const responseDeleteSingle = await server
      .delete(`/notes/${createResponse2.body.note.id}`)
-      .set('totally-secure-user-id', userId)
+      .set('totally-secure-user-id', '4')
      .send();
    expect(responseDeleteSingle.body.status).toEqual('ok');

-    const responseLength1 = await server
-      .get('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send();
+    const responseLength1 = await server.get('/notes/').set('totally-secure-user-id', '4').send();
    expect(responseLength1.body.notes).toHaveLength(1);
  });

@@ -95,28 +79,23 @@ describe('notesRouter', () => {

  it('disallows cross-user note impersonation', async () => {
    const server = request(http.createServer(app.callback()));
-    const userId = uuidv4();
-    const userId2 = uuidv4();
-    const createResponse1 = await server
-      .post('/notes/')
-      .set('totally-secure-user-id', userId)
-      .send({
-        title: 'track',
-        body: 'language',
-      });
+    const createResponse1 = await server.post('/notes/').set('totally-secure-user-id', '4').send({
+      title: 'track',
+      body: 'language',
+    });
    expect(createResponse1.ok).toBe(true);

    // notes are public
    const responseGetSingleOtherUser = await server
      .get(`/notes/${createResponse1.body.note.id}`)
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send();
    expect(responseGetSingleOtherUser.ok).toBe(true);

    // but can only be updated by the owner
    const responseUpdateSingle = await server
      .put(`/notes/${createResponse1.body.note.id}`)
-      .set('totally-secure-user-id', userId2)
+      .set('totally-secure-user-id', '5')
      .send({
        title: 'wave',
        body: 'boarding',
@@ -58,7 +58,7 @@ class InMemoryDatabaseAdapter<T> extends EntityDatabaseAdapter<T> {
      return 0;
    }

-    const currentOrderBy = orderBys[0]!;
+    const currentOrderBy = orderBys[0];
    const aField = objectA[currentOrderBy.columnName];
    const bField = objectB[currentOrderBy.columnName];
    switch (currentOrderBy.order) {
@@ -161,7 +161,7 @@ class InMemoryDatabaseAdapter<T> extends EntityDatabaseAdapter<T> {
      ...dbObjects[objectIndex],
      ...object,
    };
-    return [dbObjects[objectIndex]!];
+    return [dbObjects[objectIndex]];
  }

  protected async deleteInternalAsync(
@@ -10,10 +10,4 @@ export default class InMemoryQueryContextProvider extends EntityQueryContextProv
  ) => Promise<T> {
    return (transactionScope) => Promise.resolve(transactionScope({}));
  }
-
-  protected createNestedTransactionRunner<T>(
-    _outerQueryInterface: any
-  ): (transactionScope: (queryInterface: any) => Promise<T>) => Promise<T> {
-    return (transactionScope) => Promise.resolve(transactionScope({}));
-  }
 }
@@ -3,6 +3,8 @@ import {
  NoOpEntityMetricsAdapter,
  EntityCompanionProvider,
  InMemoryFullCacheStubCacheAdapterProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
 } from '@expo/entity';

 import { InMemoryDatabaseAdapterProvider } from './adapters/InMemoryDatabaseAdapter';
@@ -19,26 +21,20 @@ export const createEntityCompanionProvider = (
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        // An in-memory DB is used for demonstration purposes, but generally this would be
-        // instantiated with PostgresEntityDatabaseAdapter and PostgresEntityQueryContextProvider
-        {
-          adapterProvider: new InMemoryDatabaseAdapterProvider(),
-          queryContextProvider: new InMemoryQueryContextProvider(),
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        // An in-memory cache is used for demonstration purposes, but generally this would be
-        // instantiated with a RedisCacheAdapterProvider
-        {
-          cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
-        },
-      ],
-    ])
+    {
+      // An in-memory DB is used for demonstration purposes, but generally this would be
+      // instantiated with PostgresEntityDatabaseAdapter and PostgresEntityQueryContextProvider
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new InMemoryDatabaseAdapterProvider(),
+        queryContextProvider: new InMemoryQueryContextProvider(),
+      },
+    },
+    {
+      // An in-memory cache is used for demonstration purposes, but generally this would be
+      // instantiated with a RedisCacheAdapterProvider
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
+      },
+    }
  );
 };
@@ -3,7 +3,6 @@ import {
  ReadonlyEntity,
  EntityQueryContext,
  RuleEvaluationResult,
-  EntityPrivacyPolicyEvaluationContext,
 } from '@expo/entity';

 import { ExampleViewerContext } from '../viewerContexts';
@@ -24,9 +23,8 @@ import { ExampleViewerContext } from '../viewerContexts';
 */
 export default class AllowIfUserOwnerPrivacyRule<
  TFields,
-  TID extends NonNullable<TFields[TSelectedFields]>,
-  TEntity extends ReadonlyEntity<TFields, TID, ExampleViewerContext>,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TID,
+  TEntity extends ReadonlyEntity<TFields, TID, ExampleViewerContext>
 > extends PrivacyPolicyRule<TFields, TID, ExampleViewerContext, TEntity> {
  constructor(private readonly entityOwnerField: keyof TFields) {
    super();
@@ -35,7 +33,6 @@ export default class AllowIfUserOwnerPrivacyRule<
  async evaluateAsync(
    viewerContext: ExampleViewerContext,
    _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
    entity: TEntity
  ): Promise<RuleEvaluationResult> {
    if (viewerContext.isUserViewerContext()) {
@@ -3,6 +3,8 @@ import {
  EntityCompanionDefinition,
  EntityConfiguration,
  UUIDField,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  StringField,
 } from '@expo/entity';

@@ -55,8 +57,8 @@ export const noteEntityCompanion = new EntityCompanionDefinition({
        columnName: 'body',
      }),
    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
+    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  }),
  privacyPolicyClass: NotePrivacyPolicy,
 });
@@ -13,16 +13,16 @@ export default class NotePrivacyPolicy extends EntityPrivacyPolicy<
  ExampleViewerContext,
  NoteEntity
 > {
-  protected override readonly readRules = [
+  protected readonly readRules = [
    new AlwaysAllowPrivacyPolicyRule<NoteFields, string, ExampleViewerContext, NoteEntity>(),
  ];
-  protected override readonly createRules = [
+  protected readonly createRules = [
    new AllowIfUserOwnerPrivacyRule<NoteFields, string, NoteEntity>('userID'),
  ];
-  protected override readonly updateRules = [
+  protected readonly updateRules = [
    new AllowIfUserOwnerPrivacyRule<NoteFields, string, NoteEntity>('userID'),
  ];
-  protected override readonly deleteRules = [
+  protected readonly deleteRules = [
    new AllowIfUserOwnerPrivacyRule<NoteFields, string, NoteEntity>('userID'),
  ];
 }
@@ -30,7 +30,7 @@ router.get('/', async (ctx: ExampleContext) => {

 router.get('/:id', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;
-  const noteResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params['id']!);
+  const noteResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params.id);
  if (!noteResult.ok) {
    ctx.throw(403, noteResult.reason);
  }
@@ -69,7 +69,7 @@ router.put('/:id', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;
  const { title, body } = ctx.request.body;

-  const noteLoadResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params['id']!);
+  const noteLoadResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params.id);
  if (!noteLoadResult.ok) {
    ctx.throw(403, noteLoadResult.reason);
  }
@@ -90,7 +90,7 @@ router.put('/:id', async (ctx: ExampleContext) => {
 router.delete('/:id', async (ctx: ExampleContext) => {
  const viewerContext = ctx.state.viewerContext;

-  const noteLoadResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params['id']!);
+  const noteLoadResult = await NoteEntity.loader(viewerContext).loadByIDAsync(ctx.params.id);
  if (!noteLoadResult.ok) {
    ctx.throw(403, noteLoadResult.reason);
  }
@@ -3,242 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Features
-
-* add EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY ([#178](https://github.com/expo/entity/issues/178)) ([a0c35dd](https://github.com/expo/entity/commit/a0c35ddd7bca05d0c3f41dcf48e16d058918231c))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Bug Fixes
-
-* upgrade ioredis, knex, and pg ([#125](https://github.com/expo/entity/issues/125)) ([7c43edf](https://github.com/expo/entity/commit/7c43edf3de37e8af13e2a99bd44f03f54803d9b9))
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
-
-
-
-
-
-## [0.14.1](https://github.com/expo/entity/compare/v0.14.0...v0.14.1) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.14.0](https://github.com/expo/entity/compare/v0.13.0...v0.14.0) (2021-03-24)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.13.0](https://github.com/expo/entity/compare/v0.12.0...v0.13.0) (2021-02-12)
-
-
-### Features
-
-* add basic field type runtime validators ([#113](https://github.com/expo/entity/issues/113)) ([6c4d4b0](https://github.com/expo/entity/commit/6c4d4b03b5404dd776a12c5eb6f0af77a8c964f8))
-
-
-
-
-
-# [0.12.0](https://github.com/expo/entity/compare/v0.11.0...v0.12.0) (2021-01-22)
-
-
-### Bug Fixes
-
-* move runInTransaction to ViewerContext ([#108](https://github.com/expo/entity/issues/108)) ([b7309e1](https://github.com/expo/entity/commit/b7309e18a2dd780b64cd306d566de1f12bf8df3a))
-* remove cache and database adaptor flavor enums ([#109](https://github.com/expo/entity/issues/109)) ([72a77f8](https://github.com/expo/entity/commit/72a77f8b6893a4b76d3b1cce16659bdf3ce473ee))
-
-
-
-
-
-# [0.11.0](https://github.com/expo/entity/compare/v0.10.0...v0.11.0) (2020-12-24)
-
-
-### Bug Fixes
-
-* remove any cast from EntityLoader ([#100](https://github.com/expo/entity/issues/100)) ([b8e07f9](https://github.com/expo/entity/commit/b8e07f9ddc4077768980c000d61f5ddcc824e2e3))
-
-
-
-
-
 # [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)

 **Note:** Version bump only for package @expo/entity-full-integration-tests
@@ -1,13 +1,12 @@
 {
  "name": "@expo/entity-full-integration-tests",
  "private": true,
-  "version": "0.31.0",
+  "version": "0.10.0",
  "description": "Full redis and knex integration tests for the entity framework",
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
+    "lint": "eslint src --ext '.ts'",
    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
    "integration": "../../resources/run-with-docker yarn integration-no-setup",
    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
@@ -27,8 +26,8 @@
    "@expo/entity-database-adapter-knex": "*"
  },
  "devDependencies": {
-    "@expo/entity": "^0.31.0",
-    "@expo/entity-cache-adapter-redis": "^0.31.0",
-    "@expo/entity-database-adapter-knex": "^0.31.0"
+    "@expo/entity": "^0.10.0",
+    "@expo/entity-cache-adapter-redis": "^0.10.0",
+    "@expo/entity-database-adapter-knex": "^0.10.0"
  }
 }
@@ -5,13 +5,13 @@ import {
  Entity,
  EntityCompanionDefinition,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  UUIDField,
-  StringField,
 } from '@expo/entity';
 import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
 import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
+import Knex from 'knex';
 import { URL } from 'url';

 import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
@@ -28,18 +28,10 @@ class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ViewerContext,
  TestEntity
 > {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<TestFields, string, ViewerContext, TestEntity>(),
-  ];
+  protected readonly readRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly createRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly updateRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly deleteRules = [new AlwaysAllowPrivacyPolicyRule()];
 }

 class TestEntity extends Entity<TestFields, string, ViewerContext> {
@@ -62,16 +54,16 @@ const testEntityConfiguration = new EntityConfiguration<TestFields>({
      columnName: 'id',
      cache: true,
    }),
-    other_string: new StringField({
+    other_string: new UUIDField({
      columnName: 'other_string',
      cache: true,
    }),
-    third_string: new StringField({
+    third_string: new UUIDField({
      columnName: 'third_string',
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 const testEntityCompanion = new EntityCompanionDefinition({
@@ -81,8 +73,10 @@ const testEntityCompanion = new EntityCompanionDefinition({
 });

 async function createOrTruncatePostgresTables(knex: Knex): Promise<void> {
+  await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
  await knex.schema.createTable('testentities', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+    table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
    table.string('other_string').notNullable();
    table.string('third_string').notNullable();
  });
@@ -90,29 +84,31 @@ async function createOrTruncatePostgresTables(knex: Knex): Promise<void> {
 }

 async function dropPostgresTable(knex: Knex): Promise<void> {
-  if (await knex.schema.hasTable('testentities')) {
-    await knex.schema.dropTable('testentities');
+  if (await knex.schema.hasTable('children')) {
+    await knex.schema.dropTable('children');
+  }
+  if (await knex.schema.hasTable('parents')) {
+    await knex.schema.dropTable('parents');
  }
 }

 describe('Entity cache inconsistency', () => {
  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
  let redisCacheAdapterContext: RedisCacheAdapterContext;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
    redisCacheAdapterContext = {
-      redisClient,
+      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
      makeKeyFn(...parts: string[]): string {
        const delimiter = ':';
        const escapedParts = parts.map((part) =>
@@ -129,13 +125,13 @@ describe('Entity cache inconsistency', () => {

  beforeEach(async () => {
    await createOrTruncatePostgresTables(knexInstance);
-    await redisClient.flushdb();
+    await redisCacheAdapterContext.redisClient.flushdb();
  });

  afterAll(async () => {
    await dropPostgresTable(knexInstance);
    await knexInstance.destroy();
-    redisClient.disconnect();
+    redisCacheAdapterContext.redisClient.disconnect();
  });

  test('lots of updates in long-ish running transactions', async () => {
@@ -155,12 +151,12 @@ describe('Entity cache inconsistency', () => {
      .loadByFieldEqualingAsync('other_string', 'hello');

    let openBarrier1: () => void;
-    const barrier1 = new Promise<void>((resolve) => {
+    const barrier1 = new Promise((resolve) => {
      openBarrier1 = resolve;
    });

    let openBarrier2: () => void;
-    const barrier2 = new Promise<void>((resolve) => {
+    const barrier2 = new Promise((resolve) => {
      openBarrier2 = resolve;
    });

@@ -179,19 +175,16 @@ describe('Entity cache inconsistency', () => {

        openBarrier2!();
      })(),
-      viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
-        'postgres',
-        async (queryContext) => {
-          await TestEntity.updater(entity1, queryContext)
-            .setField('third_string', 'updated')
-            .enforceUpdateAsync();
+      TestEntity.runInTransactionAsync(viewerContext, async (queryContext) => {
+        await TestEntity.updater(entity1, queryContext)
+          .setField('third_string', 'updated')
+          .enforceUpdateAsync();

-          openBarrier1();
+        openBarrier1();

-          // wait for to ensure the transaction isn't committed until after load above occurs
-          await barrier2;
-        }
-      ),
+        // wait for to ensure the transaction isn't committed until after load above occurs
+        await barrier2;
+      }),
    ]);

    // ensure cache consistency
@@ -1,8 +1,7 @@
 import { ViewerContext } from '@expo/entity';
 import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
 import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
+import Knex from 'knex';
 import { URL } from 'url';

 import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
@@ -10,13 +9,15 @@ import ChildEntity from './entities/ChildEntity';
 import ParentEntity from './entities/ParentEntity';

 async function createOrTruncatePostgresTables(knex: Knex): Promise<void> {
+  await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
  await knex.schema.createTable('parents', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+    table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
  });
  await knex.into('parents').truncate();

  await knex.schema.createTable('children', (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+    table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
    table.uuid('parent_id').references('id').inTable('parents').onDelete('cascade').unique();
  });
  await knex.into('children').truncate();
@@ -33,22 +34,21 @@ async function dropPostgresTable(knex: Knex): Promise<void> {

 describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
  let redisCacheAdapterContext: RedisCacheAdapterContext;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
    redisCacheAdapterContext = {
-      redisClient,
+      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
      makeKeyFn(...parts: string[]): string {
        const delimiter = ':';
        const escapedParts = parts.map((part) =>
@@ -65,13 +65,13 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {

  beforeEach(async () => {
    await createOrTruncatePostgresTables(knexInstance);
-    await redisClient.flushdb();
+    await redisCacheAdapterContext.redisClient.flushdb();
  });

  afterAll(async () => {
    await dropPostgresTable(knexInstance);
    await knexInstance.destroy();
-    redisClient.disconnect();
+    redisCacheAdapterContext.redisClient.disconnect();
  });

  describe('EntityEdgeDeletionBehavior.INVALIDATE_CACHE', () => {
@@ -5,13 +5,14 @@ import {
  Entity,
  EntityCompanionDefinition,
  EntityConfiguration,
+  DatabaseAdapterFlavor,
+  CacheAdapterFlavor,
  UUIDField,
  EntityEdgeDeletionBehavior,
 } from '@expo/entity';
 import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
 import Redis from 'ioredis';
-import { knex, Knex } from 'knex';
-import nullthrows from 'nullthrows';
+import Knex from 'knex';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';

@@ -28,18 +29,10 @@ interface OtherFields {
 }

 class PrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any>(),
-  ];
+  protected readonly readRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly createRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly updateRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly deleteRules = [new AlwaysAllowPrivacyPolicyRule()];
 }

 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@@ -89,8 +82,8 @@ const makeEntityClasses = async (knex: Knex, edgeDeletionBehavior: EntityEdgeDel
        },
      }),
    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
+    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  });

  const categoryEntityCompanion = new EntityCompanionDefinition({
@@ -117,8 +110,8 @@ const makeEntityClasses = async (knex: Knex, edgeDeletionBehavior: EntityEdgeDel
        },
      }),
    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'redis',
+    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  });

  const otherEntityCompanion = new EntityCompanionDefinition({
@@ -127,46 +120,34 @@ const makeEntityClasses = async (knex: Knex, edgeDeletionBehavior: EntityEdgeDel
    privacyPolicyClass: PrivacyPolicy,
  });

+  await knex.raw('CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'); // for uuid_generate_v4()
+
  await knex.schema.createTable(categoriesTableName, (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
+    table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
  });

  await knex.schema.createTable(othersTableName, (table) => {
-    table.uuid('id').defaultTo(knex.raw('gen_random_uuid()')).primary();
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY) {
+    table.uuid('id').defaultTo(knex.raw('uuid_generate_v4()')).primary();
+    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE) {
      table
        .uuid('parent_category_id')
        .references('id')
        .inTable(categoriesTableName)
        .unique()
        .onDelete('cascade');
-    } else if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY) {
-      table
-        .uuid('parent_category_id')
-        .references('id')
-        .inTable(categoriesTableName)
-        .unique()
-        .onDelete('set null');
    } else {
      table.uuid('parent_category_id').unique();
    }
  });

  await knex.schema.alterTable(categoriesTableName, (table) => {
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY) {
+    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE) {
      table
        .uuid('parent_other_id')
        .references('id')
        .inTable(othersTableName)
        .unique()
        .onDelete('cascade');
-    } else if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY) {
-      table
-        .uuid('parent_other_id')
-        .references('id')
-        .inTable(othersTableName)
-        .unique()
-        .onDelete('set null');
    } else {
      table.uuid('parent_other_id').unique();
    }
@@ -176,22 +157,21 @@ const makeEntityClasses = async (knex: Knex, edgeDeletionBehavior: EntityEdgeDel
 };
 describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
  let knexInstance: Knex;
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
  let redisCacheAdapterContext: RedisCacheAdapterContext;

  beforeAll(() => {
-    knexInstance = knex({
+    knexInstance = Knex({
      client: 'pg',
      connection: {
-        user: nullthrows(process.env['PGUSER']),
-        password: nullthrows(process.env['PGPASSWORD']),
+        user: process.env.PGUSER,
+        password: process.env.PGPASSWORD,
        host: 'localhost',
-        port: parseInt(nullthrows(process.env['PGPORT']), 10),
-        database: nullthrows(process.env['PGDATABASE']),
+        port: parseInt(process.env.PGPORT!, 10),
+        database: process.env.PGDATABASE,
      },
    });
    redisCacheAdapterContext = {
-      redisClient,
+      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
      makeKeyFn(...parts: string[]): string {
        const delimiter = ':';
        const escapedParts = parts.map((part) =>
@@ -208,14 +188,13 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {

  afterAll(async () => {
    await knexInstance.destroy();
-    redisClient.disconnect();
+    redisCacheAdapterContext.redisClient.disconnect();
  });

  it.each([
    EntityEdgeDeletionBehavior.CASCADE_DELETE,
-    EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY,
+    EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE,
    EntityEdgeDeletionBehavior.SET_NULL,
-    EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY,
  ])('behavior: %p', async (edgeDeletionBehavior) => {
    const { CategoryEntity, OtherEntity } = await makeEntityClasses(
      knexInstance,
@@ -244,14 +223,6 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
        .enforcing()
        .loadByIDNullableAsync(other1.getID());
      expect(otherLoaded?.getField('parent_category_id')).toBeNull();
-    } else if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL_INVALIDATE_CACHE_ONLY) {
-      await expect(
-        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID())
-      ).resolves.toBeNull();
-      const otherLoaded = await OtherEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDNullableAsync(other1.getID());
-      expect(otherLoaded?.getField('parent_category_id')).toBeNull();
    } else {
      await expect(
        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID())
@@ -1,5 +1,7 @@
 import {
  AlwaysAllowPrivacyPolicyRule,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
  Entity,
  EntityCompanionDefinition,
  EntityConfiguration,
@@ -17,18 +19,10 @@ interface ChildFields {
 }

 class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any, any> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
+  protected readonly readRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly createRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly updateRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly deleteRules = [new AlwaysAllowPrivacyPolicyRule()];
 }

 export default class ChildEntity extends Entity<ChildFields, string, ViewerContext> {
@@ -56,12 +50,12 @@ const childEntityConfiguration = new EntityConfiguration<ChildFields>({
      cache: true,
      association: {
        getAssociatedEntityClass: () => ParentEntity,
-        edgeDeletionBehavior: EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE_ONLY,
+        edgeDeletionBehavior: EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE,
      },
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 const childEntityCompanion = new EntityCompanionDefinition({
@@ -1,5 +1,7 @@
 import {
  AlwaysAllowPrivacyPolicyRule,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
  Entity,
  EntityCompanionDefinition,
  EntityConfiguration,
@@ -15,18 +17,10 @@ interface ParentFields {
 }

 class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<any, string, ViewerContext, any, any> {
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<any, string, ViewerContext, any, any>(),
-  ];
+  protected readonly readRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly createRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly updateRules = [new AlwaysAllowPrivacyPolicyRule()];
+  protected readonly deleteRules = [new AlwaysAllowPrivacyPolicyRule()];
 }

 export default class ParentEntity extends Entity<ParentFields, string, ViewerContext> {
@@ -51,8 +45,8 @@ const parentEntityConfiguration = new EntityConfiguration<ParentFields>({
      cache: true,
    }),
  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
+  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 const parentEntityCompanion = new EntityCompanionDefinition({
@@ -2,6 +2,8 @@ import {
  NoOpEntityMetricsAdapter,
  IEntityMetricsAdapter,
  EntityCompanionProvider,
+  CacheAdapterFlavor,
+  DatabaseAdapterFlavor,
 } from '@expo/entity';
 import {
  RedisCacheAdapterContext,
@@ -11,7 +13,7 @@ import {
  PostgresEntityDatabaseAdapterProvider,
  PostgresEntityQueryContextProvider,
 } from '@expo/entity-database-adapter-knex';
-import { Knex } from 'knex';
+import Knex from 'knex';

 export const createFullIntegrationTestEntityCompanionProvider = (
  knex: Knex,
@@ -20,22 +22,16 @@ export const createFullIntegrationTestEntityCompanionProvider = (
 ): EntityCompanionProvider => {
  return new EntityCompanionProvider(
    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
-          queryContextProvider: new PostgresEntityQueryContextProvider(knex),
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
-        },
-      ],
-    ])
+    {
+      [DatabaseAdapterFlavor.POSTGRES]: {
+        adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
+        queryContextProvider: new PostgresEntityQueryContextProvider(knex),
+      },
+    },
+    {
+      [CacheAdapterFlavor.REDIS]: {
+        cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
+      },
+    }
  );
 };
@@ -1,154 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-
-### Features
-
-* add IP support ([#138](https://github.com/expo/entity/issues/138)) ([1405a91](https://github.com/expo/entity/commit/1405a9126ee3a56c3e2a38bf3b697283744f5b5d))
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* lands @expo/entity-ip-address-field ([#138](https://github.com/expo/entity/pull/138))
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* expose describeFieldTestCase for use in other packages ([#139](https://github.com/expo/entity/issues/139)) ([1220477](https://github.com/expo/entity/commit/1220477aa331349b482ad015b44f76fa2bda7b90))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-* use better QueryContext types for transactional triggers and validators ([#136](https://github.com/expo/entity/issues/136)) ([5c7efe1](https://github.com/expo/entity/commit/5c7efe1678424ff907687e9327175bdc2538c3e0))
@@ -1,3 +0,0 @@
-# @expo/entity-ip-address-field
-
-A package containing the IP address EntityField definitions for @expo/entity. Supports addresses with either IPv4 or IPv6 syntax.
@@ -1,37 +0,0 @@
-{
-  "name": "@expo/entity-ip-address-field",
-  "version": "0.31.0",
-  "description": "IP address EntityField definitions for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
-    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --delete"
-  },
-  "engines": {
-    "node": ">=12"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "dependencies": {
-    "ip-address": "^8.1.0"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.31.0",
-    "@types/jsbn": "^1.2.29"
-  },
-  "peerDependencies": {
-    "@expo/entity": "*"
-  }
-}
@@ -1,8 +0,0 @@
-import { EntityFieldDefinition } from '@expo/entity';
-import { Address4, Address6 } from 'ip-address';
-
-export class IPAddressField extends EntityFieldDefinition<string> {
-  protected validateInputValueInternal(value: string): boolean {
-    return Address4.isValid(value) || Address6.isValid(value);
-  }
-}
@@ -1,16 +0,0 @@
-import { describeFieldTestCase } from '@expo/entity';
-
-import { IPAddressField } from '../EntityFields';
-
-describeFieldTestCase(
-  new IPAddressField({ columnName: 'wat' }),
-  [
-    '192.168.1.1',
-    '198.24.10.0/24',
-    '10.0.0.0',
-    '0:1:2:3:4:5:6:7',
-    '1:2:3:4:5:6:7:8/64',
-    'fedc:ba98:7654:3210:fedc:ba98:7654:3210',
-  ],
-  ['', 'abs', '0.0.0.x/0', '123.21.23', '1:2:3:4:5:6', '198.10/8']
-);
@@ -1,7 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-ip-address-field
- */
-
-export * from './EntityFields';
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}
@@ -1,91 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
@@ -1,24 +0,0 @@
-# `@expo/entity-secondary-cache-local-memory`
-
-Cross-request [LRU](https://github.com/isaacs/node-lru-cache) secondary cache for `@expo/entity`. Use
-this cache with caution - it is nonstandard. The cache is shared between requests in the node process.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_secondary_cache_local_memory.html)
-
-## Usage
-
-1. Create a concrete implementation of abstract class `EntitySecondaryCacheLoader`, in this example `TestEntitySecondaryCacheLoader`. The underlying data can come from anywhere, but an entity is constructed from the data and then authorized for the viewer.
-2. Create an instance of your `EntitySecondaryCacheLoader`, passing in a `LocalMemorySecondaryEntityCache`.
-    ```typescript
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-    ```
-3. Load entities through it:
-    ```typescript
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    ```
@@ -1,38 +0,0 @@
-{
-  "name": "@expo/entity-secondary-cache-local-memory",
-  "version": "0.31.0",
-  "description": "Local memory secondary cache for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
-  },
-  "engines": {
-    "node": ">=12"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*",
-    "@expo/entity-cache-adapter-local-memory": "*"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.31.0",
-    "@expo/entity-cache-adapter-local-memory": "^0.31.0",
-    "nullthrows": "^1.1.1"
-  }
-}
@@ -1,21 +0,0 @@
-import { GenericSecondaryEntityCache } from '@expo/entity';
-import {
-  GenericLocalMemoryCacher,
-  LocalMemoryCache,
-} from '@expo/entity-cache-adapter-local-memory';
-
-/**
- * A local memory GenericSecondaryEntityCache.
- *
- * @remarks
- *
- * TLoadParams must be JSON stringifyable.
- */
-export default class LocalMemorySecondaryEntityCache<
-  TFields,
-  TLoadParams
-> extends GenericSecondaryEntityCache<TFields, TLoadParams> {
-  constructor(localMemoryCache: LocalMemoryCache<TFields>) {
-    super(new GenericLocalMemoryCacher(localMemoryCache), (params) => JSON.stringify(params));
-  }
-}
@@ -1,228 +0,0 @@
-import {
-  EntitySecondaryCacheLoader,
-  mapMapAsync,
-  ViewerContext,
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-import {
-  GenericLocalMemoryCacher,
-  LocalMemoryCacheAdapterProvider,
-} from '@expo/entity-cache-adapter-local-memory';
-import nullthrows from 'nullthrows';
-
-import LocalMemorySecondaryEntityCache from '../LocalMemorySecondaryEntityCache';
-
-export type LocalMemoryTestEntityFields = {
-  id: string;
-  name: string;
-};
-
-export default class LocalMemoryTestEntity extends Entity<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    LocalMemoryTestEntityFields,
-    string,
-    ViewerContext,
-    LocalMemoryTestEntity,
-    LocalMemoryTestEntityPrivacyPolicy
-  > {
-    return localMemoryTestEntityCompanionDefinition;
-  }
-}
-
-export class LocalMemoryTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext,
-  LocalMemoryTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-}
-
-export const localMemoryTestEntityConfiguration =
-  new EntityConfiguration<LocalMemoryTestEntityFields>({
-    idField: 'id',
-    tableName: 'local_memory_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'local-memory',
-  });
-
-const localMemoryTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: LocalMemoryTestEntity,
-  entityConfiguration: localMemoryTestEntityConfiguration,
-  privacyPolicyClass: LocalMemoryTestEntityPrivacyPolicy,
-});
-
-export const createTestEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'local-memory',
-        {
-          cacheAdapterProvider: LocalMemoryCacheAdapterProvider.getProvider(),
-        },
-      ],
-    ])
-  );
-};
-
-class TestViewerContext extends ViewerContext {}
-
-type TestLoadParams = { id: string };
-
-const FAKE_ID = 'fake';
-
-class TestSecondaryLocalMemoryCacheLoader extends EntitySecondaryCacheLoader<
-  TestLoadParams,
-  LocalMemoryTestEntityFields,
-  string,
-  TestViewerContext,
-  LocalMemoryTestEntity,
-  LocalMemoryTestEntityPrivacyPolicy
-> {
-  public databaseLoadCount = 0;
-
-  protected async fetchObjectsFromDatabaseAsync(
-    loadParamsArray: readonly Readonly<TestLoadParams>[]
-  ): Promise<ReadonlyMap<Readonly<TestLoadParams>, Readonly<LocalMemoryTestEntityFields> | null>> {
-    this.databaseLoadCount += loadParamsArray.length;
-
-    const emptyMap = new Map(loadParamsArray.map((p) => [p, null]));
-    return await mapMapAsync(emptyMap, async (_value, loadParams) => {
-      if (loadParams.id === FAKE_ID) {
-        return null;
-      }
-      return nullthrows(
-        (
-          await this.entityLoader
-            .enforcing()
-            .loadManyByFieldEqualityConjunctionAsync([
-              { fieldName: 'id', fieldValue: loadParams.id },
-            ])
-        )[0]
-      ).getAllFields();
-    });
-  }
-}
-
-describe(LocalMemorySecondaryEntityCache, () => {
-  it('Loads through secondary loader, caches, and invalidates', async () => {
-    const viewerContext = new TestViewerContext(createTestEntityCompanionProvider());
-
-    const createdEntity = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'wat')
-      .enforceCreateAsync();
-
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    const results2 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results2.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    await secondaryCacheLoader.invalidateManyAsync([loadParams]);
-
-    const results3 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results3.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(2);
-  });
-
-  it('correctly handles uncached and unfetchable load params', async () => {
-    const viewerContext = new TestViewerContext(createTestEntityCompanionProvider());
-
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-
-    const loadParams = { id: FAKE_ID };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(results.size).toBe(1);
-    expect(results.get(loadParams)).toBe(null);
-  });
-});
@@ -1,7 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-secondary-cache-local-memory
- */
-
-export { default as LocalMemorySecondaryEntityCache } from './LocalMemorySecondaryEntityCache';
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}
@@ -1,186 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.31.0](https://github.com/expo/entity/compare/v0.30.0...v0.31.0) (2023-01-19)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.30.0](https://github.com/expo/entity/compare/v0.29.0...v0.30.0) (2022-12-23)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.29.0](https://github.com/expo/entity/compare/v0.28.0...v0.29.0) (2022-10-06)
-
-
-### Features
-
-* change redis cache adapter to use redis-like interface ([#200](https://github.com/expo/entity/issues/200)) ([e381f5b](https://github.com/expo/entity/commit/e381f5b2acfc17dcade2cf6e8506fa1c1c255e73))
-
-
-
-
-
-# [0.28.0](https://github.com/expo/entity/compare/v0.27.0...v0.28.0) (2022-09-13)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.27.0](https://github.com/expo/entity/compare/v0.26.1...v0.27.0) (2022-08-09)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-## [0.26.1](https://github.com/expo/entity/compare/v0.26.0...v0.26.1) (2022-07-28)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.26.0](https://github.com/expo/entity/compare/v0.25.3...v0.26.0) (2022-07-14)
-
-
-### Features
-
-* update ioredis to v5, make it a devDependency of the cache packages ([#172](https://github.com/expo/entity/issues/172)) ([9fcfbf7](https://github.com/expo/entity/commit/9fcfbf746a61554cefedf7fb0f1a3a9056b58ffe))
-
-
-
-
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-
-
-
-
-
-# [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157))
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Chores
-
-* Move data transforming responsibilities to the CacheAdapter instead of the RedisSecondaryEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
-# [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.21.0](https://github.com/expo/entity/compare/v0.20.0...v0.21.0) (2022-01-03)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.20.0](https://github.com/expo/entity/compare/v0.19.0...v0.20.0) (2021-12-29)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.19.0](https://github.com/expo/entity/compare/v0.18.0...v0.19.0) (2021-10-28)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.18.0](https://github.com/expo/entity/compare/v0.17.0...v0.18.0) (2021-10-14)
-
-
-### Features
-
-* enable noImplicitOverride tsc setting ([#135](https://github.com/expo/entity/issues/135)) ([4263cb9](https://github.com/expo/entity/commit/4263cb9b8b69fe4fb68c74ec1c7aba04508a1555))
-* upgrade TypeScript to 4.4 ([#134](https://github.com/expo/entity/issues/134)) ([7612392](https://github.com/expo/entity/commit/7612392dbfd9778d25c465c1626c372d75a6d05a))
-
-
-
-
-
-# [0.17.0](https://github.com/expo/entity/compare/v0.16.0...v0.17.0) (2021-08-16)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.16.0](https://github.com/expo/entity/compare/v0.15.0...v0.16.0) (2021-07-07)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.15.0](https://github.com/expo/entity/compare/v0.14.1...v0.15.0) (2021-05-26)
-
-
-### Features
-
-* secondary cache loader ([#123](https://github.com/expo/entity/issues/123)) ([4cba01e](https://github.com/expo/entity/commit/4cba01eb259c87d60b3026ce776e46f781363690))
@@ -1,25 +0,0 @@
-# `@expo/entity-secondary-cache-redis`
-
-[ioredis](https://github.com/luin/ioredis) secondary cache for `@expo/entity`.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_secondary_cache_redis.html)
-
-## Usage
-
-1. Create a concrete implementation of abstract class `EntitySecondaryCacheLoader`, in this example `TestEntitySecondaryCacheLoader`. The underlying data can come from anywhere, but an entity is constructed from the data and then authorized for the viewer.
-2. Create an instance of your `EntitySecondaryCacheLoader`, passing in a `RedisSecondaryEntityCache`.
-    ```typescript
-    const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(
-      new RedisSecondaryEntityCache(
-        redisTestEntityConfiguration,
-        redisCacheAdapterContext,
-        (loadParams) => `${loadParams.id}`
-      ),
-      RedisTestEntity.loader(viewerContext)
-    );
-    ```
-3. Load entities through it:
-    ```typescript
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    ```
@@ -1,39 +0,0 @@
-{
-  "name": "@expo/entity-secondary-cache-redis",
-  "version": "0.31.0",
-  "description": "Redis secondary cache for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
-  },
-  "engines": {
-    "node": ">=12"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*",
-    "@expo/entity-cache-adapter-redis": "*"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.31.0",
-    "@expo/entity-cache-adapter-redis": "^0.31.0",
-    "ioredis": "^5.2.5",
-    "nullthrows": "^1.1.1"
-  }
-}
@@ -1,18 +0,0 @@
-import { EntityConfiguration, GenericSecondaryEntityCache } from '@expo/entity';
-import { GenericRedisCacheContext, GenericRedisCacher } from '@expo/entity-cache-adapter-redis';
-
-/**
- * A redis GenericSecondaryEntityCache.
- */
-export default class RedisSecondaryEntityCache<
-  TFields,
-  TLoadParams
-> extends GenericSecondaryEntityCache<TFields, TLoadParams> {
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    genericRedisCacheContext: GenericRedisCacheContext,
-    constructRedisKey: (params: Readonly<TLoadParams>) => string
-  ) {
-    super(new GenericRedisCacher(genericRedisCacheContext, entityConfiguration), constructRedisKey);
-  }
-}
@@ -1,140 +0,0 @@
-import { EntitySecondaryCacheLoader, mapMapAsync, ViewerContext } from '@expo/entity';
-import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import nullthrows from 'nullthrows';
-import { URL } from 'url';
-
-import RedisSecondaryEntityCache from '../RedisSecondaryEntityCache';
-import RedisTestEntity, {
-  redisTestEntityConfiguration,
-  RedisTestEntityFields,
-  RedisTestEntityPrivacyPolicy,
-} from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-type TestLoadParams = { id: string };
-
-const FAKE_ID = 'fake';
-
-class TestSecondaryRedisCacheLoader extends EntitySecondaryCacheLoader<
-  TestLoadParams,
-  RedisTestEntityFields,
-  string,
-  TestViewerContext,
-  RedisTestEntity,
-  RedisTestEntityPrivacyPolicy
-> {
-  public databaseLoadCount = 0;
-
-  protected async fetchObjectsFromDatabaseAsync(
-    loadParamsArray: readonly Readonly<TestLoadParams>[]
-  ): Promise<ReadonlyMap<Readonly<TestLoadParams>, Readonly<RedisTestEntityFields> | null>> {
-    this.databaseLoadCount += loadParamsArray.length;
-
-    const emptyMap = new Map(loadParamsArray.map((p) => [p, null]));
-    return await mapMapAsync(emptyMap, async (_value, loadParams) => {
-      if (loadParams.id === FAKE_ID) {
-        return null;
-      }
-      return nullthrows(
-        (
-          await this.entityLoader
-            .enforcing()
-            .loadManyByFieldEqualityConjunctionAsync([
-              { fieldName: 'id', fieldValue: loadParams.id },
-            ])
-        )[0]
-      ).getAllFields();
-    });
-  }
-}
-
-describe(RedisSecondaryEntityCache, () => {
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    redisCacheAdapterContext = {
-      redisClient,
-      makeKeyFn(..._parts: string[]): string {
-        throw new Error('should not be used by this test');
-      },
-      cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redisClient.flushdb();
-  });
-  afterAll(async () => {
-    redisClient.disconnect();
-  });
-
-  it('Loads through secondary loader, caches, and invalidates', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-
-    const createdEntity = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'wat')
-      .enforceCreateAsync();
-
-    const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(
-      new RedisSecondaryEntityCache(
-        redisTestEntityConfiguration,
-        redisCacheAdapterContext,
-        (loadParams) => `test-key-${loadParams.id}`
-      ),
-      RedisTestEntity.loader(viewerContext)
-    );
-
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    const results2 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results2.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    await secondaryCacheLoader.invalidateManyAsync([loadParams]);
-
-    const results3 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results3.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(2);
-  });
-
-  it('correctly handles uncached and unfetchable load params', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-
-    const secondaryCacheLoader = new TestSecondaryRedisCacheLoader(
-      new RedisSecondaryEntityCache(
-        redisTestEntityConfiguration,
-        redisCacheAdapterContext,
-        (loadParams) => `test-key-${loadParams.id}`
-      ),
-      RedisTestEntity.loader(viewerContext)
-    );
-
-    const loadParams = { id: FAKE_ID };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(results.size).toBe(1);
-    expect(results.get(loadParams)).toBe(null);
-  });
-});
@@ -1,7 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-secondary-cache-redis
- */
-
-export { default as RedisSecondaryEntityCache } from './RedisSecondaryEntityCache';
@@ -1,88 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-
-export type RedisTestEntityFields = {
-  id: string;
-  name: string;
-};
-
-export default class RedisTestEntity extends Entity<RedisTestEntityFields, string, ViewerContext> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    RedisTestEntityFields,
-    string,
-    ViewerContext,
-    RedisTestEntity,
-    RedisTestEntityPrivacyPolicy
-  > {
-    return redisTestEntityCompanionDefinition;
-  }
-}
-
-export class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  RedisTestEntityFields,
-  string,
-  ViewerContext,
-  RedisTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      RedisTestEntityFields,
-      string,
-      ViewerContext,
-      RedisTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      RedisTestEntityFields,
-      string,
-      ViewerContext,
-      RedisTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      RedisTestEntityFields,
-      string,
-      ViewerContext,
-      RedisTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      RedisTestEntityFields,
-      string,
-      ViewerContext,
-      RedisTestEntity
-    >(),
-  ];
-}
-
-export const redisTestEntityConfiguration = new EntityConfiguration<RedisTestEntityFields>({
-  idField: 'id',
-  tableName: 'redis_test_entities',
-  schema: {
-    id: new UUIDField({
-      columnName: 'id',
-    }),
-    name: new StringField({
-      columnName: 'name',
-    }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'redis',
-});
-
-const redisTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: RedisTestEntity,
-  entityConfiguration: redisTestEntityConfiguration,
-  privacyPolicyClass: RedisTestEntityPrivacyPolicy,
-});
@@ -1,37 +0,0 @@
-import {
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-} from '@expo/entity';
-import {
-  RedisCacheAdapterContext,
-  RedisCacheAdapterProvider,
-} from '@expo/entity-cache-adapter-redis';
-
-export const createRedisIntegrationTestEntityCompanionProvider = (
-  redisCacheAdapterContext: RedisCacheAdapterContext,
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'redis',
-        {
-          cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
-        },
-      ],
-    ])
-  );
-};
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}