feat: add entity write validation

2026-11-13 20:28:06 -10:00 · 2020-06-23 20:43:20 -07:00
117 changed files with 2516 additions and 8574 deletions
@@ -9,8 +9,7 @@
  ],
  "rules": {
    "no-restricted-imports": ["error",{ "paths": [".", "..", "../.."] }],
-    "tsdoc/syntax": "warn",
-    "no-console": "warn"
+    "tsdoc/syntax": "warn"
  },
  "overrides": [
    {
@@ -12,7 +12,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
-          node-version: 12.x
+          node-version: 10.x
      - name: Cache Node.js modules
        uses: actions/cache@v1
        with:
@@ -10,11 +10,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
    - uses: actions/setup-node@v1
      with:
-        node-version: 12.x
+        node-version: 10.x
    - name: Cache Node.js modules
      uses: actions/cache@v1
      with:
@@ -1,148 +1,6 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [0.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-
-### Bug Fixes
-
-* fix null handling in load paths (try 2) ([#96](https://github.com/expo/entity/issues/96)) ([d960329](https://github.com/expo/entity/commit/d9603298e0cc5c3c2b0cca959876e9195555fb57))
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure again ([#93](https://github.com/expo/entity/issues/93)) ([012c05d](https://github.com/expo/entity/commit/012c05d62d2ecd559eb331c6ca358052bfe66dc8))
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure ([#89](https://github.com/expo/entity/issues/89)) ([cca8fc1](https://github.com/expo/entity/commit/cca8fc19870057ebc7033081b59fab4a142fbf1a))
-
-
-### Features
-
-* add ability to invalidate an entity manually ([#91](https://github.com/expo/entity/issues/91)) ([d1a6f13](https://github.com/expo/entity/commit/d1a6f1339648942f12b3fb605eb329aefe5cdd63))
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package root
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-
-### Features
-
-* add entityClassName to metrics adapter events ([#83](https://github.com/expo/entity/issues/83)) ([f4cdc01](https://github.com/expo/entity/commit/f4cdc01c6cb8868c24ce3da2274f0901687e05bd))
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-
-### Bug Fixes
-
-* correct type of runInTransactionAsync ([#81](https://github.com/expo/entity/issues/81)) ([f98f7d1](https://github.com/expo/entity/commit/f98f7d14b6149a496a7a3e97dd63d89b2842cc26))
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* fix incorrect loader types for field selecitons ([#72](https://github.com/expo/entity/issues/72)) ([cd2df8d](https://github.com/expo/entity/commit/cd2df8da4b81bcd4769e950d3124c18886df2816))
-* fix index export for EntityMutationTrigger and EntityMutationValidator ([#73](https://github.com/expo/entity/issues/73)) ([7e829f3](https://github.com/expo/entity/commit/7e829f30fde0bd343cb8a584ccda5530cf61ec33))
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-
-### Bug Fixes
-
-* ensure transitive deletion triggers are run for CASCADE_DELETE_INVALIDATE_CACHE ([#66](https://github.com/expo/entity/issues/66)) ([5744c51](https://github.com/expo/entity/commit/5744c51e6b3178bd9f229f3f465b683bb4474c8a))
-* separate out EntityMutationValidator ([#68](https://github.com/expo/entity/issues/68)) ([547a1ef](https://github.com/expo/entity/commit/547a1efcecd17cc085702d1a3e9888ce5b644b13))
-* update setField to correct typing ([#62](https://github.com/expo/entity/issues/62)) ([7a77afc](https://github.com/expo/entity/commit/7a77afc83ea732c9b062a5d6865eff9d3131d015))
-
-
-### Features
-
-* entity mutation validators ([#67](https://github.com/expo/entity/issues/67)) ([fc4377d](https://github.com/expo/entity/commit/fc4377d8839da07417b88afc138f73556383d896))
-* mutation triggers ([#65](https://github.com/expo/entity/issues/65)) ([fd6060c](https://github.com/expo/entity/commit/fd6060cc844f60635b3ce4c400c4877f2df8fa44))
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-
-### Bug Fixes
-
-* fix stub cache key generation for global cache ([#59](https://github.com/expo/entity/issues/59)) ([7c180e8](https://github.com/expo/entity/commit/7c180e84d9a8cdfd9380fac0eab2d02a96ec18f3))
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-
-### Bug Fixes
-
-* correct some typing issues and exports ([#57](https://github.com/expo/entity/issues/57)) ([e91cfba](https://github.com/expo/entity/commit/e91cfba99321c2c4da2078aafd8627cbf0ceca50))
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Bug Fixes
-
-* support number ID field generation in StubDatabaseAdapter ([#43](https://github.com/expo/entity/issues/43)) ([60cc0fb](https://github.com/expo/entity/commit/60cc0fbda460c3ada1f5244a2780f90382fe3ebd))
-* upgrade Apollo server for security advisory ([#38](https://github.com/expo/entity/issues/38)) ([d25c1e1](https://github.com/expo/entity/commit/d25c1e142d52385725593f4f155d1795697ab490))
-
-
-### Features
-
-* add two fan out methods to association loader ([#52](https://github.com/expo/entity/issues/52)) ([89cfb3d](https://github.com/expo/entity/commit/89cfb3d5a01d4da90f64acc52ae1b839ba348a35))
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
-
-
-# 0.4.0 (2020-06-03)
+# Changelog

+## v0.4.0 (2020-06-03)

 * All Packages
  * Documentation Improvements
@@ -158,11 +16,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * `@expo/entity-example`
  * Initial Version

-# 0.3.0 (2020-04-28)
+## v0.3.0 (2020-04-28)

 * `@expo/entity`
  * Initial Version
 * `@expo/entity-cache-adapter-redis`
  * Initial Version
 * `@expo/entity-database-adapter-knex`
-  * Initial Version
+  * Initial Version
@@ -78,21 +78,6 @@ Entity is not limited in where it can or should be used, but was designed for us

 Note: The entity framework instance should not be shared across multiple requests since it contains a unique memoized [Dataloader](https://github.com/graphql/dataloader#class-dataloader). A long-lived instance is prone to data synchronization issues, especially when the application is scaled horizontally and multiple shared caches would exist for the same data.

-## Releasing
-
-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

 The Entity source code is made available under the [MIT license](LICENSE).
@@ -4,5 +4,5 @@
  ],
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.10.0"
+  "version": "0.4.0"
 }
@@ -14,28 +14,29 @@
  },
  "devDependencies": {
    "@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/node": "^14.6.0",
-    "@types/uuid": "^8.3.0",
-    "@typescript-eslint/eslint-plugin": "^3.10.1",
-    "@typescript-eslint/parser": "^3.10.1",
+    "@expo/results": "^0.3.0",
+    "@types/invariant": "^2.2.32",
+    "@types/ioredis": "^4.14.9",
+    "@types/jest": "^25.2.1",
+    "@types/lodash": "^4.14.150",
+    "@types/node": "^13.13.4",
+    "@types/uuid": "^7.0.3",
+    "@typescript-eslint/eslint-plugin": "^2.30.0",
+    "@typescript-eslint/parser": "^2.30.0",
    "barrelsby": "^2.2.0",
-    "eslint": "^7.7.0",
-    "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",
+    "eslint": "^6.8.0",
+    "eslint-config-universe": "^3.0.0",
+    "eslint-plugin-tsdoc": "^0.2.4",
+    "jest": "^24.9.0",
+    "lerna": "^3.20.2",
+    "pg": "^8.0.3",
+    "prettier": "^2.0.5",
+    "ts-jest": "~24.2.0",
+    "ts-mockito": "^2.5.0",
    "typedoc": "^0.17.6",
    "typedoc-plugin-lerna-packages": "^0.3.0",
-    "typescript": "^4.0.2",
-    "uuid": "^8.3.0"
+    "typescript": "^3.9.2",
+    "uuid": "^7.0.3"
  },
  "dependencies": {
    "@expo/entity": "file:packages/entity",
@@ -1,94 +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.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
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Features
-
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity-cache-adapter-redis",
-  "version": "0.10.0",
+  "version": "0.4.0",
  "description": "Redis cache adapter for @expo/entity",
  "files": [
    "build",
@@ -12,13 +12,13 @@
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
    "lint": "eslint src --ext '.ts'",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
+    "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",
+    "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"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -29,9 +29,9 @@
    "@expo/entity": "*"
  },
  "dependencies": {
-    "ioredis": "^4.17.3"
+    "ioredis": "^4.16.1"
  },
  "devDependencies": {
-    "@expo/entity": "^0.10.0"
+    "@expo/entity": "^0.4.0"
  }
 }
@@ -44,17 +44,13 @@ describe(RedisCacheAdapter, () => {
    const cacheAdapter = vc1.entityCompanionProvider.getCompanionForEntity(
      RedisTestEntity,
      RedisTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
+    )['cacheAdapter'];
    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);

-    const entity1Created = await RedisTestEntity.creator(vc1)
-      .setField('name', 'blah')
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    const entity1 = await RedisTestEntity.loader(vc1)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
+    // creating an entity should put it in cache (loader loads it after creation)
+    const entity1 = await enforceAsyncResult(
+      RedisTestEntity.creator(vc1).setField('name', 'blah').createAsync()
+    );

    const cachedJSON = await redisCacheAdapterContext.redisClient.get(
      cacheKeyMaker('id', entity1.getID())
@@ -1,10 +1,4 @@
-import {
-  CacheStatus,
-  UUIDField,
-  EntityConfiguration,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-} from '@expo/entity';
+import { CacheStatus, UUIDField, EntityConfiguration } from '@expo/entity';
 import { Redis, Pipeline } from 'ioredis';
 import { mock, when, instance, anything, verify } from 'ts-mockito';

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

 describe(RedisCacheAdapter, () => {
@@ -85,12 +85,12 @@ export const redisTestEntityConfiguration = new EntityConfiguration<RedisTestEnt
      columnName: 'date_field',
    }),
  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

-const redisTestEntityCompanionDefinition = new EntityCompanionDefinition({
+const redisTestEntityCompanionDefinition = {
  entityClass: RedisTestEntity,
  entityConfiguration: redisTestEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: RedisTestEntityPrivacyPolicy,
-});
+};
@@ -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.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
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* fix index export for EntityMutationTrigger and EntityMutationValidator ([#73](https://github.com/expo/entity/issues/73)) ([7e829f3](https://github.com/expo/entity/commit/7e829f30fde0bd343cb8a584ccda5530cf61ec33))
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-
-### Bug Fixes
-
-* separate out EntityMutationValidator ([#68](https://github.com/expo/entity/issues/68)) ([547a1ef](https://github.com/expo/entity/commit/547a1efcecd17cc085702d1a3e9888ce5b644b13))
-
-
-### Features
-
-* entity mutation validators ([#67](https://github.com/expo/entity/issues/67)) ([fc4377d](https://github.com/expo/entity/commit/fc4377d8839da07417b88afc138f73556383d896))
-* mutation triggers ([#65](https://github.com/expo/entity/issues/65)) ([fd6060c](https://github.com/expo/entity/commit/fd6060cc844f60635b3ce4c400c4877f2df8fa44))
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-
-### Bug Fixes
-
-* correct some typing issues and exports ([#57](https://github.com/expo/entity/issues/57)) ([e91cfba](https://github.com/expo/entity/commit/e91cfba99321c2c4da2078aafd8627cbf0ceca50))
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Features
-
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity-database-adapter-knex",
-  "version": "0.10.0",
+  "version": "0.4.0",
  "description": "Knex database adapter for @expo/entity",
  "files": [
    "build",
@@ -12,13 +12,13 @@
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
    "lint": "eslint src --ext '.ts'",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
+    "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",
+    "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"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -29,9 +29,9 @@
    "@expo/entity": "*"
  },
  "dependencies": {
-    "knex": "^0.21.5"
+    "knex": "^0.20.11"
  },
  "devDependencies": {
-    "@expo/entity": "^0.10.0"
+    "@expo/entity": "^0.4.0"
  }
 }
@@ -1,21 +1,25 @@
-import { EntityQueryContextProvider } from '@expo/entity';
+import {
+  IEntityQueryContextProvider,
+  EntityNonTransactionalQueryContext,
+  EntityTransactionalQueryContext,
+} from '@expo/entity';
 import Knex from 'knex';

 /**
 * Query context provider for knex (postgres).
 */
-export default class PostgresEntityQueryContextProvider extends EntityQueryContextProvider {
-  constructor(private readonly knexInstance: Knex) {
-    super();
+export default class PostgresEntityQueryContextProvider implements IEntityQueryContextProvider {
+  constructor(private readonly knexInstance: Knex) {}
+
+  getRegularEntityQueryContext(): EntityNonTransactionalQueryContext {
+    return new EntityNonTransactionalQueryContext(this.knexInstance);
  }

-  protected getQueryInterface(): any {
-    return this.knexInstance;
-  }
-
-  protected createTransactionRunner<T>(): (
-    transactionScope: (trx: any) => Promise<T>
-  ) => Promise<T> {
-    return (transactionScope) => this.knexInstance.transaction(transactionScope);
+  async runInTransactionAsync<T>(
+    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
+  ): Promise<T> {
+    return await this.knexInstance.transaction(async (trx) => {
+      return await transactionScope(new EntityTransactionalQueryContext(trx));
+    });
  }
 }
@@ -8,8 +8,6 @@ import { enforceAsyncResult } from '@expo/results';
 import Knex from 'knex';

 import PostgresTestEntity from '../testfixtures/PostgresTestEntity';
-import PostgresTriggerTestEntity from '../testfixtures/PostgresTriggerTestEntity';
-import PostgresValidatorTestEntity from '../testfixtures/PostgresValidatorTestEntity';
 import { createKnexIntegrationTestEntityCompanionProvider } from '../testfixtures/createKnexIntegrationTestEntityCompanionProvider';

 describe('postgres entity integration', () => {
@@ -34,7 +32,7 @@ describe('postgres entity integration', () => {

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

  it('supports parallel partial updates', async () => {
@@ -327,223 +325,4 @@ describe('postgres entity integration', () => {
      expect(resultsMultipleOrderBy.map((e) => e.getField('name'))).toEqual(['c', 'b', 'a']);
    });
  });
-
-  describe('trigger transaction behavior', () => {
-    describe('create', () => {
-      it('rolls back transaction when trigger throws except afterCommit', async () => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance)
-        );
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1)
-            .setField('name', 'beforeCreate')
-            .enforceCreateAsync()
-        ).rejects.toThrowError('name cannot have value beforeCreate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeCreate')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1)
-            .setField('name', 'afterCreate')
-            .enforceCreateAsync()
-        ).rejects.toThrowError('name cannot have value afterCreate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterCreate')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1).setField('name', 'beforeAll').enforceCreateAsync()
-        ).rejects.toThrowError('name cannot have value beforeAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeAll')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1).setField('name', 'afterAll').enforceCreateAsync()
-        ).rejects.toThrowError('name cannot have value afterAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterAll')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.creator(vc1)
-            .setField('name', 'afterCommit')
-            .enforceCreateAsync()
-        ).rejects.toThrowError('name cannot have value afterCommit');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterCommit')
-        ).resolves.not.toBeNull();
-      });
-    });
-
-    describe('update', () => {
-      it('rolls back transaction when trigger throws except afterCommit', async () => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance)
-        );
-
-        const entity = await PostgresTriggerTestEntity.creator(vc1)
-          .setField('name', 'blah')
-          .enforceCreateAsync();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'beforeUpdate')
-            .enforceUpdateAsync()
-        ).rejects.toThrowError('name cannot have value beforeUpdate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeUpdate')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'afterUpdate')
-            .enforceUpdateAsync()
-        ).rejects.toThrowError('name cannot have value afterUpdate');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterUpdate')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'beforeAll')
-            .enforceUpdateAsync()
-        ).rejects.toThrowError('name cannot have value beforeAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeAll')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'afterAll')
-            .enforceUpdateAsync()
-        ).rejects.toThrowError('name cannot have value afterAll');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterAll')
-        ).resolves.toBeNull();
-
-        await expect(
-          PostgresTriggerTestEntity.updater(entity)
-            .setField('name', 'afterCommit')
-            .enforceUpdateAsync()
-        ).rejects.toThrowError('name cannot have value afterCommit');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterCommit')
-        ).resolves.not.toBeNull();
-      });
-    });
-
-    describe('delete', () => {
-      it('rolls back transaction when trigger throws except afterCommit', async () => {
-        const vc1 = new ViewerContext(
-          createKnexIntegrationTestEntityCompanionProvider(knexInstance)
-        );
-
-        const entityBeforeDelete = await PostgresTriggerTestEntity.creator(vc1)
-          .setField('name', 'beforeDelete')
-          .enforceCreateAsync();
-        await expect(
-          PostgresTriggerTestEntity.enforceDeleteAsync(entityBeforeDelete)
-        ).rejects.toThrowError('name cannot have value beforeDelete');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'beforeDelete')
-        ).resolves.not.toBeNull();
-
-        const entityAfterDelete = await PostgresTriggerTestEntity.creator(vc1)
-          .setField('name', 'afterDelete')
-          .enforceCreateAsync();
-        await expect(
-          PostgresTriggerTestEntity.enforceDeleteAsync(entityAfterDelete)
-        ).rejects.toThrowError('name cannot have value afterDelete');
-        await expect(
-          PostgresTriggerTestEntity.loader(vc1)
-            .enforcing()
-            .loadByFieldEqualingAsync('name', 'afterDelete')
-        ).resolves.not.toBeNull();
-      });
-    });
-    describe('validation transaction behavior', () => {
-      describe('create', () => {
-        it('rolls back transaction when trigger throws ', async () => {
-          const vc1 = new ViewerContext(
-            createKnexIntegrationTestEntityCompanionProvider(knexInstance)
-          );
-
-          await expect(
-            PostgresValidatorTestEntity.creator(vc1)
-              .setField('name', 'beforeCreateAndBeforeUpdate')
-              .enforceCreateAsync()
-          ).rejects.toThrowError('name cannot have value beforeCreateAndBeforeUpdate');
-          await expect(
-            PostgresValidatorTestEntity.loader(vc1)
-              .enforcing()
-              .loadByFieldEqualingAsync('name', 'beforeCreateAndBeforeUpdate')
-          ).resolves.toBeNull();
-        });
-      });
-      describe('update', () => {
-        it('rolls back transaction when trigger throws ', async () => {
-          const vc1 = new ViewerContext(
-            createKnexIntegrationTestEntityCompanionProvider(knexInstance)
-          );
-
-          const entity = await PostgresValidatorTestEntity.creator(vc1)
-            .setField('name', 'blah')
-            .enforceCreateAsync();
-
-          await expect(
-            PostgresValidatorTestEntity.updater(entity)
-              .setField('name', 'beforeCreateAndBeforeUpdate')
-              .enforceUpdateAsync()
-          ).rejects.toThrowError('name cannot have value beforeCreateAndBeforeUpdate');
-          await expect(
-            PostgresValidatorTestEntity.loader(vc1)
-              .enforcing()
-              .loadByFieldEqualingAsync('name', 'beforeCreateAndBeforeUpdate')
-          ).resolves.toBeNull();
-        });
-      });
-      describe('delete', () => {
-        it('validation should not run on a delete mutation', async () => {
-          const vc1 = new ViewerContext(
-            createKnexIntegrationTestEntityCompanionProvider(knexInstance)
-          );
-
-          const entityToDelete = await PostgresValidatorTestEntity.creator(vc1)
-            .setField('name', 'shouldBeDeleted')
-            .enforceCreateAsync();
-          await PostgresValidatorTestEntity.enforceDeleteAsync(entityToDelete);
-          await expect(
-            PostgresValidatorTestEntity.loader(vc1)
-              .enforcing()
-              .loadByFieldEqualingAsync('name', 'shouldBeDeleted')
-          ).resolves.toBeNull();
-        });
-      });
-    });
-  });
 });
@@ -27,7 +27,7 @@ describe('postgres entity integration', () => {

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

  describe('invalid operation result counts', () => {
@@ -43,6 +43,9 @@ describe('postgres entity integration', () => {
      await expect(InvalidTestEntity.deleteAsync(entity1)).rejects.toThrowError(
        'Excessive deletions from database adapter delete'
      );
+      await expect(InvalidTestEntity.deleteAsync(entity1)).rejects.toThrowError(
+        'No deletions from database adapter delete'
+      );
    });

    it('throws after update of multiple rows', async () => {
@@ -1,3 +1,2 @@
 export { default as PostgresEntityDatabaseAdapter } from './PostgresEntityDatabaseAdapter';
-export { default as PostgresEntityDatabaseAdapterProvider } from './PostgresEntityDatabaseAdapterProvider';
 export { default as PostgresEntityQueryContextProvider } from './PostgresEntityQueryContextProvider';
@@ -104,12 +104,12 @@ export const invalidTestEntityConfiguration = new EntityConfiguration<InvalidTes
      columnName: 'name',
    }),
  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

-const invalidTestEntityCompanionDefinition = new EntityCompanionDefinition({
+const invalidTestEntityCompanionDefinition = {
  entityClass: InvalidTestEntity,
  entityConfiguration: invalidTestEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: InvalidTestEntityPrivacyPolicy,
-});
+};
@@ -150,12 +150,12 @@ export const postgresTestEntityConfiguration = new EntityConfiguration<PostgresT
      columnName: 'maybe_json_array_field',
    }),
  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

-const postgresTestEntityCompanionDefinition = new EntityCompanionDefinition({
+const postgresTestEntityCompanionDefinition = {
  entityClass: PostgresTestEntity,
  entityConfiguration: postgresTestEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: PostgresTestEntityPrivacyPolicy,
-});
+};
@@ -1,175 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-  EntityCompanionDefinition,
-  Entity,
-  EntityMutationTrigger,
-  EntityQueryContext,
-  EntityNonTransactionalMutationTrigger,
-} from '@expo/entity';
-import Knex from 'knex';
-
-type PostgresTriggerTestEntityFields = {
-  id: string;
-  name: string | null;
-};
-
-export default class PostgresTriggerTestEntity extends Entity<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    PostgresTriggerTestEntityFields,
-    string,
-    ViewerContext,
-    PostgresTriggerTestEntity,
-    PostgresTriggerTestEntityPrivacyPolicy
-  > {
-    return postgresTestEntityCompanionDefinition;
-  }
-
-  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('uuid_generate_v4()')).primary();
-        table.string('name');
-      });
-    }
-    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 PostgresTriggerTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresTriggerTestEntity
-> {
-  protected readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-  protected readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-  protected readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-  protected readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresTriggerTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresTriggerTestEntity
-    >(),
-  ];
-}
-
-class ThrowConditionallyTrigger extends EntityMutationTrigger<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresTriggerTestEntity
-> {
-  constructor(private fieldName: keyof PostgresTriggerTestEntityFields, private badValue: string) {
-    super();
-  }
-
-  async executeAsync(
-    _viewerContext: ViewerContext,
-    _queryContext: EntityQueryContext,
-    entity: PostgresTriggerTestEntity
-  ): Promise<void> {
-    if (entity.getField(this.fieldName) === this.badValue) {
-      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
-    }
-  }
-}
-
-class ThrowConditionallyNonTransactionalTrigger extends EntityNonTransactionalMutationTrigger<
-  PostgresTriggerTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresTriggerTestEntity
-> {
-  constructor(private fieldName: keyof PostgresTriggerTestEntityFields, private badValue: string) {
-    super();
-  }
-
-  async executeAsync(
-    _viewerContext: ViewerContext,
-    entity: PostgresTriggerTestEntity
-  ): Promise<void> {
-    if (entity.getField(this.fieldName) === this.badValue) {
-      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
-    }
-  }
-}
-
-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: {
-    beforeCreate: [new ThrowConditionallyTrigger('name', 'beforeCreate')],
-    afterCreate: [new ThrowConditionallyTrigger('name', 'afterCreate')],
-    beforeUpdate: [new ThrowConditionallyTrigger('name', 'beforeUpdate')],
-    afterUpdate: [new ThrowConditionallyTrigger('name', 'afterUpdate')],
-    beforeDelete: [new ThrowConditionallyTrigger('name', 'beforeDelete')],
-    afterDelete: [new ThrowConditionallyTrigger('name', 'afterDelete')],
-    beforeAll: [new ThrowConditionallyTrigger('name', 'beforeAll')],
-    afterAll: [new ThrowConditionallyTrigger('name', 'afterAll')],
-    afterCommit: [new ThrowConditionallyNonTransactionalTrigger('name', 'afterCommit')],
-  },
-});
@@ -1,147 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-  EntityCompanionDefinition,
-  Entity,
-  EntityMutationTrigger,
-  EntityQueryContext,
-} from '@expo/entity';
-import Knex from 'knex';
-
-type PostgresValidatorTestEntityFields = {
-  id: string;
-  name: string | null;
-};
-
-export default class PostgresValidatorTestEntity extends Entity<
-  PostgresValidatorTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    PostgresValidatorTestEntityFields,
-    string,
-    ViewerContext,
-    PostgresValidatorTestEntity,
-    PostgresValidatorTestEntityPrivacyPolicy
-  > {
-    return postgresTestEntityCompanionDefinition;
-  }
-
-  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('uuid_generate_v4()')).primary();
-        table.string('name');
-      });
-    }
-    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 PostgresValidatorTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  PostgresValidatorTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresValidatorTestEntity
-> {
-  protected readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-  protected readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-  protected readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-  protected readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      PostgresValidatorTestEntityFields,
-      string,
-      ViewerContext,
-      PostgresValidatorTestEntity
-    >(),
-  ];
-}
-
-class ThrowConditionallyTrigger extends EntityMutationTrigger<
-  PostgresValidatorTestEntityFields,
-  string,
-  ViewerContext,
-  PostgresValidatorTestEntity
-> {
-  constructor(
-    private fieldName: keyof PostgresValidatorTestEntityFields,
-    private badValue: string
-  ) {
-    super();
-  }
-
-  async executeAsync(
-    _viewerContext: ViewerContext,
-    _queryContext: EntityQueryContext,
-    entity: PostgresValidatorTestEntity
-  ): Promise<void> {
-    if (entity.getField(this.fieldName) === this.badValue) {
-      throw new Error(`${this.fieldName} cannot have value ${this.badValue}`);
-    }
-  }
-}
-
-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')],
-});
@@ -4,7 +4,7 @@ import {
  EntityCompanionProvider,
  CacheAdapterFlavor,
  DatabaseAdapterFlavor,
-  InMemoryFullCacheStubCacheAdapterProvider,
+  NoCacheStubCacheAdapterProvider,
 } from '@expo/entity';
 import Knex from 'knex';

@@ -25,7 +25,7 @@ export const createKnexIntegrationTestEntityCompanionProvider = (
    },
    {
      [CacheAdapterFlavor.REDIS]: {
-        cacheAdapterProvider: new InMemoryFullCacheStubCacheAdapterProvider(),
+        cacheAdapterProvider: new NoCacheStubCacheAdapterProvider(),
      },
    }
  );
@@ -1,100 +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.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
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Bug Fixes
-
-* upgrade Apollo server for security advisory ([#38](https://github.com/expo/entity/issues/38)) ([d25c1e1](https://github.com/expo/entity/commit/d25c1e142d52385725593f4f155d1795697ab490))
-
-
-### Features
-
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -1,20 +1,20 @@
 {
  "name": "@expo/entity-example",
  "private": true,
-  "version": "0.10.0",
+  "version": "0.4.0",
  "description": "An example integration of the @expo/entity framework",
  "scripts": {
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
    "lint": "eslint src --ext '.ts'",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
+    "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",
+    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir --runInBand --passWithNoTests",
    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete",
    "start": "tsnd --transpile-only --inspect --respawn --no-notify --async-stack-traces --throw-deprecation -- src/index.ts"
  },
  "engines": {
-    "node": ">=12"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -22,18 +22,18 @@
  "author": "Expo",
  "license": "MIT",
  "dependencies": {
-    "@expo/entity": "^0.10.0",
-    "apollo-server-koa": "^2.16.1",
-    "graphql": "^15.3.0",
-    "koa": "^2.13.0",
-    "koa-body": "^4.2.0",
-    "koa-router": "^9.4.0"
+    "@expo/entity": "^0.4.0",
+    "apollo-server-koa": "^2.14.2",
+    "graphql": "^15.0.0",
+    "koa": "^2.11.0",
+    "koa-body": "^4.1.1",
+    "koa-router": "^8.0.8"
  },
  "devDependencies": {
-    "@types/koa": "^2.11.4",
-    "@types/koa-router": "^7.4.1",
-    "@types/supertest": "^2.0.10",
+    "@types/koa": "^2.11.3",
+    "@types/koa-router": "^7.4.0",
+    "@types/supertest": "^2.0.9",
    "supertest": "^4.0.2",
-    "ts-node-dev": "^1.0.0-pre.60"
+    "ts-node-dev": "^1.0.0-pre.44"
  }
 }
@@ -1,13 +1,18 @@
-import { EntityQueryContextProvider } from '@expo/entity';
+import {
+  IEntityQueryContextProvider,
+  EntityQueryContext,
+  EntityNonTransactionalQueryContext,
+  EntityTransactionalQueryContext,
+} from '@expo/entity';

-export default class InMemoryQueryContextProvider extends EntityQueryContextProvider {
-  protected getQueryInterface(): any {
-    return {};
+export default class InMemoryQueryContextProvider implements IEntityQueryContextProvider {
+  getRegularEntityQueryContext(): EntityQueryContext {
+    return new EntityNonTransactionalQueryContext({});
  }

-  protected createTransactionRunner<T>(): (
-    transactionScope: (queryInterface: any) => Promise<T>
-  ) => Promise<T> {
-    return (transactionScope) => Promise.resolve(transactionScope({}));
+  async runInTransactionAsync<T>(
+    transactionScope: (queryContext: EntityQueryContext) => Promise<T>
+  ): Promise<T> {
+    return await transactionScope(new EntityTransactionalQueryContext({}));
  }
 }
@@ -2,14 +2,14 @@ import { EntityCompanionProvider } from '@expo/entity';
 import { ApolloServer } from 'apollo-server-koa';
 import Koa from 'koa';
 import koaBody from 'koa-body';
-import KoaRouter, { RouterContext } from 'koa-router';
+import KoaRouter from 'koa-router';

 import { entityCompanionMiddleware, viewerContextMiddleware } from './middleware';
 import notesRouter from './routers/notesRouter';
 import { typeDefs, resolvers } from './schema';
 import { ExampleViewerContext } from './viewerContexts';

-export type ExampleContext = RouterContext<ExampleState>;
+export type ExampleContext = Koa.ParameterizedContext<ExampleState>;

 /**
 * Koa provides a per-request state container to place custom properties.
@@ -38,7 +38,7 @@ export default class NoteEntity extends Entity<NoteFields, string, ExampleViewer
 * of entity. In some languages, this would be representable as "abstract" static members
 * of the class itself, but TypeScript disallows static generic and abstract methods.
 */
-export const noteEntityCompanion = new EntityCompanionDefinition({
+export const noteEntityCompanion = {
  entityClass: NoteEntity,
  entityConfiguration: new EntityConfiguration<NoteFields>({
    idField: 'id',
@@ -57,8 +57,8 @@ export const noteEntityCompanion = new EntityCompanionDefinition({
        columnName: 'body',
      }),
    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  }),
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: NotePrivacyPolicy,
-});
+};
@@ -1,66 +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.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
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure again ([#93](https://github.com/expo/entity/issues/93)) ([012c05d](https://github.com/expo/entity/commit/012c05d62d2ecd559eb331c6ca358052bfe66dc8))
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure ([#89](https://github.com/expo/entity/issues/89)) ([cca8fc1](https://github.com/expo/entity/commit/cca8fc19870057ebc7033081b59fab4a142fbf1a))
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
@@ -1,5 +0,0 @@
-# `@expo/entity-full-integration-tests`
-
-Full integration tests for testing combinations of database and cache adapters.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_entity_full_integration_tests.html)
@@ -1,33 +0,0 @@
-{
-  "name": "@expo/entity-full-integration-tests",
-  "private": true,
-  "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 --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",
-    "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": "*",
-    "@expo/entity-database-adapter-knex": "*"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.10.0",
-    "@expo/entity-cache-adapter-redis": "^0.10.0",
-    "@expo/entity-database-adapter-knex": "^0.10.0"
-  }
-}
@@ -1,205 +0,0 @@
-import {
-  EntityPrivacyPolicy,
-  ViewerContext,
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-  UUIDField,
-} from '@expo/entity';
-import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import Knex from 'knex';
-import { URL } from 'url';
-
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-
-interface TestFields {
-  id: string;
-  other_string: string;
-  third_string: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  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> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    TestEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return testEntityCompanion;
-  }
-}
-
-const testEntityConfiguration = new EntityConfiguration<TestFields>({
-  idField: 'id',
-  tableName: 'testentities',
-  schema: {
-    id: new UUIDField({
-      columnName: 'id',
-      cache: true,
-    }),
-    other_string: new UUIDField({
-      columnName: 'other_string',
-      cache: true,
-    }),
-    third_string: new UUIDField({
-      columnName: 'third_string',
-    }),
-  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-});
-
-const testEntityCompanion = new EntityCompanionDefinition({
-  entityClass: TestEntity,
-  entityConfiguration: testEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-});
-
-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('uuid_generate_v4()')).primary();
-    table.string('other_string').notNullable();
-    table.string('third_string').notNullable();
-  });
-  await knex.into('testentities').truncate();
-}
-
-async function dropPostgresTable(knex: Knex): Promise<void> {
-  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;
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    knexInstance = Knex({
-      client: 'pg',
-      connection: {
-        user: process.env.PGUSER,
-        password: process.env.PGPASSWORD,
-        host: 'localhost',
-        port: parseInt(process.env.PGPORT!, 10),
-        database: process.env.PGDATABASE,
-      },
-    });
-    redisCacheAdapterContext = {
-      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
-      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 createOrTruncatePostgresTables(knexInstance);
-    await redisCacheAdapterContext.redisClient.flushdb();
-  });
-
-  afterAll(async () => {
-    await dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-    redisCacheAdapterContext.redisClient.disconnect();
-  });
-
-  test('lots of updates in long-ish running transactions', async () => {
-    const viewerContext = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
-    );
-
-    const entity1 = await TestEntity.creator(viewerContext)
-      .setField('other_string', 'hello')
-      .setField('third_string', 'initial')
-      .enforceCreateAsync();
-
-    // put entities in cache and dataloader
-    await TestEntity.loader(viewerContext).enforcing().loadByIDAsync(entity1.getID());
-    await TestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('other_string', 'hello');
-
-    let openBarrier1: () => void;
-    const barrier1 = new Promise((resolve) => {
-      openBarrier1 = resolve;
-    });
-
-    let openBarrier2: () => void;
-    const barrier2 = new Promise((resolve) => {
-      openBarrier2 = resolve;
-    });
-
-    await Promise.all([
-      // do a load after the transaction below updates the entity but before transaction commits to ensure
-      // that the cache is cleared after the transaction commits rather than in the middle where the changes
-      // may not be visible by other requests (ViewerContexts) which would cache the incorrect
-      // value during the read-through cache.
-      (async () => {
-        await barrier1;
-
-        const viewerContextInternal = new ViewerContext(
-          createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
-        );
-        await TestEntity.loader(viewerContextInternal).enforcing().loadByIDAsync(entity1.getID());
-
-        openBarrier2!();
-      })(),
-      TestEntity.runInTransactionAsync(viewerContext, async (queryContext) => {
-        await TestEntity.updater(entity1, queryContext)
-          .setField('third_string', 'updated')
-          .enforceUpdateAsync();
-
-        openBarrier1();
-
-        // wait for to ensure the transaction isn't committed until after load above occurs
-        await barrier2;
-      }),
-    ]);
-
-    // ensure cache consistency
-    const viewerContextLast = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
-    );
-
-    const loadedById = await TestEntity.loader(viewerContextLast)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
-    const loadedByField = await TestEntity.loader(viewerContextLast)
-      .enforcing()
-      .loadByFieldEqualingAsync('other_string', 'hello');
-
-    expect(loadedById.getField('third_string')).toEqual('updated');
-    expect(loadedByField!.getField('third_string')).toEqual('updated');
-  });
-});
@@ -1,108 +0,0 @@
-import { ViewerContext } from '@expo/entity';
-import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import Knex from 'knex';
-import { URL } from 'url';
-
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-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('uuid_generate_v4()')).primary();
-  });
-  await knex.into('parents').truncate();
-
-  await knex.schema.createTable('children', (table) => {
-    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();
-}
-
-async function dropPostgresTable(knex: Knex): Promise<void> {
-  if (await knex.schema.hasTable('children')) {
-    await knex.schema.dropTable('children');
-  }
-  if (await knex.schema.hasTable('parents')) {
-    await knex.schema.dropTable('parents');
-  }
-}
-
-describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
-  let knexInstance: Knex;
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    knexInstance = Knex({
-      client: 'pg',
-      connection: {
-        user: process.env.PGUSER,
-        password: process.env.PGPASSWORD,
-        host: 'localhost',
-        port: parseInt(process.env.PGPORT!, 10),
-        database: process.env.PGDATABASE,
-      },
-    });
-    redisCacheAdapterContext = {
-      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
-      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 createOrTruncatePostgresTables(knexInstance);
-    await redisCacheAdapterContext.redisClient.flushdb();
-  });
-
-  afterAll(async () => {
-    await dropPostgresTable(knexInstance);
-    await knexInstance.destroy();
-    redisCacheAdapterContext.redisClient.disconnect();
-  });
-
-  describe('EntityEdgeDeletionBehavior.INVALIDATE_CACHE', () => {
-    it('invalidates the cache', async () => {
-      const viewerContext = new ViewerContext(
-        createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
-      );
-
-      const parent = await ParentEntity.creator(viewerContext).enforceCreateAsync();
-      const child = await ChildEntity.creator(viewerContext)
-        .setField('parent_id', parent.getID())
-        .enforceCreateAsync();
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID())
-      ).resolves.not.toBeNull();
-
-      await ParentEntity.enforceDeleteAsync(parent);
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.toBeNull();
-
-      await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
-      ).resolves.toBeNull();
-    });
-  });
-});
@@ -1,235 +0,0 @@
-import {
-  EntityPrivacyPolicy,
-  ViewerContext,
-  AlwaysAllowPrivacyPolicyRule,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-  UUIDField,
-  EntityEdgeDeletionBehavior,
-} from '@expo/entity';
-import { RedisCacheAdapterContext } from '@expo/entity-cache-adapter-redis';
-import Redis from 'ioredis';
-import Knex from 'knex';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import { createFullIntegrationTestEntityCompanionProvider } from '../testfixtures/createFullIntegrationTestEntityCompanionProvider';
-
-interface CategoryFields {
-  id: string;
-  parent_other_id: string;
-}
-
-interface OtherFields {
-  id: string;
-  parent_category_id: string;
-}
-
-class PrivacyPolicy extends EntityPrivacyPolicy<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
-const makeEntityClasses = async (knex: Knex, edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
-  const categoriesTableName = uuidv4();
-  const othersTableName = uuidv4();
-
-  class CategoryEntity extends Entity<CategoryFields, string, ViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<
-      CategoryFields,
-      string,
-      ViewerContext,
-      CategoryEntity,
-      PrivacyPolicy
-    > {
-      return categoryEntityCompanion;
-    }
-  }
-
-  class OtherEntity extends Entity<OtherFields, string, ViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<
-      OtherFields,
-      string,
-      ViewerContext,
-      OtherEntity,
-      PrivacyPolicy
-    > {
-      return otherEntityCompanion;
-    }
-  }
-
-  const categoryEntityConfiguration = new EntityConfiguration<CategoryFields>({
-    idField: 'id',
-    tableName: categoriesTableName,
-    getInboundEdges: () => [OtherEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_other_id: new UUIDField({
-        columnName: 'parent_other_id',
-        cache: true,
-        association: {
-          getAssociatedEntityClass: () => OtherEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-  });
-
-  const categoryEntityCompanion = new EntityCompanionDefinition({
-    entityClass: CategoryEntity,
-    entityConfiguration: categoryEntityConfiguration,
-    privacyPolicyClass: PrivacyPolicy,
-  });
-
-  const otherEntityConfiguration = new EntityConfiguration<OtherFields>({
-    idField: 'id',
-    tableName: othersTableName,
-    getInboundEdges: () => [CategoryEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_category_id: new UUIDField({
-        columnName: 'parent_category_id',
-        cache: true,
-        association: {
-          getAssociatedEntityClass: () => CategoryEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-  });
-
-  const otherEntityCompanion = new EntityCompanionDefinition({
-    entityClass: OtherEntity,
-    entityConfiguration: otherEntityConfiguration,
-    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('uuid_generate_v4()')).primary();
-  });
-
-  await knex.schema.createTable(othersTableName, (table) => {
-    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 {
-      table.uuid('parent_category_id').unique();
-    }
-  });
-
-  await knex.schema.alterTable(categoriesTableName, (table) => {
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE) {
-      table
-        .uuid('parent_other_id')
-        .references('id')
-        .inTable(othersTableName)
-        .unique()
-        .onDelete('cascade');
-    } else {
-      table.uuid('parent_other_id').unique();
-    }
-  });
-
-  return { CategoryEntity, OtherEntity };
-};
-describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
-  let knexInstance: Knex;
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    knexInstance = Knex({
-      client: 'pg',
-      connection: {
-        user: process.env.PGUSER,
-        password: process.env.PGPASSWORD,
-        host: 'localhost',
-        port: parseInt(process.env.PGPORT!, 10),
-        database: process.env.PGDATABASE,
-      },
-    });
-    redisCacheAdapterContext = {
-      redisClient: new Redis(new URL(process.env.REDIS_URL!).toString()),
-      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
-    };
-  });
-
-  afterAll(async () => {
-    await knexInstance.destroy();
-    redisCacheAdapterContext.redisClient.disconnect();
-  });
-
-  it.each([
-    EntityEdgeDeletionBehavior.CASCADE_DELETE,
-    EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE,
-    EntityEdgeDeletionBehavior.SET_NULL,
-  ])('behavior: %p', async (edgeDeletionBehavior) => {
-    const { CategoryEntity, OtherEntity } = await makeEntityClasses(
-      knexInstance,
-      edgeDeletionBehavior
-    );
-
-    const viewerContext = new ViewerContext(
-      createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
-    );
-
-    const category1 = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const other1 = await OtherEntity.creator(viewerContext)
-      .setField('parent_category_id', category1.getID())
-      .enforceCreateAsync();
-    await CategoryEntity.updater(category1)
-      .setField('parent_other_id', other1.getID())
-      .enforceUpdateAsync();
-
-    await CategoryEntity.enforceDeleteAsync(category1);
-
-    if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL) {
-      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())
-      ).resolves.toBeNull();
-      await expect(
-        OtherEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(other1.getID())
-      ).resolves.toBeNull();
-    }
-  });
-});
@@ -1,65 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  CacheAdapterFlavor,
-  DatabaseAdapterFlavor,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  EntityEdgeDeletionBehavior,
-  EntityPrivacyPolicy,
-  UUIDField,
-  ViewerContext,
-} from '@expo/entity';
-
-import ParentEntity from './ParentEntity';
-
-interface ChildFields {
-  id: string;
-  parent_id: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<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> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    ChildFields,
-    string,
-    ViewerContext,
-    ChildEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return childEntityCompanion;
-  }
-}
-
-const childEntityConfiguration = new EntityConfiguration<ChildFields>({
-  idField: 'id',
-  tableName: 'children',
-  schema: {
-    id: new UUIDField({
-      columnName: 'id',
-      cache: true,
-    }),
-    parent_id: new UUIDField({
-      columnName: 'parent_id',
-      cache: true,
-      association: {
-        getAssociatedEntityClass: () => ParentEntity,
-        edgeDeletionBehavior: EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE,
-      },
-    }),
-  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-});
-
-const childEntityCompanion = new EntityCompanionDefinition({
-  entityClass: ChildEntity,
-  entityConfiguration: childEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-});
@@ -1,56 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  CacheAdapterFlavor,
-  DatabaseAdapterFlavor,
-  Entity,
-  EntityCompanionDefinition,
-  EntityConfiguration,
-  EntityPrivacyPolicy,
-  UUIDField,
-  ViewerContext,
-} from '@expo/entity';
-
-import ChildEntity from './ChildEntity';
-
-interface ParentFields {
-  id: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<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> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    ParentFields,
-    string,
-    ViewerContext,
-    ParentEntity,
-    TestEntityPrivacyPolicy
-  > {
-    return parentEntityCompanion;
-  }
-}
-
-const parentEntityConfiguration = new EntityConfiguration<ParentFields>({
-  idField: 'id',
-  tableName: 'parents',
-  getInboundEdges: () => [ChildEntity],
-  schema: {
-    id: new UUIDField({
-      columnName: 'id',
-      cache: true,
-    }),
-  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-});
-
-const parentEntityCompanion = new EntityCompanionDefinition({
-  entityClass: ParentEntity,
-  entityConfiguration: parentEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-});
@@ -1,37 +0,0 @@
-import {
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  CacheAdapterFlavor,
-  DatabaseAdapterFlavor,
-} from '@expo/entity';
-import {
-  RedisCacheAdapterContext,
-  RedisCacheAdapterProvider,
-} from '@expo/entity-cache-adapter-redis';
-import {
-  PostgresEntityDatabaseAdapterProvider,
-  PostgresEntityQueryContextProvider,
-} from '@expo/entity-database-adapter-knex';
-import Knex from 'knex';
-
-export const createFullIntegrationTestEntityCompanionProvider = (
-  knex: Knex,
-  redisCacheAdapterContext: RedisCacheAdapterContext,
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    {
-      [DatabaseAdapterFlavor.POSTGRES]: {
-        adapterProvider: new PostgresEntityDatabaseAdapterProvider(),
-        queryContextProvider: new PostgresEntityQueryContextProvider(knex),
-      },
-    },
-    {
-      [CacheAdapterFlavor.REDIS]: {
-        cacheAdapterProvider: new RedisCacheAdapterProvider(redisCacheAdapterContext),
-      },
-    }
-  );
-};
@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "noEmit": true,
-  },
-  "include": ["src"]
-}
@@ -1,140 +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.10.0](https://github.com/expo/entity/compare/v0.9.1...v0.10.0) (2020-11-17)
-
-
-### Bug Fixes
-
-* fix null handling in load paths (try 2) ([#96](https://github.com/expo/entity/issues/96)) ([d960329](https://github.com/expo/entity/commit/d9603298e0cc5c3c2b0cca959876e9195555fb57))
-
-
-
-
-
-## [0.9.1](https://github.com/expo/entity/compare/v0.9.0...v0.9.1) (2020-11-06)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure again ([#93](https://github.com/expo/entity/issues/93)) ([012c05d](https://github.com/expo/entity/commit/012c05d62d2ecd559eb331c6ca358052bfe66dc8))
-
-
-
-
-
-# [0.9.0](https://github.com/expo/entity/compare/v0.8.1...v0.9.0) (2020-11-05)
-
-
-### Bug Fixes
-
-* edge deletion behavior cyclic import structure ([#89](https://github.com/expo/entity/issues/89)) ([cca8fc1](https://github.com/expo/entity/commit/cca8fc19870057ebc7033081b59fab4a142fbf1a))
-
-
-### Features
-
-* add ability to invalidate an entity manually ([#91](https://github.com/expo/entity/issues/91)) ([d1a6f13](https://github.com/expo/entity/commit/d1a6f1339648942f12b3fb605eb329aefe5cdd63))
-
-
-
-
-
-## [0.8.1](https://github.com/expo/entity/compare/v0.8.0...v0.8.1) (2020-10-09)
-
-**Note:** Version bump only for package @expo/entity
-
-
-
-
-
-# [0.8.0](https://github.com/expo/entity/compare/v0.7.1...v0.8.0) (2020-10-09)
-
-
-### Features
-
-* add entityClassName to metrics adapter events ([#83](https://github.com/expo/entity/issues/83)) ([f4cdc01](https://github.com/expo/entity/commit/f4cdc01c6cb8868c24ce3da2274f0901687e05bd))
-
-
-
-
-
-## [0.7.1](https://github.com/expo/entity/compare/v0.7.0...v0.7.1) (2020-10-01)
-
-
-### Bug Fixes
-
-* correct type of runInTransactionAsync ([#81](https://github.com/expo/entity/issues/81)) ([f98f7d1](https://github.com/expo/entity/commit/f98f7d14b6149a496a7a3e97dd63d89b2842cc26))
-
-
-
-
-
-# [0.7.0](https://github.com/expo/entity/compare/v0.6.0...v0.7.0) (2020-10-01)
-
-
-### Bug Fixes
-
-* fix incorrect loader types for field selecitons ([#72](https://github.com/expo/entity/issues/72)) ([cd2df8d](https://github.com/expo/entity/commit/cd2df8da4b81bcd4769e950d3124c18886df2816))
-* fix index export for EntityMutationTrigger and EntityMutationValidator ([#73](https://github.com/expo/entity/issues/73)) ([7e829f3](https://github.com/expo/entity/commit/7e829f30fde0bd343cb8a584ccda5530cf61ec33))
-* move cache invalidation to after transaction commit ([#77](https://github.com/expo/entity/issues/77)) ([dbc3c81](https://github.com/expo/entity/commit/dbc3c81b359a668b5134189ce6de49b5893bb5e7))
-* upgrade packages ([#78](https://github.com/expo/entity/issues/78)) ([9891e74](https://github.com/expo/entity/commit/9891e7469467a28589f529c8d87b10fc2232d3ff))
-
-
-
-
-
-# [0.6.0](https://github.com/expo/entity/compare/v0.5.2...v0.6.0) (2020-07-23)
-
-
-### Bug Fixes
-
-* ensure transitive deletion triggers are run for CASCADE_DELETE_INVALIDATE_CACHE ([#66](https://github.com/expo/entity/issues/66)) ([5744c51](https://github.com/expo/entity/commit/5744c51e6b3178bd9f229f3f465b683bb4474c8a))
-* separate out EntityMutationValidator ([#68](https://github.com/expo/entity/issues/68)) ([547a1ef](https://github.com/expo/entity/commit/547a1efcecd17cc085702d1a3e9888ce5b644b13))
-* update setField to correct typing ([#62](https://github.com/expo/entity/issues/62)) ([7a77afc](https://github.com/expo/entity/commit/7a77afc83ea732c9b062a5d6865eff9d3131d015))
-
-
-### Features
-
-* entity mutation validators ([#67](https://github.com/expo/entity/issues/67)) ([fc4377d](https://github.com/expo/entity/commit/fc4377d8839da07417b88afc138f73556383d896))
-* mutation triggers ([#65](https://github.com/expo/entity/issues/65)) ([fd6060c](https://github.com/expo/entity/commit/fd6060cc844f60635b3ce4c400c4877f2df8fa44))
-
-
-
-
-
-## [0.5.2](https://github.com/expo/entity/compare/v0.5.1...v0.5.2) (2020-07-02)
-
-
-### Bug Fixes
-
-* fix stub cache key generation for global cache ([#59](https://github.com/expo/entity/issues/59)) ([7c180e8](https://github.com/expo/entity/commit/7c180e84d9a8cdfd9380fac0eab2d02a96ec18f3))
-
-
-
-
-
-## [0.5.1](https://github.com/expo/entity/compare/v0.5.0...v0.5.1) (2020-07-01)
-
-
-### Bug Fixes
-
-* correct some typing issues and exports ([#57](https://github.com/expo/entity/issues/57)) ([e91cfba](https://github.com/expo/entity/commit/e91cfba99321c2c4da2078aafd8627cbf0ceca50))
-
-
-
-
-
-# 0.5.0 (2020-07-01)
-
-
-### Bug Fixes
-
-* support number ID field generation in StubDatabaseAdapter ([#43](https://github.com/expo/entity/issues/43)) ([60cc0fb](https://github.com/expo/entity/commit/60cc0fbda460c3ada1f5244a2780f90382fe3ebd))
-
-
-### Features
-
-* add two fan out methods to association loader ([#52](https://github.com/expo/entity/issues/52)) ([89cfb3d](https://github.com/expo/entity/commit/89cfb3d5a01d4da90f64acc52ae1b839ba348a35))
-* support entity fields subset of db fields ([#49](https://github.com/expo/entity/issues/49)) ([4e40b2e](https://github.com/expo/entity/commit/4e40b2e521407e521d236978ec3b3b56db3990be))
@@ -1,6 +1,6 @@
 {
  "name": "@expo/entity",
-  "version": "0.10.0",
+  "version": "0.4.0",
  "description": "A privacy-first data model",
  "files": [
    "build",
@@ -12,13 +12,13 @@
    "tsc": "tsc",
    "clean": "rm -rf build coverage coverage-integration",
    "lint": "eslint src --ext '.ts'",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js",
+    "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",
+    "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"
+    "node": ">=8"
  },
  "keywords": [
    "entity"
@@ -26,10 +26,11 @@
  "author": "Expo",
  "license": "MIT",
  "dependencies": {
-    "@expo/results": "^1.0.0",
+    "@expo/results": "^0.3.0",
    "dataloader": "^2.0.0",
    "es6-error": "^4.1.1",
    "invariant": "^2.2.4",
-    "uuid": "^8.3.0"
+    "lodash": "^4.17.15",
+    "uuid": "^7.0.3"
  }
 }
@@ -13,15 +13,8 @@ export default class EnforcingEntityLoader<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    private readonly entityLoader: EntityLoader<
@@ -29,8 +22,7 @@ export default class EnforcingEntityLoader<
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >
  ) {}

@@ -38,7 +30,7 @@ export default class EnforcingEntityLoader<
   * Enforcing version of entity loader method by the same name.
   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
   */
-  async loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadManyByFieldEqualingManyAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly TEntity[]>> {
@@ -55,7 +47,7 @@ export default class EnforcingEntityLoader<
   * Enforcing version of entity loader method by the same name.
   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
   */
-  async loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadManyByFieldEqualingAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValue: NonNullable<TFields[N]>
  ): Promise<readonly TEntity[]> {
@@ -71,7 +63,7 @@ export default class EnforcingEntityLoader<
   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view the returned entity
   * @throws when multiple entities are found matching the condition
   */
-  async loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadByFieldEqualingAsync<N extends keyof TFields>(
    uniqueFieldName: N,
    fieldValue: NonNullable<TFields[N]>
  ): Promise<TEntity | null> {
@@ -114,7 +106,7 @@ export default class EnforcingEntityLoader<
   * Enforcing version of entity loader method by the same name.
   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
   */
-  async loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadManyByFieldEqualityConjunctionAsync<N extends keyof TFields>(
    fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
  ): Promise<readonly TEntity[]> {
@@ -28,9 +28,8 @@ import ViewerContext from './ViewerContext';
 export default abstract class Entity<
  TFields,
  TID,
-  TViewerContext extends ViewerContext,
-  TSelectedFields extends keyof TFields = keyof TFields
-> extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields> {
+  TViewerContext extends ViewerContext
+> extends ReadonlyEntity<TFields, TID, TViewerContext> {
  /**
   * Vend mutator for creating a new entity in given query context.
   * @param viewerContext - viewer context of creating user
@@ -42,30 +41,16 @@ export default abstract class Entity<
    TMID,
    TMViewerContext extends ViewerContext,
    TMViewerContext2 extends TMViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends Entity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    viewerContext: TMViewerContext2,
    queryContext: EntityQueryContext = viewerContext
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
-  ): CreateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
+      .getRegularEntityQueryContext()
+  ): CreateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy> {
    return viewerContext
      .getViewerScopedEntityCompanionForClass(this)
      .getMutatorFactory()
@@ -82,31 +67,17 @@ export default abstract class Entity<
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends Entity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    existingEntity: TMEntity,
    queryContext: EntityQueryContext = existingEntity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
-  ): UpdateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
+      .getRegularEntityQueryContext()
+  ): UpdateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy> {
    return existingEntity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(this)
@@ -123,30 +94,16 @@ export default abstract class Entity<
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends Entity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    existingEntity: TMEntity,
    queryContext: EntityQueryContext = existingEntity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
+      .getRegularEntityQueryContext()
  ): Promise<Result<void>> {
    return existingEntity
      .getViewerContext()
@@ -165,30 +122,16 @@ export default abstract class Entity<
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends Entity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    existingEntity: TMEntity,
    queryContext: EntityQueryContext = existingEntity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
+      .getRegularEntityQueryContext()
  ): Promise<void> {
    return existingEntity
      .getViewerContext()
@@ -218,30 +161,16 @@ export default abstract class Entity<
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends Entity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    existingEntity: TMEntity,
    queryContext: EntityQueryContext = existingEntity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
+      .getRegularEntityQueryContext()
  ): Promise<boolean> {
    const privacyPolicy = new (this.getCompanionDefinition().privacyPolicyClass)();
    const evaluationResult = await asyncResult(
@@ -267,30 +196,16 @@ export default abstract class Entity<
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends Entity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    existingEntity: TMEntity,
    queryContext: EntityQueryContext = existingEntity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
+      .getRegularEntityQueryContext()
  ): Promise<boolean> {
    const privacyPolicy = new (this.getCompanionDefinition().privacyPolicyClass)();
    const evaluationResult = await asyncResult(
@@ -311,15 +226,8 @@ export interface IEntityClass<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  new (viewerContext: TViewerContext, obj: Readonly<TFields>): TEntity;
  getCompanionDefinition(): EntityCompanionDefinition<
@@ -327,7 +235,6 @@ export interface IEntityClass<
    TID,
    TViewerContext,
    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
+    TPrivacyPolicy
  >;
 }
@@ -10,8 +10,7 @@ export default class EntityAssociationLoader<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
 > {
  constructor(private readonly entity: TEntity) {}

@@ -23,111 +22,37 @@ export default class EntityAssociationLoader<
   * @param queryContext - query context in which to perform the load
   */
  async loadAssociatedEntityAsync<
-    TIdentifyingField extends keyof Pick<TFields, TSelectedFields>,
    TAssociatedFields,
    TAssociatedID,
-    TAssociatedEntity extends ReadonlyEntity<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedSelectedFields
-    >,
+    TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext>,
    TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<
      TAssociatedFields,
      TAssociatedID,
      TViewerContext,
-      TAssociatedEntity,
-      TAssociatedSelectedFields
-    >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+      TAssociatedEntity
+    >
  >(
-    fieldIdentifyingAssociatedEntity: TIdentifyingField,
+    fieldIdentifyingAssociatedEntity: keyof TFields,
    associatedEntityClass: IEntityClass<
      TAssociatedFields,
      TAssociatedID,
      TViewerContext,
      TAssociatedEntity,
-      TAssociatedPrivacyPolicy,
-      TAssociatedSelectedFields
+      TAssociatedPrivacyPolicy
    >,
    queryContext: EntityQueryContext = this.entity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
      .getQueryContextProvider()
-      .getQueryContext()
-  ): Promise<
-    Result<null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity>
-  > {
+      .getRegularEntityQueryContext()
+  ): Promise<Result<TAssociatedEntity>> {
    const associatedEntityID = this.entity.getField(fieldIdentifyingAssociatedEntity);
-    if (!associatedEntityID) {
-      return result(null) as Result<
-        null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity
-      >;
-    }
-
    const loader = this.entity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
      .getLoaderFactory()
      .forLoad(queryContext);
-
-    return (await loader.loadByIDAsync((associatedEntityID as unknown) as TAssociatedID)) as Result<
-      null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity
-    >;
-  }
-
-  /**
-   * Load many entities associated with this entity, often referred to as entites belonging
-   * to this entity. In a relational database, the field in the foreign entity is a
-   * foreign key to the ID of this entity. Also commonly referred to as a has many relationship,
-   * where this entity has many associated entities.
-   * @param associatedEntityClass - class of the associated entities
-   * @param associatedEntityFieldContainingThisID - field of associated entity which contains the ID of this entity
-   * @param queryContext - query context in which to perform the load
-   */
-  async loadManyAssociatedEntitiesAsync<
-    TAssociatedFields,
-    TAssociatedID,
-    TAssociatedEntity extends ReadonlyEntity<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedSelectedFields
-    >,
-    TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedEntity,
-      TAssociatedSelectedFields
-    >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
-  >(
-    associatedEntityClass: IEntityClass<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedEntity,
-      TAssociatedPrivacyPolicy,
-      TAssociatedSelectedFields
-    >,
-    associatedEntityFieldContainingThisID: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>,
-    queryContext: EntityQueryContext = this.entity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-      .getQueryContextProvider()
-      .getQueryContext()
-  ): Promise<readonly Result<TAssociatedEntity>[]> {
-    const thisID = this.entity.getID();
-    const loader = this.entity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-      .getLoaderFactory()
-      .forLoad(queryContext);
-    return await loader.loadManyByFieldEqualingAsync(
-      associatedEntityFieldContainingThisID,
-      thisID as any
-    );
+    return await loader.loadByIDAsync((associatedEntityID as unknown) as TAssociatedID);
  }

  /**
@@ -141,41 +66,30 @@ export default class EntityAssociationLoader<
  async loadAssociatedEntityByFieldEqualingAsync<
    TAssociatedFields,
    TAssociatedID,
-    TAssociatedEntity extends ReadonlyEntity<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedSelectedFields
-    >,
+    TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext>,
    TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<
      TAssociatedFields,
      TAssociatedID,
      TViewerContext,
-      TAssociatedEntity,
-      TAssociatedSelectedFields
-    >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+      TAssociatedEntity
+    >
  >(
-    fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>,
+    fieldIdentifyingAssociatedEntity: keyof TFields,
    associatedEntityClass: IEntityClass<
      TAssociatedFields,
      TAssociatedID,
      TViewerContext,
      TAssociatedEntity,
-      TAssociatedPrivacyPolicy,
-      TAssociatedSelectedFields
+      TAssociatedPrivacyPolicy
    >,
-    associatedEntityLookupByField: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>,
+    associatedEntityLookupByField: keyof TAssociatedFields,
    queryContext: EntityQueryContext = this.entity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
      .getQueryContextProvider()
-      .getQueryContext()
+      .getRegularEntityQueryContext()
  ): Promise<Result<TAssociatedEntity> | null> {
    const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
-    if (!associatedFieldValue) {
-      return null;
-    }
    const loader = this.entity
      .getViewerContext()
      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
@@ -187,64 +101,6 @@ export default class EntityAssociationLoader<
    );
  }

-  /**
-   * Load many associated entities identified by a field value of this entity. In a relational database,
-   * the field in this entity refers to a field of the associated entity.
-   * @param fieldIdentifyingAssociatedEntity - field of this entity containing the value with which to look up associated entities
-   * @param associatedEntityClass - class of the associated entities
-   * @param associatedEntityLookupByField - field of associated entities with which to look up the associated entities
-   * @param queryContext - query context in which to perform the load
-   */
-  async loadManyAssociatedEntitiesByFieldEqualingAsync<
-    TAssociatedFields,
-    TAssociatedID,
-    TAssociatedEntity extends ReadonlyEntity<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedSelectedFields
-    >,
-    TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedEntity,
-      TAssociatedSelectedFields
-    >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
-  >(
-    fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>,
-    associatedEntityClass: IEntityClass<
-      TAssociatedFields,
-      TAssociatedID,
-      TViewerContext,
-      TAssociatedEntity,
-      TAssociatedPrivacyPolicy,
-      TAssociatedSelectedFields
-    >,
-    associatedEntityLookupByField: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>,
-    queryContext: EntityQueryContext = this.entity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-      .getQueryContextProvider()
-      .getQueryContext()
-  ): Promise<readonly Result<TAssociatedEntity>[]> {
-    const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
-    if (!associatedFieldValue) {
-      return [];
-    }
-
-    const loader = this.entity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
-      .getLoaderFactory()
-      .forLoad(queryContext);
-    return await loader.loadManyByFieldEqualingAsync(
-      associatedEntityLookupByField,
-      associatedFieldValue as any
-    );
-  }
-
  /**
   * Load an associated entity by folding a sequence of {@link EntityLoadThroughDirective}. At each
   * fold step, load an associated entity identified by a field value of the current fold value.
@@ -252,29 +108,15 @@ export default class EntityAssociationLoader<
   * @param queryContext - query context in which to perform the loads
   */
  async loadAssociatedEntityThroughAsync<
+    TEntityRoot extends ReadonlyEntity<TFields, TID, TViewerContext>,
+    TPrivacyPolicyRoot extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntityRoot>,
    TFields2,
    TID2,
-    TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext, TSelectedFields2>,
-    TPrivacyPolicy2 extends EntityPrivacyPolicy<
-      TFields2,
-      TID2,
-      TViewerContext,
-      TEntity2,
-      TSelectedFields2
-    >,
-    TSelectedFields2 extends keyof TFields2 = keyof TFields2
+    TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext>,
+    TPrivacyPolicy2 extends EntityPrivacyPolicy<TFields2, TID2, TViewerContext, TEntity2>
  >(
    loadDirectives: [
-      EntityLoadThroughDirective<
-        TViewerContext,
-        TFields,
-        TFields2,
-        TID2,
-        TEntity2,
-        TPrivacyPolicy2,
-        TSelectedFields,
-        TSelectedFields2
-      >
+      EntityLoadThroughDirective<TViewerContext, TFields, TFields2, TID2, TEntity2, TPrivacyPolicy2>
    ],
    queryContext?: EntityQueryContext
  ): Promise<Result<TEntity2> | null>;
@@ -286,28 +128,16 @@ export default class EntityAssociationLoader<
   * @param queryContext - query context in which to perform the loads
   */
  async loadAssociatedEntityThroughAsync<
+    TEntityRoot extends ReadonlyEntity<TFields, TID, TViewerContext>,
+    TPrivacyPolicyRoot extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntityRoot>,
    TFields2,
    TID2,
-    TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext, TSelectedFields2>,
-    TPrivacyPolicy2 extends EntityPrivacyPolicy<
-      TFields2,
-      TID2,
-      TViewerContext,
-      TEntity2,
-      TSelectedFields2
-    >,
+    TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext>,
+    TPrivacyPolicy2 extends EntityPrivacyPolicy<TFields2, TID2, TViewerContext, TEntity2>,
    TFields3,
    TID3,
-    TEntity3 extends ReadonlyEntity<TFields3, TID3, TViewerContext, TSelectedFields3>,
-    TPrivacyPolicy3 extends EntityPrivacyPolicy<
-      TFields3,
-      TID3,
-      TViewerContext,
-      TEntity3,
-      TSelectedFields3
-    >,
-    TSelectedFields2 extends keyof TFields2 = keyof TFields2,
-    TSelectedFields3 extends keyof TFields3 = keyof TFields3
+    TEntity3 extends ReadonlyEntity<TFields3, TID3, TViewerContext>,
+    TPrivacyPolicy3 extends EntityPrivacyPolicy<TFields3, TID3, TViewerContext, TEntity3>
  >(
    loadDirectives: [
      EntityLoadThroughDirective<
@@ -316,9 +146,7 @@ export default class EntityAssociationLoader<
        TFields2,
        TID2,
        TEntity2,
-        TPrivacyPolicy2,
-        TSelectedFields,
-        TSelectedFields2
+        TPrivacyPolicy2
      >,
      EntityLoadThroughDirective<
        TViewerContext,
@@ -326,9 +154,7 @@ export default class EntityAssociationLoader<
        TFields3,
        TID3,
        TEntity3,
-        TPrivacyPolicy3,
-        TSelectedFields2,
-        TSelectedFields3
+        TPrivacyPolicy3
      >
    ],
    queryContext?: EntityQueryContext
@@ -341,39 +167,20 @@ export default class EntityAssociationLoader<
   * @param queryContext - query context in which to perform the loads
   */
  async loadAssociatedEntityThroughAsync<
+    TEntityRoot extends ReadonlyEntity<TFields, TID, TViewerContext>,
+    TPrivacyPolicyRoot extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntityRoot>,
    TFields2,
    TID2,
-    TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext, TSelectedFields2>,
-    TPrivacyPolicy2 extends EntityPrivacyPolicy<
-      TFields2,
-      TID2,
-      TViewerContext,
-      TEntity2,
-      TSelectedFields2
-    >,
+    TEntity2 extends ReadonlyEntity<TFields2, TID2, TViewerContext>,
+    TPrivacyPolicy2 extends EntityPrivacyPolicy<TFields2, TID2, TViewerContext, TEntity2>,
    TFields3,
    TID3,
-    TEntity3 extends ReadonlyEntity<TFields3, TID3, TViewerContext, TSelectedFields3>,
-    TPrivacyPolicy3 extends EntityPrivacyPolicy<
-      TFields3,
-      TID3,
-      TViewerContext,
-      TEntity3,
-      TSelectedFields3
-    >,
+    TEntity3 extends ReadonlyEntity<TFields3, TID3, TViewerContext>,
+    TPrivacyPolicy3 extends EntityPrivacyPolicy<TFields3, TID3, TViewerContext, TEntity3>,
    TFields4,
    TID4,
-    TEntity4 extends ReadonlyEntity<TFields4, TID4, TViewerContext, TSelectedFields4>,
-    TPrivacyPolicy4 extends EntityPrivacyPolicy<
-      TFields4,
-      TID4,
-      TViewerContext,
-      TEntity4,
-      TSelectedFields4
-    >,
-    TSelectedFields2 extends keyof TFields2 = keyof TFields2,
-    TSelectedFields3 extends keyof TFields3 = keyof TFields3,
-    TSelectedFields4 extends keyof TFields4 = keyof TFields4
+    TEntity4 extends ReadonlyEntity<TFields4, TID4, TViewerContext>,
+    TPrivacyPolicy4 extends EntityPrivacyPolicy<TFields4, TID4, TViewerContext, TEntity4>
  >(
    loadDirective: [
      EntityLoadThroughDirective<
@@ -382,9 +189,7 @@ export default class EntityAssociationLoader<
        TFields2,
        TID2,
        TEntity2,
-        TPrivacyPolicy2,
-        TSelectedFields,
-        TSelectedFields2
+        TPrivacyPolicy2
      >,
      EntityLoadThroughDirective<
        TViewerContext,
@@ -392,9 +197,7 @@ export default class EntityAssociationLoader<
        TFields3,
        TID3,
        TEntity3,
-        TPrivacyPolicy3,
-        TSelectedFields2,
-        TSelectedFields3
+        TPrivacyPolicy3
      >,
      EntityLoadThroughDirective<
        TViewerContext,
@@ -402,9 +205,7 @@ export default class EntityAssociationLoader<
        TFields4,
        TID4,
        TEntity4,
-        TPrivacyPolicy4,
-        TSelectedFields3,
-        TSelectedFields4
+        TPrivacyPolicy4
      >
    ],
    queryContext?: EntityQueryContext
@@ -417,22 +218,22 @@ export default class EntityAssociationLoader<
   * @param queryContext - query context in which to perform the loads
   */
  async loadAssociatedEntityThroughAsync(
-    loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any, any, any>[],
+    loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any>[],
    queryContext?: EntityQueryContext
-  ): Promise<Result<ReadonlyEntity<any, any, any, any>> | null>;
+  ): Promise<Result<ReadonlyEntity<any, any, any>> | null>;

  async loadAssociatedEntityThroughAsync(
-    loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any, any, any>[],
+    loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any>[],
    queryContext?: EntityQueryContext
-  ): Promise<Result<ReadonlyEntity<any, any, any, any>> | null> {
-    let currentEntity: ReadonlyEntity<any, any, any, any> = this.entity;
+  ): Promise<Result<ReadonlyEntity<any, any, any>> | null> {
+    let currentEntity: ReadonlyEntity<any, any, any> = this.entity;
    for (const loadDirective of loadDirectives) {
      const {
        associatedEntityClass,
        fieldIdentifyingAssociatedEntity,
        associatedEntityLookupByField,
      } = loadDirective;
-      let associatedEntityResult: Result<ReadonlyEntity<any, any, any, any>> | null;
+      let associatedEntityResult: Result<ReadonlyEntity<any, any, any>> | null;
      if (associatedEntityLookupByField) {
        associatedEntityResult = await currentEntity
          .associationLoader()
@@ -443,19 +244,13 @@ export default class EntityAssociationLoader<
            queryContext
          );
      } else {
-        const associatedEntityResultLocal = await currentEntity
+        associatedEntityResult = await currentEntity
          .associationLoader()
          .loadAssociatedEntityAsync(
            fieldIdentifyingAssociatedEntity,
            associatedEntityClass,
            queryContext
          );
-
-        if (associatedEntityResultLocal.ok && associatedEntityResultLocal.value === null) {
-          associatedEntityResult = null;
-        } else {
-          associatedEntityResult = associatedEntityResultLocal;
-        }
      }

      if (!associatedEntityResult) {
@@ -479,21 +274,13 @@ export interface EntityLoadThroughDirective<
  TFields,
  TAssociatedFields,
  TAssociatedID,
-  TAssociatedEntity extends ReadonlyEntity<
-    TAssociatedFields,
-    TAssociatedID,
-    TViewerContext,
-    TAssociatedSelectedFields
-  >,
+  TAssociatedEntity extends ReadonlyEntity<TAssociatedFields, TAssociatedID, TViewerContext>,
  TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<
    TAssociatedFields,
    TAssociatedID,
    TViewerContext,
-    TAssociatedEntity,
-    TAssociatedSelectedFields
-  >,
-  TSelectedFields extends keyof TFields = keyof TFields,
-  TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+    TAssociatedEntity
+  >
 > {
  /**
   * Class of entity to load at this step.
@@ -503,18 +290,17 @@ export interface EntityLoadThroughDirective<
    TAssociatedID,
    TViewerContext,
    TAssociatedEntity,
-    TAssociatedPrivacyPolicy,
-    TAssociatedSelectedFields
+    TAssociatedPrivacyPolicy
  >;

  /**
   * Field of the current entity with which to load an instance of associatedEntityClass.
   */
-  fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>;
+  fieldIdentifyingAssociatedEntity: keyof TFields;

  /**
   * Field by which to load the instance of associatedEntityClass. If not provided, the
   * associatedEntityClass instance is fetched by its ID.
   */
-  associatedEntityLookupByField?: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>;
+  associatedEntityLookupByField?: keyof TAssociatedFields;
 }
@@ -1,13 +1,17 @@
 import { IEntityClass } from './Entity';
+import EntityCacheAdapter from './EntityCacheAdapter';
+import EntityConfiguration from './EntityConfiguration';
+import EntityDatabaseAdapter from './EntityDatabaseAdapter';
 import EntityLoaderFactory from './EntityLoaderFactory';
-import EntityMutationTriggerConfiguration from './EntityMutationTriggerConfiguration';
-import EntityMutationValidator from './EntityMutationValidator';
 import EntityMutatorFactory from './EntityMutatorFactory';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import EntityQueryContextProvider from './EntityQueryContextProvider';
+import IEntityCacheAdapterProvider from './IEntityCacheAdapterProvider';
+import IEntityDatabaseAdapterProvider from './IEntityDatabaseAdapterProvider';
+import IEntityQueryContextProvider from './IEntityQueryContextProvider';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
-import EntityTableDataCoordinator from './internal/EntityTableDataCoordinator';
+import EntityDataManager from './internal/EntityDataManager';
+import ReadThroughEntityCache from './internal/ReadThroughEntityCache';
 import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';

 export interface IPrivacyPolicyClass<TPrivacyPolicy> {
@@ -21,112 +25,72 @@ export default class EntityCompanion<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
+  // defined as properties so that they can be accessed from tests
+  private readonly databaseAdapter: EntityDatabaseAdapter<TFields>;
+  private readonly cacheAdapter: EntityCacheAdapter<TFields>;
+
  private readonly entityLoaderFactory: EntityLoaderFactory<
    TFields,
    TID,
    TViewerContext,
    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
+    TPrivacyPolicy
  >;
  private readonly entityMutatorFactory: EntityMutatorFactory<
    TFields,
    TID,
    TViewerContext,
    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
+    TPrivacyPolicy
  >;

  constructor(
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
-    private readonly tableDataCoordinator: EntityTableDataCoordinator<TFields>,
+    entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
+    entityConfiguration: EntityConfiguration<TFields>,
+    databaseAdapterProvider: IEntityDatabaseAdapterProvider,
+    cacheAdapterProvider: IEntityCacheAdapterProvider,
    PrivacyPolicyClass: IPrivacyPolicyClass<TPrivacyPolicy>,
-    mutationValidators: EntityMutationValidator<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >[],
-    mutationTriggers: EntityMutationTriggerConfiguration<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
+    private readonly queryContextProvider: IEntityQueryContextProvider,
+
    metricsAdapter: IEntityMetricsAdapter
  ) {
+    this.databaseAdapter = databaseAdapterProvider.getDatabaseAdapter(entityConfiguration);
+    this.cacheAdapter = cacheAdapterProvider.getCacheAdapter(entityConfiguration);
+    const dataManager = new EntityDataManager(
+      this.databaseAdapter,
+      new ReadThroughEntityCache(entityConfiguration, this.cacheAdapter),
+      queryContextProvider,
+      metricsAdapter
+    );
    const privacyPolicy = new PrivacyPolicyClass();
-    this.entityLoaderFactory = new EntityLoaderFactory<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >(
-      tableDataCoordinator.entityConfiguration.idField as keyof Pick<TFields, TSelectedFields>,
+    this.entityLoaderFactory = new EntityLoaderFactory(
+      entityConfiguration,
      entityClass,
      privacyPolicy,
-      tableDataCoordinator.dataManager
+      dataManager
    );
    this.entityMutatorFactory = new EntityMutatorFactory(
-      tableDataCoordinator.entityConfiguration,
+      entityConfiguration,
      entityClass,
      privacyPolicy,
-      mutationValidators,
-      mutationTriggers,
      this.entityLoaderFactory,
-      tableDataCoordinator.databaseAdapter,
+      this.databaseAdapter,
      metricsAdapter
    );
  }

-  getLoaderFactory(): EntityLoaderFactory<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
-  > {
+  getLoaderFactory(): EntityLoaderFactory<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return this.entityLoaderFactory;
  }

-  getMutatorFactory(): EntityMutatorFactory<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
-  > {
+  getMutatorFactory(): EntityMutatorFactory<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return this.entityMutatorFactory;
  }

-  /**
-   * Get the query context provider for this entity.
-   */
-  getQueryContextProvider(): EntityQueryContextProvider {
-    return this.tableDataCoordinator.getQueryContextProvider();
+  getQueryContextProvider(): IEntityQueryContextProvider {
+    return this.queryContextProvider;
  }
 }
@@ -1,15 +1,12 @@
 import { IEntityClass } from './Entity';
 import EntityCompanion, { IPrivacyPolicyClass } from './EntityCompanion';
 import EntityConfiguration from './EntityConfiguration';
-import EntityMutationTriggerConfiguration from './EntityMutationTriggerConfiguration';
-import EntityMutationValidator from './EntityMutationValidator';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import EntityQueryContextProvider from './EntityQueryContextProvider';
 import IEntityCacheAdapterProvider from './IEntityCacheAdapterProvider';
 import IEntityDatabaseAdapterProvider from './IEntityDatabaseAdapterProvider';
+import IEntityQueryContextProvider from './IEntityQueryContextProvider';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
-import EntityTableDataCoordinator from './internal/EntityTableDataCoordinator';
 import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
 import { computeIfAbsent } from './utils/collections/maps';

@@ -43,7 +40,7 @@ export enum CacheAdapterFlavor {
 */
 export interface DatabaseAdapterFlavorDefinition {
  adapterProvider: IEntityDatabaseAdapterProvider;
-  queryContextProvider: EntityQueryContextProvider;
+  queryContextProvider: IEntityQueryContextProvider;
 }

 /**
@@ -58,87 +55,18 @@ export interface CacheAdapterFlavorDefinition {
 * Definition for constructing a companion for an entity. Defines the core set of objects
 * used to power the entity framework for a particular type of entity.
 */
-export class EntityCompanionDefinition<
+export interface EntityCompanionDefinition<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
-  readonly entityClass: IEntityClass<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
-  >;
-  readonly entityConfiguration: EntityConfiguration<TFields>;
-  readonly privacyPolicyClass: IPrivacyPolicyClass<TPrivacyPolicy>;
-  readonly mutationValidators: EntityMutationValidator<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >[];
-  readonly mutationTriggers: EntityMutationTriggerConfiguration<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >;
-  readonly entitySelectedFields: TSelectedFields[];
-
-  constructor({
-    entityClass,
-    entityConfiguration,
-    privacyPolicyClass,
-    mutationValidators = [],
-    mutationTriggers = {},
-    entitySelectedFields = Array.from(entityConfiguration.schema.keys()) as TSelectedFields[],
-  }: {
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >;
-    entityConfiguration: EntityConfiguration<TFields>;
-    privacyPolicyClass: IPrivacyPolicyClass<TPrivacyPolicy>;
-    mutationValidators?: EntityMutationValidator<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >[];
-    mutationTriggers?: EntityMutationTriggerConfiguration<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >;
-    entitySelectedFields?: TSelectedFields[];
-  }) {
-    this.entityClass = entityClass;
-    this.entityConfiguration = entityConfiguration;
-    this.privacyPolicyClass = privacyPolicyClass;
-    this.mutationValidators = mutationValidators;
-    this.mutationTriggers = mutationTriggers;
-    this.entitySelectedFields = entitySelectedFields;
-  }
+  entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>;
+  entityConfiguration: EntityConfiguration<TFields>;
+  databaseAdaptorFlavor: DatabaseAdapterFlavor;
+  cacheAdaptorFlavor: CacheAdapterFlavor;
+  privacyPolicyClass: IPrivacyPolicyClass<TPrivacyPolicy>;
 }

 /**
@@ -151,13 +79,9 @@ export class EntityCompanionDefinition<
 * {@link EntityCompanion} for each type of {@link Entity}.
 */
 export default class EntityCompanionProvider {
-  private readonly companionMap: Map<
+  private readonly entityCompanionMap: Map<
    string,
-    EntityCompanion<any, any, any, any, any, any>
-  > = new Map();
-  private readonly tableDataCoordinatorMap: Map<
-    string,
-    EntityTableDataCoordinator<any>
+    EntityCompanion<any, any, any, any, any>
  > = new Map();

  /**
@@ -183,68 +107,34 @@ export default class EntityCompanionProvider {
    TFields,
    TID,
    TViewerContext extends ViewerContext,
-    TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-    TPrivacyPolicy extends EntityPrivacyPolicy<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
-    TSelectedFields extends keyof TFields
+    TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+    TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
  >(
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    entityCompanionDefinition: EntityCompanionDefinition<
      TFields,
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >
-  ): EntityCompanion<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    const tableDataCoordinator = this.getTableDataCoordinatorForEntity(
-      entityCompanionDefinition.entityConfiguration,
-      entityClass.name
-    );
-    return computeIfAbsent(this.companionMap, entityClass.name, () => {
+  ): EntityCompanion<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
+    return computeIfAbsent(this.entityCompanionMap, entityClass.name, () => {
+      const entityDatabaseAdapterFlavor = this.databaseAdapterFlavors[
+        entityCompanionDefinition.databaseAdaptorFlavor
+      ];
+      const entityCacheAdapterFlavor = this.cacheAdapterFlavors[
+        entityCompanionDefinition.cacheAdaptorFlavor
+      ];
      return new EntityCompanion(
        entityCompanionDefinition.entityClass,
-        tableDataCoordinator,
+        entityCompanionDefinition.entityConfiguration,
+        entityDatabaseAdapterFlavor.adapterProvider,
+        entityCacheAdapterFlavor.cacheAdapterProvider,
        entityCompanionDefinition.privacyPolicyClass,
-        entityCompanionDefinition.mutationValidators,
-        entityCompanionDefinition.mutationTriggers,
+        entityDatabaseAdapterFlavor.queryContextProvider,
        this.metricsAdapter
      );
    });
  }
-
-  private getTableDataCoordinatorForEntity<TFields>(
-    entityConfiguration: EntityConfiguration<TFields>,
-    entityClassName: string
-  ): EntityTableDataCoordinator<TFields> {
-    return computeIfAbsent(this.tableDataCoordinatorMap, entityConfiguration.tableName, () => {
-      const entityDatabaseAdapterFlavor = this.databaseAdapterFlavors[
-        entityConfiguration.databaseAdapterFlavor
-      ];
-      const entityCacheAdapterFlavor = this.cacheAdapterFlavors[
-        entityConfiguration.cacheAdapterFlavor
-      ];
-      return new EntityTableDataCoordinator(
-        entityConfiguration,
-        entityDatabaseAdapterFlavor.adapterProvider,
-        entityCacheAdapterFlavor.cacheAdapterProvider,
-        entityDatabaseAdapterFlavor.queryContextProvider,
-        this.metricsAdapter,
-        entityClassName
-      );
-    });
-  }
 }
@@ -1,11 +1,9 @@
-import { IEntityClass } from './Entity';
-import { DatabaseAdapterFlavor, CacheAdapterFlavor } from './EntityCompanionProvider';
 import { EntityFieldDefinition } from './EntityFields';
 import { mapMap, invertMap, reduceMap } from './utils/collections/maps';

 /**
 * The data storage configuration for a type of Entity. Contains information relating to IDs,
- * cachable fields, field mappings, and types of cache and database adapter.
+ * cachable fields, and field mappings.
 */
 export default class EntityConfiguration<TFields> {
  readonly idField: keyof TFields;
@@ -13,38 +11,24 @@ export default class EntityConfiguration<TFields> {
  readonly cacheableKeys: ReadonlySet<keyof TFields>;
  readonly cacheKeyVersion: number;

-  readonly getInboundEdges: () => IEntityClass<any, any, any, any, any, any>[];
-  readonly schema: ReadonlyMap<keyof TFields, EntityFieldDefinition>;
+  readonly schema: ReadonlyMap<keyof TFields, EntityFieldDefinition<any>>;
  readonly entityToDBFieldsKeyMapping: ReadonlyMap<keyof TFields, string>;
  readonly dbToEntityFieldsKeyMapping: ReadonlyMap<string, keyof TFields>;

-  readonly databaseAdapterFlavor: DatabaseAdapterFlavor;
-  readonly cacheAdapterFlavor: CacheAdapterFlavor;
-
  constructor({
    idField,
    tableName,
    schema,
-    getInboundEdges = () => [],
    cacheKeyVersion = 0,
-    databaseAdapterFlavor,
-    cacheAdapterFlavor,
  }: {
    idField: keyof TFields;
    tableName: string;
-    schema: Record<keyof TFields, EntityFieldDefinition>;
-    getInboundEdges?: () => IEntityClass<any, any, any, any, any, any>[];
+    schema: Record<keyof TFields, EntityFieldDefinition<any>>;
    cacheKeyVersion?: number;
-    databaseAdapterFlavor: DatabaseAdapterFlavor;
-    cacheAdapterFlavor: CacheAdapterFlavor;
  }) {
    this.idField = idField;
    this.tableName = tableName;
    this.cacheKeyVersion = cacheKeyVersion;
-    this.databaseAdapterFlavor = databaseAdapterFlavor;
-    this.cacheAdapterFlavor = cacheAdapterFlavor;
-
-    this.getInboundEdges = getInboundEdges;

    // external schema is a Record to typecheck that all fields have FieldDefinitions,
    // but internally the most useful representation is a map for lookups
@@ -59,7 +43,7 @@ export default class EntityConfiguration<TFields> {
  }

  private static computeCacheableKeys<TFields>(
-    schema: ReadonlyMap<keyof TFields, EntityFieldDefinition>
+    schema: ReadonlyMap<keyof TFields, EntityFieldDefinition<any>>
  ): ReadonlySet<keyof TFields> {
    return reduceMap(
      schema,
@@ -74,7 +58,7 @@ export default class EntityConfiguration<TFields> {
  }

  private static computeEntityToDBFieldsKeyMapping<TFields>(
-    schema: ReadonlyMap<keyof TFields, EntityFieldDefinition>
+    schema: ReadonlyMap<keyof TFields, EntityFieldDefinition<any>>
  ): ReadonlyMap<keyof TFields, string> {
    return mapMap(schema, (v) => v.columnName);
  }
@@ -348,6 +348,10 @@ export default abstract class EntityDatabaseAdapter<TFields> {
      throw new Error(
        `Excessive deletions from database adapter delete: ${this.entityConfiguration.tableName}(id = ${id})`
      );
+    } else if (numDeleted === 0) {
+      throw new Error(
+        `No deletions from database adapter delete: ${this.entityConfiguration.tableName}(id = ${id})`
+      );
    }
  }

@@ -11,26 +11,12 @@ export class EntityNotFoundError<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  N extends keyof TFields,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>,
+  N extends keyof TFields
 > extends EntityError {
  constructor(
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    fieldName: N,
    fieldValue: TFields[N]
  ) {
@@ -42,8 +28,7 @@ export class EntityNotAuthorizedError<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
 > extends EntityError {
  public readonly entityClassName: string;

@@ -1,92 +1,17 @@
-import { IEntityClass } from './Entity';
-import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
-
-export enum EntityEdgeDeletionBehavior {
+export interface FieldValidator<T> {
  /**
-   * Default. Invalidate the cache for all entities that reference the entity
-   * being deleted through this field, and transitively run deletions on those entities.
-   * This is most useful when the database itself expresses foreign
-   * keys and cascading deletes or set nulls and the entity framework just needs to
-   * be kept consistent with the state of the database.
+   * Validation to apply for this field before an entity is created or updated.
+   * Only applies to fields changed during a mutation; any existing fields will
+   * not be re-validated in order to allow for changing of validator logic.
   */
-  CASCADE_DELETE_INVALIDATE_CACHE,
-
-  /**
-   * Delete all entities that reference the entity being deleted through this field. This is very similar
-   * to SQL `ON DELETE CASCADE` but is done in the Entity framework instead of at the underlying level.
-   * This will also invalidate the cached referencing entities.
-   */
-  CASCADE_DELETE,
-
-  /**
-   * Set this field to null when the referenced entity is deleted. This is very similar
-   * to SQL `ON DELETE SET NULL` but is done in the Entity framework instead of at the underlying level.
-   * This will also invalidate the cached referencing entities.
-   */
-  SET_NULL,
+  write?: (value: T) => Promise<void>;
 }

-export interface EntityAssociationDefinition<
-  TViewerContext extends ViewerContext,
-  TAssociatedFields,
-  TAssociatedID,
-  TAssociatedEntity extends ReadonlyEntity<
-    TAssociatedFields,
-    TAssociatedID,
-    TViewerContext,
-    TAssociatedSelectedFields
-  >,
-  TAssociatedPrivacyPolicy extends EntityPrivacyPolicy<
-    TAssociatedFields,
-    TAssociatedID,
-    TViewerContext,
-    TAssociatedEntity,
-    TAssociatedSelectedFields
-  >,
-  TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
-> {
-  /**
-   * Class of entity on the other end of this edge.
-   */
-  getAssociatedEntityClass: () => IEntityClass<
-    TAssociatedFields,
-    TAssociatedID,
-    TViewerContext,
-    TAssociatedEntity,
-    TAssociatedPrivacyPolicy,
-    TAssociatedSelectedFields
-  >;
-
-  /**
-   * Field by which to load the instance of associatedEntityClass. If not provided, the
-   * associatedEntityClass instance is fetched by its ID.
-   */
-  associatedEntityLookupByField?: keyof TAssociatedFields;
-
-  /**
-   * What action to perform on the current entity when the entity on the referencing end of
-   * this edge is deleted.
-   *
-   * @remarks
-   * The entity framework doesn't prescribe a one-size-fits-all solution for referential
-   * integrity; instead it exposes mechanisms that supports both database foreign key constraints
-   * and implicit entity-specified foreign keys. Choosing which approach to use often depends on
-   * application requirements, and sometimes even a mix-and-match is the right choice.
-   *
-   * - If referential integrity is critical to your application, database foreign key constraints
-   *   combined with {@link EntityEdgeDeletionBehavior.CASACDE_DELETE_INVALIDATE_CACHE} are recommended.
-   * - If the database being used doesn't support foreign keys, then using the entity framework for referential
-   *   integrity is recommended.
-   */
-  edgeDeletionBehavior?: EntityEdgeDeletionBehavior;
-}
-
-export abstract class EntityFieldDefinition {
+export abstract class EntityFieldDefinition<T> {
  readonly columnName: string;
  readonly cache: boolean;
-  readonly association?: EntityAssociationDefinition<any, any, any, any, any, any>;
+  readonly validator: FieldValidator<T>;
+
  /**
   *
   * @param columnName - Column name in the database.
@@ -97,25 +22,27 @@ export abstract class EntityFieldDefinition {
  constructor({
    columnName,
    cache = false,
-    association,
+    validator = {},
  }: {
    columnName: string;
    cache?: boolean;
-    association?: EntityAssociationDefinition<any, any, any, any, any, any>;
+    validator?: FieldValidator<T>;
  }) {
    this.columnName = columnName;
    this.cache = cache;
-    this.association = association;
+    this.validator = validator;
  }
 }

-export class StringField extends EntityFieldDefinition {}
+export class StringField extends EntityFieldDefinition<string> {}
 export class UUIDField extends StringField {}
-export class DateField extends EntityFieldDefinition {}
-export class BooleanField extends EntityFieldDefinition {}
-export class NumberField extends EntityFieldDefinition {}
-export class StringArrayField extends EntityFieldDefinition {}
-export class JSONObjectField extends EntityFieldDefinition {}
-export class EnumField extends EntityFieldDefinition {}
-export class JSONArrayField extends EntityFieldDefinition {}
-export class MaybeJSONArrayField extends EntityFieldDefinition {}
+export class DateField extends EntityFieldDefinition<Date> {}
+export class BooleanField extends EntityFieldDefinition<boolean> {}
+export class NumberField extends EntityFieldDefinition<number> {}
+export class StringArrayField extends EntityFieldDefinition<string[]> {}
+export class JSONObjectField<T extends object> extends EntityFieldDefinition<T> {}
+export class EnumField<T> extends EntityFieldDefinition<T> {}
+export class JSONArrayField<T> extends EntityFieldDefinition<T[]> {}
+export class MaybeJSONArrayField<TArray, TNotArray> extends EntityFieldDefinition<
+  TArray[] | TNotArray
+> {}
@@ -3,6 +3,7 @@ import invariant from 'invariant';

 import EnforcingEntityLoader from './EnforcingEntityLoader';
 import { IEntityClass } from './Entity';
+import EntityConfiguration from './EntityConfiguration';
 import { FieldEqualityCondition, QuerySelectionModifiers } from './EntityDatabaseAdapter';
 import { EntityNotFoundError } from './EntityErrors';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
@@ -20,30 +21,22 @@ export default class EntityLoader<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    private readonly viewerContext: TViewerContext,
    private readonly queryContext: EntityQueryContext,
-    private readonly idField: keyof Pick<TFields, TSelectedFields>,
+    private readonly entityConfiguration: EntityConfiguration<TFields>,
    private readonly entityClass: IEntityClass<
      TFields,
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly privacyPolicy: TPrivacyPolicy,
-    private readonly dataManager: EntityDataManager<TFields>
+    private readonly entityDataManager: EntityDataManager<TFields>
  ) {}

  /**
@@ -51,14 +44,7 @@ export default class EntityLoader<
   * guaranteed to be the values of successful results (or null for some loader methods),
   * and will throw otherwise.
   */
-  enforcing(): EnforcingEntityLoader<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
-  > {
+  enforcing(): EnforcingEntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return new EnforcingEntityLoader(this);
  }

@@ -69,38 +55,30 @@ export default class EntityLoader<
   * @returns map from fieldValue to entity results that match the query for that fieldValue,
   *          where result errors can be UnauthorizedError
   */
-  async loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadManyByFieldEqualingManyAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Result<TEntity>[]>> {
-    const fieldValuesToFieldObjects = await this.dataManager.loadManyByFieldEqualingAsync(
+    const fieldValuesToObjects = await this.entityDataManager.loadManyByFieldEqualingAsync(
      this.queryContext,
      fieldName,
      fieldValues
    );
-    const fieldValuesToUncheckedEntityResults = mapMap(fieldValuesToFieldObjects, (fieldObjects) =>
-      this.tryConstructEntities(fieldObjects)
-    );
+    const fieldValuesToUncheckedEntities = mapMap(fieldValuesToObjects, (v) => {
+      return v.map((obj) => {
+        return new this.entityClass(this.viewerContext, obj);
+      });
+    });

-    return await mapMapAsync(
-      fieldValuesToUncheckedEntityResults,
-      async (uncheckedEntityResults) => {
-        return await Promise.all(
-          uncheckedEntityResults.map(async (uncheckedEntityResult) => {
-            if (!uncheckedEntityResult.ok) {
-              return uncheckedEntityResult;
-            }
-            return await asyncResult(
-              this.privacyPolicy.authorizeReadAsync(
-                this.viewerContext,
-                this.queryContext,
-                uncheckedEntityResult.value
-              )
-            );
-          })
-        );
-      }
-    );
+    return await mapMapAsync(fieldValuesToUncheckedEntities, async (v) => {
+      return await Promise.all(
+        v.map((entity) =>
+          asyncResult(
+            this.privacyPolicy.authorizeReadAsync(this.viewerContext, this.queryContext, entity)
+          )
+        )
+      );
+    });
  }

  /**
@@ -109,7 +87,7 @@ export default class EntityLoader<
   * @param fieldValue - fieldName field value being queried
   * @returns array of entity results that match the query for fieldValue, where result error can be UnauthorizedError
   */
-  async loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadManyByFieldEqualingAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValue: NonNullable<TFields[N]>
  ): Promise<readonly Result<TEntity>[]> {
@@ -129,7 +107,7 @@ export default class EntityLoader<
   * @returns entity result where uniqueFieldName equals fieldValue, or null if no entity matches the condition.
   * @throws when multiple entities match the condition
   */
-  async loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadByFieldEqualingAsync<N extends keyof TFields>(
    uniqueFieldName: N,
    fieldValue: NonNullable<TFields[N]>
  ): Promise<Result<TEntity> | null> {
@@ -150,7 +128,9 @@ export default class EntityLoader<
    const entityResults = await this.loadManyByIDsAsync([id]);
    const entityResult = entityResults.get(id);
    if (entityResult === undefined) {
-      return result(new EntityNotFoundError(this.entityClass, this.idField, id as any));
+      return result(
+        new EntityNotFoundError(this.entityClass, this.entityConfiguration.idField, id as any)
+      );
    }
    return entityResult;
  }
@@ -161,7 +141,7 @@ export default class EntityLoader<
   * @returns entity result for matching ID, or null if no entity exists for ID.
   */
  async loadByIDNullableAsync(id: TID): Promise<Result<TEntity> | null> {
-    return await this.loadByFieldEqualingAsync(this.idField, id as any);
+    return await this.loadByFieldEqualingAsync(this.entityConfiguration.idField, id as any);
  }

  /**
@@ -172,13 +152,16 @@ export default class EntityLoader<
   */
  async loadManyByIDsAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, Result<TEntity>>> {
    const entityResults = ((await this.loadManyByFieldEqualingManyAsync(
-      this.idField,
+      this.entityConfiguration.idField,
      ids as any
    )) as any) as ReadonlyMap<TID, readonly Result<TEntity>[]>;
    return mapMap(entityResults, (entityResultsForId, id) => {
      const entityResult = entityResultsForId[0];
      return (
-        entityResult ?? result(new EntityNotFoundError(this.entityClass, this.idField, id as any))
+        entityResult ??
+        result(
+          new EntityNotFoundError(this.entityClass, this.entityConfiguration.idField, id as any)
+        )
      );
    });
  }
@@ -197,29 +180,25 @@ export default class EntityLoader<
   * @param querySelectionModifiers - limit, offset, and orderBy for the query
   * @returns array of entity results that match the query, where result error can be UnauthorizedError
   */
-  async loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+  async loadManyByFieldEqualityConjunctionAsync<N extends keyof TFields>(
    fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
  ): Promise<readonly Result<TEntity>[]> {
-    const fieldObjects = await this.dataManager.loadManyByFieldEqualityConjunctionAsync(
+    const fieldValuesArray = await this.entityDataManager.loadManyByFieldEqualityConjunctionAsync(
      this.queryContext,
      fieldEqualityOperands,
      querySelectionModifiers
    );
-    const uncheckedEntityResults = this.tryConstructEntities(fieldObjects);
+    const uncheckedEntities = fieldValuesArray.map((obj) => {
+      return new this.entityClass(this.viewerContext, obj);
+    });
+
    return await Promise.all(
-      uncheckedEntityResults.map(async (uncheckedEntityResult) => {
-        if (!uncheckedEntityResult.ok) {
-          return uncheckedEntityResult;
-        }
-        return await asyncResult(
-          this.privacyPolicy.authorizeReadAsync(
-            this.viewerContext,
-            this.queryContext,
-            uncheckedEntityResult.value
-          )
-        );
-      })
+      uncheckedEntities.map(async (entity) =>
+        asyncResult(
+          this.privacyPolicy.authorizeReadAsync(this.viewerContext, this.queryContext, entity)
+        )
+      )
    );
  }

@@ -253,26 +232,22 @@ export default class EntityLoader<
    bindings: any[] | object,
    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
  ): Promise<readonly Result<TEntity>[]> {
-    const fieldObjects = await this.dataManager.loadManyByRawWhereClauseAsync(
+    const fieldValuesArray = await this.entityDataManager.loadManyByRawWhereClauseAsync(
      this.queryContext,
      rawWhereClause,
      bindings,
      querySelectionModifiers
    );
-    const uncheckedEntityResults = this.tryConstructEntities(fieldObjects);
+    const uncheckedEntities = fieldValuesArray.map((obj) => {
+      return new this.entityClass(this.viewerContext, obj);
+    });
+
    return await Promise.all(
-      uncheckedEntityResults.map(async (uncheckedEntityResult) => {
-        if (!uncheckedEntityResult.ok) {
-          return uncheckedEntityResult;
-        }
-        return await asyncResult(
-          this.privacyPolicy.authorizeReadAsync(
-            this.viewerContext,
-            this.queryContext,
-            uncheckedEntityResult.value
-          )
-        );
-      })
+      uncheckedEntities.map(async (entity) =>
+        asyncResult(
+          this.privacyPolicy.authorizeReadAsync(this.viewerContext, this.queryContext, entity)
+        )
+      )
    );
  }

@@ -281,37 +256,6 @@ export default class EntityLoader<
   * @param objectFields - entity data object to be invalidated
   */
  async invalidateFieldsAsync(objectFields: Readonly<TFields>): Promise<void> {
-    await this.dataManager.invalidateObjectFieldsAsync(objectFields);
-  }
-
-  async invalidateFieldsTransactionalAsync(objectFields: Readonly<TFields>): Promise<void> {
-    await this.dataManager.invalidateObjectFieldsTransactionalAsync(
-      this.queryContext,
-      objectFields
-    );
-  }
-
-  /**
-   * Invalidate all caches for an entity. One potential use case would be to keep the entity
-   * framework in sync with changes made to data outside of the framework.
-   * @param entity - entity to be invalidated
-   */
-  async invalidateEntityAsync(entity: TEntity): Promise<void> {
-    await this.invalidateFieldsAsync(entity.getAllDatabaseFields());
-  }
-
-  /**
-   * Wrap entity construction in try/catch and return Results. Used to prevent constructor errors
-   * thrown for one entity instantiation from interfering with other entity instantiatons of the same query.
-   * @param fieldsObjects - array of entity data objects to construct entities
-   */
-  private tryConstructEntities(fieldsObjects: readonly TFields[]): readonly Result<TEntity>[] {
-    return fieldsObjects.map((fieldsObject) => {
-      try {
-        return result(new this.entityClass(this.viewerContext, fieldsObject));
-      } catch (e) {
-        return result(e);
-      }
-    });
+    await this.entityDataManager.invalidateObjectFieldsAsync(objectFields);
  }
 }
@@ -1,4 +1,5 @@
 import { IEntityClass } from './Entity';
+import EntityConfiguration from './EntityConfiguration';
 import EntityLoader from './EntityLoader';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
@@ -13,25 +14,17 @@ export default class EntityLoaderFactory<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
-    private readonly idField: keyof Pick<TFields, TSelectedFields>,
+    private readonly entityConfiguration: EntityConfiguration<TFields>,
    private readonly entityClass: IEntityClass<
      TFields,
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly privacyPolicyClass: TPrivacyPolicy,
    private readonly dataManager: EntityDataManager<TFields>
@@ -45,11 +38,11 @@ export default class EntityLoaderFactory<
  forLoad(
    viewerContext: TViewerContext,
    queryContext: EntityQueryContext
-  ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return new EntityLoader(
      viewerContext,
      queryContext,
-      this.idField,
+      this.entityConfiguration,
      this.entityClass,
      this.privacyPolicyClass,
      this.dataManager
@@ -1,97 +0,0 @@
-import { EntityQueryContext } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
-
-/**
- * Interface to define trigger behavior for entities.
- */
-export default interface EntityMutationTriggerConfiguration<
-  TFields,
-  TID,
-  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> {
-  /**
-   * Trigger set that runs within the transaction but before the entity is created in the database.
-   */
-  beforeCreate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-  /**
-   * Trigger set that runs within the transaction but after the entity is created in the database and cache is invalidated.
-   */
-  afterCreate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-
-  /**
-   * Trigger set that runs within the transaction but before the entity is updated in the database.
-   */
-  beforeUpdate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-  /**
-   * Trigger set that runs within the transaction but after the entity is updated in the database and cache is invalidated.
-   */
-  afterUpdate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-
-  /**
-   * Trigger set that runs within the transaction but before the entity is deleted from the database.
-   */
-  beforeDelete?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-  /**
-   * Trigger set that runs within the transaction but after the entity is deleted from the database and cache is invalidated.
-   */
-  afterDelete?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-
-  /**
-   * Trigger set that runs within the transaction but before the entity is created, updated, or deleted.
-   */
-  beforeAll?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-  /**
-   * Trigger set that runs within the transaction but before the entity is created in, updated in, or deleted from
-   * the database and the cache is invalidated.
-   */
-  afterAll?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
-
-  /**
-   * Trigger set that runs after committing the transaction unless one is supplied
-   * after any mutation (create, update, delete). If the call to the mutation is wrapped in a transaction,
-   * this too will be within the transaction.
-   */
-  afterCommit?: EntityNonTransactionalMutationTrigger<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >[];
-}
-
-/**
- * A trigger is a way to specify entity mutation operation side-effects that run within the
- * same transaction as the mutation itself. The one exception is afterCommit, which will run within
- * the transaction if a transaction is supplied.
- */
-export abstract class EntityMutationTrigger<
-  TFields,
-  TID,
-  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> {
-  abstract async executeAsync(
-    viewerContext: TViewerContext,
-    queryContext: EntityQueryContext,
-    entity: TEntity
-  ): Promise<void>;
-}
-
-/**
- * A non-transactional trigger is like a {@link EntityMutationTrigger} but used for afterCommit triggers
- * since they explicitly occur outside of the transaction.
- */
-export abstract class EntityNonTransactionalMutationTrigger<
-  TFields,
-  TID,
-  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> {
-  abstract async executeAsync(viewerContext: TViewerContext, entity: TEntity): Promise<void>;
-}
@@ -1,21 +0,0 @@
-import { EntityQueryContext } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
-
-/*
- * A validator is a way to specify entity mutation validation that runs within the
- * same transaction as the mutation itself before creating or updating an entity.
- */
-export default abstract class EntityMutationValidator<
-  TFields,
-  TID,
-  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> {
-  abstract async executeAsync(
-    viewerContext: TViewerContext,
-    queryContext: EntityQueryContext,
-    entity: TEntity
-  ): Promise<void>;
-}
@@ -1,37 +1,23 @@
 import { Result, asyncResult, result, enforceAsyncResult } from '@expo/results';
+import invariant from 'invariant';
+import _ from 'lodash';

 import Entity, { IEntityClass } from './Entity';
-import { EntityCompanionDefinition } from './EntityCompanionProvider';
 import EntityConfiguration from './EntityConfiguration';
 import EntityDatabaseAdapter from './EntityDatabaseAdapter';
-import { EntityEdgeDeletionBehavior } from './EntityFields';
 import EntityLoaderFactory from './EntityLoaderFactory';
-import EntityMutationTriggerConfiguration, {
-  EntityMutationTrigger,
-  EntityNonTransactionalMutationTrigger,
-} from './EntityMutationTriggerConfiguration';
-import EntityMutationValidator from './EntityMutationValidator';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import { EntityQueryContext, EntityTransactionalQueryContext } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
+import { EntityQueryContext } from './EntityQueryContext';
 import ViewerContext from './ViewerContext';
 import { timeAndLogMutationEventAsync } from './metrics/EntityMetricsUtils';
 import IEntityMetricsAdapter, { EntityMetricsMutationType } from './metrics/IEntityMetricsAdapter';
-import { mapMapAsync } from './utils/collections/maps';

 abstract class BaseMutator<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends Entity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    protected readonly viewerContext: TViewerContext,
@@ -42,70 +28,37 @@ abstract class BaseMutator<
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    protected readonly privacyPolicy: TPrivacyPolicy,
-    protected readonly mutationValidators: EntityMutationValidator<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >[],
-    protected readonly mutationTriggers: EntityMutationTriggerConfiguration<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
    protected readonly entityLoaderFactory: EntityLoaderFactory<
      TFields,
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    protected readonly databaseAdapter: EntityDatabaseAdapter<TFields>,
    protected readonly metricsAdapter: IEntityMetricsAdapter
  ) {}

-  protected async executeMutationTriggersOrValidatorsAsync(
-    triggersOrValidators:
-      | EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[]
-      | EntityMutationValidator<TFields, TID, TViewerContext, TEntity, TSelectedFields>[]
-      | undefined,
-    queryContext: EntityQueryContext,
-    entity: TEntity
-  ): Promise<void> {
-    if (!triggersOrValidators) {
-      return;
-    }
-    await Promise.all(
-      triggersOrValidators.map((triggerOrValidator) =>
-        triggerOrValidator.executeAsync(this.viewerContext, queryContext, entity)
+  protected async validateFields(fields: Partial<TFields>): Promise<Result<Partial<TFields>>> {
+    const validatorResults = await asyncResult(
+      Promise.all(
+        Object.entries(fields).map(async ([fieldName, fieldValue]) => {
+          const fieldDefinition = this.entityConfiguration.schema.get(fieldName as keyof TFields);
+          invariant(fieldDefinition, `must have field definition for field = ${fieldName}`);
+          const writeValidator = fieldDefinition.validator.write;
+          if (writeValidator) {
+            await writeValidator(fieldValue);
+          }
+        })
      )
    );
-  }
-
-  protected async executeNonTransactionalMutationTriggersOrValidatorsAsync(
-    triggers:
-      | EntityNonTransactionalMutationTrigger<
-          TFields,
-          TID,
-          TViewerContext,
-          TEntity,
-          TSelectedFields
-        >[]
-      | undefined,
-    entity: TEntity
-  ): Promise<void> {
-    if (!triggers) {
-      return;
+    if (!validatorResults.ok) {
+      return result(validatorResults.reason);
    }
-    await Promise.all(triggers.map((trigger) => trigger.executeAsync(this.viewerContext, entity)));
+    return result(fields);
  }
 }

@@ -116,16 +69,9 @@ export class CreateMutator<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
-> extends BaseMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  TEntity extends Entity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
+> extends BaseMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
  private readonly fieldsForEntity: Partial<TFields> = {};

  /**
@@ -133,7 +79,7 @@ export class CreateMutator<
   * @param fieldName - entity field being updated
   * @param value - value for entity field
   */
-  setField<K extends keyof Pick<TFields, TSelectedFields>>(fieldName: K, value: TFields[K]): this {
+  setField<K extends keyof TFields>(fieldName: K, value: TFields[K]): this {
    this.fieldsForEntity[fieldName] = value;
    return this;
  }
@@ -146,9 +92,8 @@ export class CreateMutator<
  async createAsync(): Promise<Result<TEntity>> {
    return await timeAndLogMutationEventAsync(
      this.metricsAdapter,
-      EntityMetricsMutationType.CREATE,
-      this.entityClass.name
-    )(this.createInTransactionAsync());
+      EntityMetricsMutationType.CREATE
+    )(this.createInternalAsync());
  }

  /**
@@ -158,24 +103,21 @@ export class CreateMutator<
    return await enforceAsyncResult(this.createAsync());
  }

-  private async createInTransactionAsync(): Promise<Result<TEntity>> {
-    return await this.queryContext.runInTransactionIfNotInTransactionAsync((innerQueryContext) =>
-      this.createInternalAsync(innerQueryContext)
-    );
-  }
+  private async createInternalAsync(): Promise<Result<TEntity>> {
+    const validatedFieldsResult = await this.validateFields(this.fieldsForEntity);
+    if (!validatedFieldsResult.ok) {
+      return result(validatedFieldsResult.reason);
+    }

-  private async createInternalAsync(
-    queryContext: EntityTransactionalQueryContext
-  ): Promise<Result<TEntity>> {
    const temporaryEntityForPrivacyCheck = new this.entityClass(this.viewerContext, ({
      [this.entityConfiguration.idField]: '00000000-0000-0000-0000-000000000000', // zero UUID
-      ...this.fieldsForEntity,
+      ...validatedFieldsResult.value,
    } as unknown) as TFields);

    const authorizeCreateResult = await asyncResult(
      this.privacyPolicy.authorizeCreateAsync(
        this.viewerContext,
-        queryContext,
+        this.queryContext,
        temporaryEntityForPrivacyCheck
      )
    );
@@ -183,55 +125,16 @@ export class CreateMutator<
      return authorizeCreateResult;
    }

-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationValidators,
-      queryContext,
-      temporaryEntityForPrivacyCheck
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.beforeAll,
-      queryContext,
-      temporaryEntityForPrivacyCheck
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.beforeCreate,
-      queryContext,
-      temporaryEntityForPrivacyCheck
+    const insertResult = await this.databaseAdapter.insertAsync(
+      this.queryContext,
+      validatedFieldsResult.value
    );

-    const insertResult = await this.databaseAdapter.insertAsync(queryContext, this.fieldsForEntity);
-
-    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
-    queryContext.appendPostCommitCallback(
-      entityLoader.invalidateFieldsAsync.bind(entityLoader, insertResult)
-    );
-    await entityLoader.invalidateFieldsTransactionalAsync(insertResult);
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, this.queryContext);
+    await entityLoader.invalidateFieldsAsync(insertResult);

    const unauthorizedEntityAfterInsert = new this.entityClass(this.viewerContext, insertResult);
-    const newEntity = await entityLoader
-      .enforcing()
-      .loadByIDAsync(unauthorizedEntityAfterInsert.getID());
-
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.afterCreate,
-      queryContext,
-      newEntity
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.afterAll,
-      queryContext,
-      newEntity
-    );
-
-    queryContext.appendPostCommitCallback(
-      this.executeNonTransactionalMutationTriggersOrValidatorsAsync.bind(
-        this,
-        this.mutationTriggers.afterCommit,
-        newEntity
-      )
-    );
-
-    return result(newEntity);
+    return await entityLoader.loadByIDAsync(unauthorizedEntityAfterInsert.getID());
  }
 }

@@ -242,16 +145,9 @@ export class UpdateMutator<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
-> extends BaseMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  TEntity extends Entity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
+> extends BaseMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
  private readonly originalFieldsForEntity: Readonly<TFields>;
  private readonly fieldsForEntity: TFields;
  private readonly updatedFields: Partial<TFields> = {};
@@ -260,37 +156,9 @@ export class UpdateMutator<
    viewerContext: TViewerContext,
    queryContext: EntityQueryContext,
    entityConfiguration: EntityConfiguration<TFields>,
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    privacyPolicy: TPrivacyPolicy,
-    mutationValidators: EntityMutationValidator<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >[],
-    mutationTriggers: EntityMutationTriggerConfiguration<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
-    entityLoaderFactory: EntityLoaderFactory<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityLoaderFactory: EntityLoaderFactory<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    databaseAdapter: EntityDatabaseAdapter<TFields>,
    metricsAdapter: IEntityMetricsAdapter,
    fieldsForEntity: Readonly<TFields>
@@ -301,14 +169,12 @@ export class UpdateMutator<
      entityConfiguration,
      entityClass,
      privacyPolicy,
-      mutationValidators,
-      mutationTriggers,
      entityLoaderFactory,
      databaseAdapter,
      metricsAdapter
    );
-    this.originalFieldsForEntity = { ...fieldsForEntity };
-    this.fieldsForEntity = { ...fieldsForEntity };
+    this.originalFieldsForEntity = _.cloneDeep(fieldsForEntity);
+    this.fieldsForEntity = _.cloneDeep(fieldsForEntity);
  }

  /**
@@ -316,7 +182,7 @@ export class UpdateMutator<
   * @param fieldName - entity field being updated
   * @param value - value for entity field
   */
-  setField<K extends keyof Pick<TFields, TSelectedFields>>(fieldName: K, value: TFields[K]): this {
+  setField<K extends keyof TFields>(fieldName: K, value: TFields[K]): this {
    this.fieldsForEntity[fieldName] = value;
    this.updatedFields[fieldName] = value;
    return this;
@@ -331,9 +197,8 @@ export class UpdateMutator<
  async updateAsync(): Promise<Result<TEntity>> {
    return await timeAndLogMutationEventAsync(
      this.metricsAdapter,
-      EntityMetricsMutationType.UPDATE,
-      this.entityClass.name
-    )(this.updateInTransactionAsync());
+      EntityMetricsMutationType.UPDATE
+    )(this.updateInternalAsync());
  }

  /**
@@ -343,20 +208,17 @@ export class UpdateMutator<
    return await enforceAsyncResult(this.updateAsync());
  }

-  private async updateInTransactionAsync(): Promise<Result<TEntity>> {
-    return await this.queryContext.runInTransactionIfNotInTransactionAsync((innerQueryContext) =>
-      this.updateInternalAsync(innerQueryContext)
-    );
-  }
+  private async updateInternalAsync(): Promise<Result<TEntity>> {
+    const validatedUpdatedFieldsResult = await this.validateFields(this.updatedFields);
+    if (!validatedUpdatedFieldsResult.ok) {
+      return result(validatedUpdatedFieldsResult.reason);
+    }

-  private async updateInternalAsync(
-    queryContext: EntityTransactionalQueryContext
-  ): Promise<Result<TEntity>> {
    const entityAboutToBeUpdated = new this.entityClass(this.viewerContext, this.fieldsForEntity);
    const authorizeUpdateResult = await asyncResult(
      this.privacyPolicy.authorizeUpdateAsync(
        this.viewerContext,
-        queryContext,
+        this.queryContext,
        entityAboutToBeUpdated
      )
    );
@@ -364,68 +226,20 @@ export class UpdateMutator<
      return authorizeUpdateResult;
    }

-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationValidators,
-      queryContext,
-      entityAboutToBeUpdated
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.beforeAll,
-      queryContext,
-      entityAboutToBeUpdated
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.beforeUpdate,
-      queryContext,
-      entityAboutToBeUpdated
-    );
-
    const updateResult = await this.databaseAdapter.updateAsync(
-      queryContext,
+      this.queryContext,
      this.entityConfiguration.idField,
      entityAboutToBeUpdated.getID(),
-      this.updatedFields
+      validatedUpdatedFieldsResult.value
    );

-    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, this.queryContext);

-    queryContext.appendPostCommitCallback(
-      entityLoader.invalidateFieldsAsync.bind(entityLoader, this.originalFieldsForEntity)
-    );
-    queryContext.appendPostCommitCallback(
-      entityLoader.invalidateFieldsAsync.bind(entityLoader, this.fieldsForEntity)
-    );
-
-    await Promise.all([
-      entityLoader.invalidateFieldsTransactionalAsync(this.originalFieldsForEntity),
-      entityLoader.invalidateFieldsTransactionalAsync(this.fieldsForEntity),
-    ]);
+    await entityLoader.invalidateFieldsAsync(this.originalFieldsForEntity);
+    await entityLoader.invalidateFieldsAsync(this.fieldsForEntity);

    const unauthorizedEntityAfterUpdate = new this.entityClass(this.viewerContext, updateResult);
-    const updatedEntity = await entityLoader
-      .enforcing()
-      .loadByIDAsync(unauthorizedEntityAfterUpdate.getID());
-
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.afterUpdate,
-      queryContext,
-      updatedEntity
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.afterAll,
-      queryContext,
-      updatedEntity
-    );
-
-    queryContext.appendPostCommitCallback(
-      this.executeNonTransactionalMutationTriggersOrValidatorsAsync.bind(
-        this,
-        this.mutationTriggers.afterCommit,
-        updatedEntity
-      )
-    );
-
-    return result(updatedEntity);
+    return await entityLoader.loadByIDAsync(unauthorizedEntityAfterUpdate.getID());
  }
 }

@@ -436,51 +250,16 @@ export class DeleteMutator<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
-> extends BaseMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  TEntity extends Entity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
+> extends BaseMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
  constructor(
    viewerContext: TViewerContext,
    queryContext: EntityQueryContext,
    entityConfiguration: EntityConfiguration<TFields>,
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    privacyPolicy: TPrivacyPolicy,
-    mutationValidators: EntityMutationValidator<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >[],
-    mutationTriggers: EntityMutationTriggerConfiguration<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
-    entityLoaderFactory: EntityLoaderFactory<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityLoaderFactory: EntityLoaderFactory<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    databaseAdapter: EntityDatabaseAdapter<TFields>,
    metricsAdapter: IEntityMetricsAdapter,
    private readonly entity: TEntity
@@ -491,8 +270,6 @@ export class DeleteMutator<
      entityConfiguration,
      entityClass,
      privacyPolicy,
-      mutationValidators,
-      mutationTriggers,
      entityLoaderFactory,
      databaseAdapter,
      metricsAdapter
@@ -506,9 +283,8 @@ export class DeleteMutator<
  async deleteAsync(): Promise<Result<void>> {
    return await timeAndLogMutationEventAsync(
      this.metricsAdapter,
-      EntityMetricsMutationType.DELETE,
-      this.entityClass.name
-    )(this.deleteInTransactionAsync());
+      EntityMetricsMutationType.DELETE
+    )(this.deleteInternalAsync());
  }

  /**
@@ -518,211 +294,21 @@ export class DeleteMutator<
    return await enforceAsyncResult(this.deleteAsync());
  }

-  private async deleteInTransactionAsync(
-    processedEntityIdentifiersFromTransitiveDeletions: Set<string> = new Set(),
-    skipDatabaseDeletion: boolean = false
-  ): Promise<Result<void>> {
-    return await this.queryContext.runInTransactionIfNotInTransactionAsync((innerQueryContext) =>
-      this.deleteInternalAsync(
-        innerQueryContext,
-        processedEntityIdentifiersFromTransitiveDeletions,
-        skipDatabaseDeletion
-      )
-    );
-  }
-
-  private async deleteInternalAsync(
-    queryContext: EntityTransactionalQueryContext,
-    processedEntityIdentifiersFromTransitiveDeletions: Set<string>,
-    skipDatabaseDeletion: boolean
-  ): Promise<Result<void>> {
+  private async deleteInternalAsync(): Promise<Result<void>> {
    const authorizeDeleteResult = await asyncResult(
-      this.privacyPolicy.authorizeDeleteAsync(this.viewerContext, queryContext, this.entity)
+      this.privacyPolicy.authorizeDeleteAsync(this.viewerContext, this.queryContext, this.entity)
    );
    if (!authorizeDeleteResult.ok) {
      return authorizeDeleteResult;
    }

-    await DeleteMutator.processEntityDeletionForInboundEdgesAsync(
-      this.entity,
-      queryContext,
-      processedEntityIdentifiersFromTransitiveDeletions
-    );
+    const id = this.entity.getID();

-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.beforeAll,
-      queryContext,
-      this.entity
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.beforeDelete,
-      queryContext,
-      this.entity
-    );
+    await this.databaseAdapter.deleteAsync(this.queryContext, this.entityConfiguration.idField, id);

-    if (!skipDatabaseDeletion) {
-      await this.databaseAdapter.deleteAsync(
-        queryContext,
-        this.entityConfiguration.idField,
-        this.entity.getID()
-      );
-    }
-
-    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
-    queryContext.appendPostCommitCallback(
-      entityLoader.invalidateFieldsAsync.bind(entityLoader, this.entity.getAllDatabaseFields())
-    );
-    await entityLoader.invalidateFieldsTransactionalAsync(this.entity.getAllDatabaseFields());
-
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.afterDelete,
-      queryContext,
-      this.entity
-    );
-    await this.executeMutationTriggersOrValidatorsAsync(
-      this.mutationTriggers.afterAll,
-      queryContext,
-      this.entity
-    );
-
-    queryContext.appendPostCommitCallback(
-      this.executeNonTransactionalMutationTriggersOrValidatorsAsync.bind(
-        this,
-        this.mutationTriggers.afterCommit,
-        this.entity
-      )
-    );
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, this.queryContext);
+    await entityLoader.invalidateFieldsAsync(this.entity.getAllFields());

    return result();
  }
-
-  /**
-   * Finds all entities referencing the specified entity and either deletes them, nullifies
-   * their references to the specified entity, or invalidates the cache depending on the
-   * {@link OnDeleteBehavior} of the field referencing the specified entity.
-   *
-   * @remarks
-   * This works by doing reverse fan-out queries:
-   * 1. Load all entity configurations of entity types that reference this type of entity
-   * 2. For each entity configuration, find all fields that contain edges to this type of entity
-   * 3. For each edge field, load all entities with an edge from target entity to this entity via that field
-   * 4. Perform desired OnDeleteBehavior for entities
-   *
-   * @param entity - entity to find all references to
-   */
-  private static async processEntityDeletionForInboundEdgesAsync<
-    TMFields,
-    TMID,
-    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMSelectedFields extends keyof TMFields
-  >(
-    entity: TMEntity,
-    queryContext: EntityTransactionalQueryContext,
-    processedEntityIdentifiers: Set<string>
-  ): Promise<void> {
-    // prevent infinite reference cycles by keeping track of entities already processed
-    if (processedEntityIdentifiers.has(entity.getUniqueIdentifier())) {
-      return;
-    }
-    processedEntityIdentifiers.add(entity.getUniqueIdentifier());
-
-    const companionDefinition = (entity.constructor as any).getCompanionDefinition() as EntityCompanionDefinition<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity, TMSelectedFields>,
-      TMSelectedFields
-    >;
-    const entityConfiguration = companionDefinition.entityConfiguration;
-    const inboundEdges = entityConfiguration.getInboundEdges();
-    await Promise.all(
-      inboundEdges.map(async (entityClass) => {
-        return await mapMapAsync(
-          entityClass.getCompanionDefinition().entityConfiguration.schema,
-          async (fieldDefinition, fieldName) => {
-            const association = fieldDefinition.association;
-            if (!association) {
-              return;
-            }
-
-            const associatedConfiguration = association
-              .getAssociatedEntityClass()
-              .getCompanionDefinition().entityConfiguration;
-            if (associatedConfiguration !== entityConfiguration) {
-              return;
-            }
-
-            const associatedEntityLookupByField = association.associatedEntityLookupByField;
-
-            const loaderFactory = entity
-              .getViewerContext()
-              .getViewerScopedEntityCompanionForClass(entityClass)
-              .getLoaderFactory();
-            const mutatorFactory = entity
-              .getViewerContext()
-              .getViewerScopedEntityCompanionForClass(entityClass)
-              .getMutatorFactory();
-
-            let inboundReferenceEntities: readonly ReadonlyEntity<any, any, any, any>[];
-            if (associatedEntityLookupByField) {
-              inboundReferenceEntities = await loaderFactory
-                .forLoad(queryContext)
-                .enforcing()
-                .loadManyByFieldEqualingAsync(
-                  fieldName,
-                  entity.getField(associatedEntityLookupByField as any)
-                );
-            } else {
-              inboundReferenceEntities = await loaderFactory
-                .forLoad(queryContext)
-                .enforcing()
-                .loadManyByFieldEqualingAsync(fieldName, entity.getID());
-            }
-
-            switch (association.edgeDeletionBehavior) {
-              case undefined:
-              case EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE: {
-                await Promise.all(
-                  inboundReferenceEntities.map((inboundReferenceEntity) =>
-                    mutatorFactory
-                      .forDelete(inboundReferenceEntity, queryContext)
-                      .deleteInTransactionAsync(
-                        processedEntityIdentifiers,
-                        /* skipDatabaseDeletion */ true // deletion is handled by DB
-                      )
-                  )
-                );
-                break;
-              }
-              case EntityEdgeDeletionBehavior.SET_NULL: {
-                await Promise.all(
-                  inboundReferenceEntities.map((inboundReferenceEntity) =>
-                    mutatorFactory
-                      .forUpdate(inboundReferenceEntity, queryContext)
-                      .setField(fieldName, null)
-                      .enforceUpdateAsync()
-                  )
-                );
-                break;
-              }
-              case EntityEdgeDeletionBehavior.CASCADE_DELETE: {
-                await Promise.all(
-                  inboundReferenceEntities.map((inboundReferenceEntity) =>
-                    mutatorFactory
-                      .forDelete(inboundReferenceEntity, queryContext)
-                      .deleteInTransactionAsync(
-                        processedEntityIdentifiers,
-                        /* skipDatabaseDeletion */ false
-                      )
-                  )
-                );
-              }
-            }
-          }
-        );
-      })
-    );
-  }
 }
@@ -2,8 +2,6 @@ import Entity, { IEntityClass } from './Entity';
 import EntityConfiguration from './EntityConfiguration';
 import EntityDatabaseAdapter from './EntityDatabaseAdapter';
 import EntityLoaderFactory from './EntityLoaderFactory';
-import EntityMutationTriggerConfiguration from './EntityMutationTriggerConfiguration';
-import EntityMutationValidator from './EntityMutationValidator';
 import { CreateMutator, UpdateMutator, DeleteMutator } from './EntityMutator';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
@@ -17,15 +15,8 @@ export default class EntityMutatorFactory<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends Entity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    private readonly entityConfiguration: EntityConfiguration<TFields>,
@@ -34,31 +25,15 @@ export default class EntityMutatorFactory<
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly privacyPolicy: TPrivacyPolicy,
-    private readonly mutationValidators: EntityMutationValidator<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >[],
-    private readonly mutationTriggers: EntityMutationTriggerConfiguration<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
    private readonly entityLoaderFactory: EntityLoaderFactory<
      TFields,
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly databaseAdapter: EntityDatabaseAdapter<TFields>,
    private readonly metricsAdapter: IEntityMetricsAdapter
@@ -73,15 +48,13 @@ export default class EntityMutatorFactory<
  forCreate(
    viewerContext: TViewerContext,
    queryContext: EntityQueryContext
-  ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return new CreateMutator(
      viewerContext,
      queryContext,
      this.entityConfiguration,
      this.entityClass,
      this.privacyPolicy,
-      this.mutationValidators,
-      this.mutationTriggers,
      this.entityLoaderFactory,
      this.databaseAdapter,
      this.metricsAdapter
@@ -97,19 +70,17 @@ export default class EntityMutatorFactory<
  forUpdate(
    existingEntity: TEntity,
    queryContext: EntityQueryContext
-  ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return new UpdateMutator(
      existingEntity.getViewerContext(),
      queryContext,
      this.entityConfiguration,
      this.entityClass,
      this.privacyPolicy,
-      this.mutationValidators,
-      this.mutationTriggers,
      this.entityLoaderFactory,
      this.databaseAdapter,
      this.metricsAdapter,
-      existingEntity.getAllDatabaseFields()
+      existingEntity.getAllFields()
    );
  }

@@ -121,15 +92,13 @@ export default class EntityMutatorFactory<
  forDelete(
    existingEntity: TEntity,
    queryContext: EntityQueryContext
-  ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return new DeleteMutator(
      existingEntity.getViewerContext(),
      queryContext,
      this.entityConfiguration,
      this.entityClass,
      this.privacyPolicy,
-      this.mutationValidators,
-      this.mutationTriggers,
      this.entityLoaderFactory,
      this.databaseAdapter,
      this.metricsAdapter,
@@ -14,23 +14,18 @@ export type EntityPrivacyPolicyEvaluator<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
 > =
  | {
      mode: EntityPrivacyPolicyEvaluationMode.ENFORCE;
    }
  | {
      mode: EntityPrivacyPolicyEvaluationMode.DRY_RUN;
-      denyHandler: (
-        error: EntityNotAuthorizedError<TFields, TID, TViewerContext, TEntity, TSelectedFields>
-      ) => void;
+      denyHandler: (error: EntityNotAuthorizedError<TFields, TID, TViewerContext, TEntity>) => void;
    }
  | {
      mode: EntityPrivacyPolicyEvaluationMode.ENFORCE_AND_LOG;
-      denyHandler: (
-        error: EntityNotAuthorizedError<TFields, TID, TViewerContext, TEntity, TSelectedFields>
-      ) => void;
+      denyHandler: (error: EntityNotAuthorizedError<TFields, TID, TViewerContext, TEntity>) => void;
    };

 export enum EntityAuthorizationAction {
@@ -65,36 +60,31 @@ export default abstract class EntityPrivacyPolicy<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
 > {
  protected readonly createRules: readonly PrivacyPolicyRule<
    TFields,
    TID,
    TViewerContext,
-    TEntity,
-    TSelectedFields
+    TEntity
  >[] = [];
  protected readonly readRules: readonly PrivacyPolicyRule<
    TFields,
    TID,
    TViewerContext,
-    TEntity,
-    TSelectedFields
+    TEntity
  >[] = [];
  protected readonly updateRules: readonly PrivacyPolicyRule<
    TFields,
    TID,
    TViewerContext,
-    TEntity,
-    TSelectedFields
+    TEntity
  >[] = [];
  protected readonly deleteRules: readonly PrivacyPolicyRule<
    TFields,
    TID,
    TViewerContext,
-    TEntity,
-    TSelectedFields
+    TEntity
  >[] = [];

  /**
@@ -107,7 +97,7 @@ export default abstract class EntityPrivacyPolicy<
   */
  protected getPrivacyPolicyEvaluator(
    _viewerContext: TViewerContext
-  ): EntityPrivacyPolicyEvaluator<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+  ): EntityPrivacyPolicyEvaluator<TFields, TID, TViewerContext, TEntity> {
    return {
      mode: EntityPrivacyPolicyEvaluationMode.ENFORCE,
    };
@@ -202,7 +192,7 @@ export default abstract class EntityPrivacyPolicy<
  }

  private async authorizeForRulesetAsync(
-    ruleset: readonly PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>[],
+    ruleset: readonly PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity>[],
    viewerContext: TViewerContext,
    queryContext: EntityQueryContext,
    entity: TEntity,
@@ -254,7 +244,7 @@ export default abstract class EntityPrivacyPolicy<
  }

  private async authorizeForRulesetInnerAsync(
-    ruleset: readonly PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>[],
+    ruleset: readonly PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity>[],
    viewerContext: TViewerContext,
    queryContext: EntityQueryContext,
    entity: TEntity,
@@ -1,9 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
-
-import EntityQueryContextProvider from './EntityQueryContextProvider';
-
-export type PostCommitCallback = (...args: any) => Promise<any>;
-
 /**
 * Entity framework representation of transactional and non-transactional database
 * query execution units.
@@ -14,58 +8,21 @@ export type PostCommitCallback = (...args: any) => Promise<any>;
 export abstract class EntityQueryContext {
  constructor(private readonly queryInterface: any) {}

-  abstract isInTransaction(): this is EntityTransactionalQueryContext;
+  abstract isInTransaction(): boolean;

  getQueryInterface(): any {
    return this.queryInterface;
  }
-
-  abstract async runInTransactionIfNotInTransactionAsync<T>(
-    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
-  ): Promise<T>;
-}
-
-export class EntityNonTransactionalQueryContext extends EntityQueryContext {
-  constructor(
-    queryInterface: any,
-    private readonly entityQueryContextProvider: EntityQueryContextProvider
-  ) {
-    super(queryInterface);
-  }
-
-  isInTransaction(): this is EntityTransactionalQueryContext {
-    return false;
-  }
-
-  async runInTransactionIfNotInTransactionAsync<T>(
-    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
-  ): Promise<T> {
-    return await this.entityQueryContextProvider.runInTransactionAsync(transactionScope);
-  }
 }

 export class EntityTransactionalQueryContext extends EntityQueryContext {
-  public readonly transactionID = uuidv4();
-
-  private readonly postCommitCallbacks: PostCommitCallback[] = [];
-
-  public appendPostCommitCallback(callback: PostCommitCallback): void {
-    this.postCommitCallbacks.push(callback);
-  }
-
-  public async runPostCommitCallbacksAsync(): Promise<void> {
-    const callbacks = [...this.postCommitCallbacks];
-    this.postCommitCallbacks.length = 0;
-    await Promise.all(callbacks.map((callback) => callback()));
-  }
-
-  isInTransaction(): this is EntityTransactionalQueryContext {
+  isInTransaction(): boolean {
    return true;
  }
+}

-  async runInTransactionIfNotInTransactionAsync<T>(
-    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
-  ): Promise<T> {
-    return await transactionScope(this);
+export class EntityNonTransactionalQueryContext extends EntityQueryContext {
+  isInTransaction(): boolean {
+    return false;
  }
 }
@@ -1,46 +0,0 @@
-import {
-  EntityTransactionalQueryContext,
-  EntityNonTransactionalQueryContext,
-} from './EntityQueryContext';
-
-/**
- * A query context provider vends transactional and non-transactional query contexts.
- */
-export default abstract class EntityQueryContextProvider {
-  /**
-   * Vend a regular (non-transactional) entity query context.
-   */
-  public getQueryContext(): EntityNonTransactionalQueryContext {
-    return new EntityNonTransactionalQueryContext(this.getQueryInterface(), this);
-  }
-
-  /**
-   * Get the query interface for constructing a query context.
-   */
-  protected abstract getQueryInterface(): any;
-
-  /**
-   * Vend a transaction runner for use in {@link runInTransactionAsync}.
-   */
-  protected abstract createTransactionRunner<T>(): (
-    transactionScope: (queryInterface: any) => Promise<T>
-  ) => Promise<T>;
-
-  /**
-   * Start a transaction and execute the provided transaction-scoped closure within the transaction.
-   * @param transactionScope - async callback to execute within the transaction
-   */
-  async runInTransactionAsync<T>(
-    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
-  ): Promise<T> {
-    const [returnedValue, queryContext] = await this.createTransactionRunner<
-      [T, EntityTransactionalQueryContext]
-    >()(async (queryInterface) => {
-      const queryContext = new EntityTransactionalQueryContext(queryInterface);
-      const result = await transactionScope(queryContext);
-      return [result, queryContext];
-    });
-    await queryContext.runPostCommitCallbacksAsync();
-    return returnedValue;
-  }
-}
@@ -0,0 +1,22 @@
+import {
+  EntityNonTransactionalQueryContext,
+  EntityTransactionalQueryContext,
+} from './EntityQueryContext';
+
+/**
+ * A query context provider vends transactional and non-transactional query contexts.
+ */
+export default interface IEntityQueryContextProvider {
+  /**
+   * Vend a regular (non-transactional) entity query context.
+   */
+  getRegularEntityQueryContext(): EntityNonTransactionalQueryContext;
+
+  /**
+   * Start a transaction and execute the provided transaction-scoped closure within the transaction.
+   * @param transactionScope - async callback to execute within the transaction
+   */
+  runInTransactionAsync<T>(
+    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<T>
+  ): Promise<T>;
+}
@@ -2,12 +2,10 @@ import invariant from 'invariant';

 import { IEntityClass } from './Entity';
 import EntityAssociationLoader from './EntityAssociationLoader';
-import { EntityCompanionDefinition } from './EntityCompanionProvider';
 import EntityLoader from './EntityLoader';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext, EntityTransactionalQueryContext } from './EntityQueryContext';
 import ViewerContext from './ViewerContext';
-import { pick } from './entityUtils';

 /**
 * A readonly entity exposes only the read functionality of an Entity. Used as the base
@@ -17,14 +15,8 @@ import { pick } from './entityUtils';
 * - Entities representing SQL views.
 * - Entities representing immutable tables.
 */
-export default abstract class ReadonlyEntity<
-  TFields,
-  TID,
-  TViewerContext extends ViewerContext,
-  TSelectedFields extends keyof TFields = keyof TFields
-> {
+export default abstract class ReadonlyEntity<TFields, TID, TViewerContext extends ViewerContext> {
  private readonly id: TID;
-  private readonly rawFields: Readonly<Pick<TFields, TSelectedFields>>;

  /**
   * Constructs an instance of an Entity.
@@ -35,37 +27,19 @@ export default abstract class ReadonlyEntity<
   */
  constructor(
    private readonly viewerContext: TViewerContext,
-    private readonly databaseFields: Readonly<TFields>
+    private readonly rawFields: Readonly<TFields>
  ) {
-    const companionDefinition = (this
-      .constructor as any).getCompanionDefinition() as EntityCompanionDefinition<
-      TFields,
-      TID,
-      TViewerContext,
-      this,
-      EntityPrivacyPolicy<TFields, TID, TViewerContext, this, TSelectedFields>,
-      TSelectedFields
-    >;
-    const idField = companionDefinition.entityConfiguration.idField as keyof Pick<
-      TFields,
-      TSelectedFields
-    >;
-    const id = databaseFields[idField];
+    const idField = (this.constructor as any).getCompanionDefinition().entityConfiguration
+      .idField as keyof TFields;
+    const id = rawFields[idField];
    invariant(id, 'must provide ID to create an entity');
    this.id = id as any;
-
-    const entitySelectedFields = companionDefinition.entitySelectedFields as (keyof TFields)[];
-    this.rawFields = pick(databaseFields, entitySelectedFields);
  }

  toString(): string {
    return `${this.constructor.name}[${this.getID()}]`;
  }

-  getUniqueIdentifier(): string {
-    return this.toString();
-  }
-
  /**
   * @returns the ViewerContext authorized to read this entity
   */
@@ -83,13 +57,7 @@ export default abstract class ReadonlyEntity<
  /**
   * @returns {@link EntityAssociationLoader} for this entity
   */
-  associationLoader(): EntityAssociationLoader<
-    TFields,
-    TID,
-    TViewerContext,
-    this,
-    TSelectedFields
-  > {
+  associationLoader(): EntityAssociationLoader<TFields, TID, TViewerContext, this> {
    return new EntityAssociationLoader(this);
  }

@@ -98,59 +66,36 @@ export default abstract class ReadonlyEntity<
   * @param fieldName - the field to get
   * @returns the value of the field or undefined if not loaded with that field
   */
-  getField<K extends keyof Pick<TFields, TSelectedFields>>(
-    fieldName: K
-  ): Pick<TFields, TSelectedFields>[K] {
+  getField<K extends keyof TFields>(fieldName: K): TFields[K] {
    return this.rawFields[fieldName];
  }

  /**
   * @returns all underlying fields from this entity's data
   */
-  getAllFields(): Readonly<Pick<TFields, TSelectedFields>> {
+  getAllFields(): Readonly<TFields> {
    return { ...this.rawFields };
  }

-  /**
-   * @returns all underlying fields from this entity's database data
-   */
-  getAllDatabaseFields(): Readonly<TFields> {
-    return { ...this.databaseFields };
-  }
-
  /**
   * Get the regular (non-transactional) query context for this entity.
   * @param viewerContext - viewer context of calling user
   */
-  static getQueryContext<
+  static getRegularEntityQueryContext<
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
    TMViewerContext2 extends TMViewerContext,
-    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    viewerContext: TMViewerContext2
  ): EntityQueryContext {
    return viewerContext
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext();
+      .getRegularEntityQueryContext();
  }

  /**
@@ -164,32 +109,17 @@ export default abstract class ReadonlyEntity<
    TMID,
    TMViewerContext extends ViewerContext,
    TMViewerContext2 extends TMViewerContext,
-    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    viewerContext: TMViewerContext2,
    transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<TResult>
  ): Promise<TResult> {
    return await viewerContext
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
-      .runInTransactionIfNotInTransactionAsync(transactionScope);
+      .runInTransactionAsync(transactionScope);
  }

  /**
@@ -202,30 +132,16 @@ export default abstract class ReadonlyEntity<
    TMID,
    TMViewerContext extends ViewerContext,
    TMViewerContext2 extends TMViewerContext,
-    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
+    this: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>,
    viewerContext: TMViewerContext2,
    queryContext: EntityQueryContext = viewerContext
      .getViewerScopedEntityCompanionForClass(this)
      .getQueryContextProvider()
-      .getQueryContext()
-  ): EntityLoader<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
+      .getRegularEntityQueryContext()
+  ): EntityLoader<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy> {
    return viewerContext
      .getViewerScopedEntityCompanionForClass(this)
      .getLoaderFactory()
@@ -29,32 +29,11 @@ export default class ViewerContext {
    TMFields,
    TMID,
    TMViewerContext extends ViewerContext,
-    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields
+    TMEntity extends ReadonlyEntity<TMFields, TMID, TMViewerContext>,
+    TMPrivacyPolicy extends EntityPrivacyPolicy<TMFields, TMID, TMViewerContext, TMEntity>
  >(
-    entityClass: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >
-  ): ViewerScopedEntityCompanion<
-    TMFields,
-    TMID,
-    TMViewerContext,
-    TMEntity,
-    TMPrivacyPolicy,
-    TMSelectedFields
-  > {
+    entityClass: IEntityClass<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy>
+  ): ViewerScopedEntityCompanion<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy> {
    return this.viewerScopedEntityCompanionProvider.getViewerScopedCompanionForEntity(
      entityClass,
      entityClass.getCompanionDefinition()
@@ -1,6 +1,6 @@
 import EntityCompanion from './EntityCompanion';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
-import EntityQueryContextProvider from './EntityQueryContextProvider';
+import IEntityQueryContextProvider from './IEntityQueryContextProvider';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
 import ViewerScopedEntityLoaderFactory from './ViewerScopedEntityLoaderFactory';
@@ -14,15 +14,8 @@ export default class ViewerScopedEntityCompanion<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    private readonly entityCompanion: EntityCompanion<
@@ -30,8 +23,7 @@ export default class ViewerScopedEntityCompanion<
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly viewerContext: TViewerContext
  ) {}
@@ -44,8 +36,7 @@ export default class ViewerScopedEntityCompanion<
    TID,
    TViewerContext,
    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
+    TPrivacyPolicy
  > {
    return new ViewerScopedEntityLoaderFactory(
      this.entityCompanion.getLoaderFactory(),
@@ -61,8 +52,7 @@ export default class ViewerScopedEntityCompanion<
    TID,
    TViewerContext,
    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
+    TPrivacyPolicy
  > {
    return new ViewerScopedEntityMutatorFactory(
      this.entityCompanion.getMutatorFactory(),
@@ -73,7 +63,7 @@ export default class ViewerScopedEntityCompanion<
  /**
   * Get the query context provider for this entity.
   */
-  getQueryContextProvider(): EntityQueryContextProvider {
+  getQueryContextProvider(): IEntityQueryContextProvider {
    return this.entityCompanion.getQueryContextProvider();
  }
 }
@@ -25,40 +25,18 @@ export default class ViewerScopedEntityCompanionProvider {
    TFields,
    TID,
    TViewerContext extends ViewerContext,
-    TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-    TPrivacyPolicy extends EntityPrivacyPolicy<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TSelectedFields
-    >,
-    TSelectedFields extends keyof TFields
+    TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+    TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
  >(
-    entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
+    entityClass: IEntityClass<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy>,
    entityCompanionDefinition: EntityCompanionDefinition<
      TFields,
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >
-  ): ViewerScopedEntityCompanion<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
-  > {
+  ): ViewerScopedEntityCompanion<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return new ViewerScopedEntityCompanion(
      this.entityCompanionProvider.getCompanionForEntity(entityClass, entityCompanionDefinition),
      this.viewerContext as TViewerContext
@@ -12,15 +12,8 @@ export default class ViewerScopedEntityLoaderFactory<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    private readonly entityLoaderFactory: EntityLoaderFactory<
@@ -28,15 +21,14 @@ export default class ViewerScopedEntityLoaderFactory<
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly viewerContext: TViewerContext
  ) {}

  forLoad(
    queryContext: EntityQueryContext
-  ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
  }
 }
@@ -12,15 +12,8 @@ export default class ViewerScopedEntityMutatorFactory<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<TFields, TID, TViewerContext, TEntity>
 > {
  constructor(
    private readonly entityMutatorFactory: EntityMutatorFactory<
@@ -28,29 +21,28 @@ export default class ViewerScopedEntityMutatorFactory<
      TID,
      TViewerContext,
      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
+      TPrivacyPolicy
    >,
    private readonly viewerContext: TViewerContext
  ) {}

  forCreate(
    queryContext: EntityQueryContext
-  ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return this.entityMutatorFactory.forCreate(this.viewerContext, queryContext);
  }

  forUpdate(
    existingEntity: TEntity,
    queryContext: EntityQueryContext
-  ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return this.entityMutatorFactory.forUpdate(existingEntity, queryContext);
  }

  forDelete(
    existingEntity: TEntity,
    queryContext: EntityQueryContext
-  ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
+  ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy> {
    return this.entityMutatorFactory.forDelete(existingEntity, queryContext);
  }
 }
@@ -7,7 +7,7 @@ import EntityLoader from '../EntityLoader';
 describe(EnforcingEntityLoader, () => {
  describe('loadManyByFieldEqualingManyAsync', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(entityLoaderMock.loadManyByFieldEqualingManyAsync(anything(), anything())).thenResolve(
        new Map(
@@ -24,7 +24,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(entityLoaderMock.loadManyByFieldEqualingManyAsync(anything(), anything())).thenResolve(
        new Map(
@@ -49,7 +49,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadManyByFieldEqualingAsync', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(entityLoaderMock.loadManyByFieldEqualingAsync(anything(), anything())).thenResolve([
        result(rejection),
@@ -62,7 +62,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(entityLoaderMock.loadManyByFieldEqualingAsync(anything(), anything())).thenResolve([
        result(resolved),
@@ -77,7 +77,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadByFieldEqualingAsync', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenResolve(
        result(rejection)
@@ -90,7 +90,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenResolve(
        result(resolved)
@@ -103,7 +103,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns null when result is successful and no entity is found', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = null;
      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenResolve(
        result(resolved)
@@ -116,7 +116,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('throws when multiple matching entities are found', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const multipleEntitiesError = new Error();
      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenReject(
        multipleEntitiesError
@@ -131,7 +131,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadByIDAsync', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(entityLoaderMock.loadByIDAsync(anything())).thenResolve(result(rejection));
      const entityLoader = instance(entityLoaderMock);
@@ -140,7 +140,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(entityLoaderMock.loadByIDAsync(anything())).thenResolve(result(resolved));
      const entityLoader = instance(entityLoaderMock);
@@ -151,7 +151,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadByIDNullableAsync', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(entityLoaderMock.loadByIDNullableAsync(anything())).thenResolve(result(rejection));
      const entityLoader = instance(entityLoaderMock);
@@ -162,7 +162,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(entityLoaderMock.loadByIDNullableAsync(anything())).thenResolve(result(resolved));
      const entityLoader = instance(entityLoaderMock);
@@ -173,7 +173,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns null when non-existent object', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = null;
      when(entityLoaderMock.loadByIDNullableAsync(anything())).thenResolve(result(resolved));
      const entityLoader = instance(entityLoaderMock);
@@ -186,7 +186,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadManyByIDsAsync', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(entityLoaderMock.loadManyByIDsAsync(anything())).thenResolve(
        new Map(
@@ -201,7 +201,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(entityLoaderMock.loadManyByIDsAsync(anything())).thenResolve(
        new Map(
@@ -224,7 +224,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadManyByFieldEqualityConjunction', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(
        entityLoaderMock.loadManyByFieldEqualityConjunctionAsync(anything(), anything())
@@ -237,7 +237,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(
        entityLoaderMock.loadManyByFieldEqualityConjunctionAsync(anything(), anything())
@@ -252,7 +252,7 @@ describe(EnforcingEntityLoader, () => {

  describe('loadManyByRawWhereClause', () => {
    it('throws when result is unsuccessful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const rejection = new Error();
      when(
        entityLoaderMock.loadManyByRawWhereClauseAsync(anything(), anything(), anything())
@@ -265,7 +265,7 @@ describe(EnforcingEntityLoader, () => {
    });

    it('returns value when result is successful', async () => {
-      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
+      const entityLoaderMock = mock<EntityLoader<any, any, any, any, any>>(EntityLoader);
      const resolved = {};
      when(
        entityLoaderMock.loadManyByRawWhereClauseAsync(anything(), anything(), anything())
@@ -283,13 +283,7 @@ describe(EnforcingEntityLoader, () => {
    const loaderProperties = Object.getOwnPropertyNames(EntityLoader.prototype);

    // ensure known differences still exist for sanity check
-    const knownLoaderOnlyDifferences = [
-      'enforcing',
-      'invalidateFieldsAsync',
-      'invalidateEntityAsync',
-      'invalidateFieldsTransactionalAsync',
-      'tryConstructEntities',
-    ];
+    const knownLoaderOnlyDifferences = ['enforcing', 'invalidateFieldsAsync'];
    expect(loaderProperties).toEqual(expect.arrayContaining(knownLoaderOnlyDifferences));

    const loaderPropertiesWithoutKnownDifferences = loaderProperties.filter(
@@ -96,8 +96,6 @@ const testEntityConfiguration = new EntityConfiguration<TestEntityFields>({
      columnName: 'custom_id',
    }),
  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 class SimpleTestDenyUpdateEntityPrivacyPolicy extends EntityPrivacyPolicy<
@@ -136,11 +134,13 @@ class SimpleTestDenyUpdateEntity extends Entity<TestEntityFields, string, Viewer
  }
 }

-const simpleTestDenyUpdateEntityCompanion = new EntityCompanionDefinition({
+const simpleTestDenyUpdateEntityCompanion = {
  entityClass: SimpleTestDenyUpdateEntity,
  entityConfiguration: testEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: SimpleTestDenyUpdateEntityPrivacyPolicy,
-});
+};

 class SimpleTestDenyDeleteEntity extends Entity<TestEntityFields, string, ViewerContext> {
  static getCompanionDefinition(): EntityCompanionDefinition<
@@ -154,8 +154,10 @@ class SimpleTestDenyDeleteEntity extends Entity<TestEntityFields, string, Viewer
  }
 }

-const simpleTestDenyDeleteEntityCompanion = new EntityCompanionDefinition({
+const simpleTestDenyDeleteEntityCompanion = {
  entityClass: SimpleTestDenyDeleteEntity,
  entityConfiguration: testEntityConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: SimpleTestDenyDeleteEntityPrivacyPolicy,
-});
+};
@@ -1,7 +1,6 @@
 import { enforceAsyncResult } from '@expo/results';

 import EntityAssociationLoader from '../EntityAssociationLoader';
-import { enforceResultsAsync } from '../entityUtils';
 import TestEntity from '../testfixtures/TestEntity';
 import TestEntity2 from '../testfixtures/TestEntity2';
 import TestViewerContext from '../testfixtures/TestViewerContext';
@@ -9,7 +8,7 @@ import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUn

 describe(EntityAssociationLoader, () => {
  describe('loadAssociatedEntityAsync', () => {
-    it('loads associated entities by ID and correctly handles a null value', async () => {
+    it('loads associated entities by ID', async () => {
      const companionProvider = createUnitTestEntityCompanionProvider();
      const viewerContext = new TestViewerContext(companionProvider);
      const testOtherEntity = await enforceAsyncResult(
@@ -24,36 +23,11 @@ describe(EntityAssociationLoader, () => {
        testEntity.associationLoader().loadAssociatedEntityAsync('stringField', TestEntity)
      );
      expect(loadedOther.getID()).toEqual(testOtherEntity.getID());
-
-      const loadedOther2 = await enforceAsyncResult(
-        testEntity.associationLoader().loadAssociatedEntityAsync('nullableField', TestEntity)
-      );
-      expect(loadedOther2).toBeNull();
    });
  });

-  describe('loadManyAssociatedEntitiesAsync', () => {
-    it('loads many associated entities referencing this entity', async () => {
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-      const testEntity = await enforceAsyncResult(TestEntity.creator(viewerContext).createAsync());
-      const testOtherEntity1 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).setField('stringField', testEntity.getID()).createAsync()
-      );
-      const testOtherEntity2 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).setField('stringField', testEntity.getID()).createAsync()
-      );
-      const loaded = await enforceResultsAsync(
-        testEntity.associationLoader().loadManyAssociatedEntitiesAsync(TestEntity, 'stringField')
-      );
-      expect(loaded).toHaveLength(2);
-      expect(loaded.find((e) => e.getID() === testOtherEntity1.getID())).not.toBeUndefined();
-      expect(loaded.find((e) => e.getID() === testOtherEntity2.getID())).not.toBeUndefined();
-    });
-  });
-
-  describe('loadAssociatedEntityByFieldEqualingAsync', () => {
-    it('loads associated entity by field equaling', async () => {
+  describe('loadRelatedEntityByFieldEqualingAsync', () => {
+    it('loads associated entities by field equaling', async () => {
      const companionProvider = createUnitTestEntityCompanionProvider();
      const viewerContext = new TestViewerContext(companionProvider);
      const testOtherEntity = await enforceAsyncResult(
@@ -81,60 +55,6 @@ describe(EntityAssociationLoader, () => {
        .loadAssociatedEntityByFieldEqualingAsync('stringField', TestEntity, 'customIdField');
      expect(loadedOtherResult).toBeNull();
    });
-
-    it('returns null when load-by field is null', async () => {
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-      const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).setField('stringField', 'blah').createAsync()
-      );
-      const loadedOtherResult = await testEntity
-        .associationLoader()
-        .loadAssociatedEntityByFieldEqualingAsync('nullableField', TestEntity, 'customIdField');
-      expect(loadedOtherResult).toBeNull();
-    });
-  });
-
-  describe('loadManyAssociatedEntitiesByFieldEqualingAsync', () => {
-    it('loads many associated entities by field equaling', async () => {
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-      const testEntity = await enforceAsyncResult(TestEntity.creator(viewerContext).createAsync());
-      const testOtherEntity1 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).setField('stringField', testEntity.getID()).createAsync()
-      );
-      const testOtherEntity2 = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).setField('stringField', testEntity.getID()).createAsync()
-      );
-      const loaded = await enforceResultsAsync(
-        testEntity
-          .associationLoader()
-          .loadManyAssociatedEntitiesByFieldEqualingAsync(
-            'customIdField',
-            TestEntity,
-            'stringField'
-          )
-      );
-      expect(loaded).toHaveLength(2);
-      expect(loaded.find((e) => e.getID() === testOtherEntity1.getID())).not.toBeUndefined();
-      expect(loaded.find((e) => e.getID() === testOtherEntity2.getID())).not.toBeUndefined();
-    });
-
-    it('returns empty results when field being queried by is null', async () => {
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-      const testEntity = await enforceAsyncResult(TestEntity.creator(viewerContext).createAsync());
-      const loaded = await enforceResultsAsync(
-        testEntity
-          .associationLoader()
-          .loadManyAssociatedEntitiesByFieldEqualingAsync(
-            'nullableField',
-            TestEntity,
-            'stringField'
-          )
-      );
-      expect(loaded).toHaveLength(0);
-    });
  });

  describe('loadAssociatedEntityThroughAsync', () => {
@@ -246,22 +166,5 @@ describe(EntityAssociationLoader, () => {
      ]);
      expect(loaded2Result).toBeNull();
    });
-
-    it('returns null when chain loading by field is null', async () => {
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-
-      const testEntity = await enforceAsyncResult(
-        TestEntity.creator(viewerContext).setField('nullableField', null).createAsync()
-      );
-
-      const loadedResult = await testEntity.associationLoader().loadAssociatedEntityThroughAsync([
-        {
-          associatedEntityClass: TestEntity,
-          fieldIdentifyingAssociatedEntity: 'nullableField',
-        },
-      ]);
-      expect(loadedResult).toBeNull();
-    });
  });
 });
@@ -86,7 +86,7 @@ class BlahEntityPrivacyPolicy extends EntityPrivacyPolicy<
  ];
 }

-const blahCompanion = new EntityCompanionDefinition({
+const blahCompanion = {
  entityClass: BlahEntity,
  entityConfiguration: new EntityConfiguration<BlahFields>({
    idField: 'id',
@@ -100,11 +100,11 @@ const blahCompanion = new EntityCompanionDefinition({
        columnName: 'owner_id',
      }),
    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  }),
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: BlahEntityPrivacyPolicy,
-});
+};

 it('runs through a common workflow', async () => {
  // will be one entity companion provider for each request, so
@@ -1,26 +1,26 @@
-import { instance, mock, when } from 'ts-mockito';
+import { instance, mock } from 'ts-mockito';

 import EntityCompanion from '../EntityCompanion';
 import EntityLoaderFactory from '../EntityLoaderFactory';
 import EntityMutatorFactory from '../EntityMutatorFactory';
-import EntityTableDataCoordinator from '../internal/EntityTableDataCoordinator';
+import IEntityQueryContextProvider from '../IEntityQueryContextProvider';
 import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
 import TestEntity, {
  TestEntityPrivacyPolicy,
  testEntityConfiguration,
 } from '../testfixtures/TestEntity';
+import { NoCacheStubCacheAdapterProvider } from '../utils/testing/StubCacheAdapter';
+import StubDatabaseAdapterProvider from '../utils/testing/StubDatabaseAdapterProvider';

 describe(EntityCompanion, () => {
  it('correctly instantiates mutator and loader factories', () => {
-    const tableDataCoordinatorMock = mock(EntityTableDataCoordinator);
-    when(tableDataCoordinatorMock.entityConfiguration).thenReturn(testEntityConfiguration);
-
    const companion = new EntityCompanion(
      TestEntity,
-      instance(tableDataCoordinatorMock),
+      testEntityConfiguration,
+      new StubDatabaseAdapterProvider(),
+      new NoCacheStubCacheAdapterProvider(),
      TestEntityPrivacyPolicy,
-      [],
-      {},
+      instance(mock<IEntityQueryContextProvider>()),
      instance(mock<IEntityMetricsAdapter>())
    );
    expect(companion.getLoaderFactory()).toBeInstanceOf(EntityLoaderFactory);
@@ -22,8 +22,6 @@ const blahConfiguration = new EntityConfiguration<BlahFields>({
      columnName: 'hello',
    }),
  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 class Blah1Entity extends Entity<BlahFields, string, ViewerContext> {
@@ -63,20 +61,24 @@ class NoOpTest2PrivacyPolicy extends EntityPrivacyPolicy<
  Blah2Entity
 > {}

-const blah1CompanionDefinition = new EntityCompanionDefinition({
+const blah1CompanionDefinition = {
  entityClass: Blah1Entity,
  entityConfiguration: blahConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: NoOpTest1PrivacyPolicy,
-});
+};

-const blah2CompanionDefinition = new EntityCompanionDefinition({
+const blah2CompanionDefinition = {
  entityClass: Blah2Entity,
  entityConfiguration: blahConfiguration,
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: NoOpTest2PrivacyPolicy,
-});
+};

 describe(EntityCompanionProvider, () => {
-  it('returns different instances for different entity types, but share table data coordinators', () => {
+  it('returns different instances for different entity types', () => {
    const entityCompanionProvider = createUnitTestEntityCompanionProvider();
    const companion1 = entityCompanionProvider.getCompanionForEntity(
      Blah1Entity,
@@ -89,6 +91,5 @@ describe(EntityCompanionProvider, () => {
    );

    expect(companion1).not.toEqual(companion2);
-    expect(companion1['tableDataCoordinator']).toEqual(companion2['tableDataCoordinator']);
  });
 });
@@ -1,4 +1,3 @@
-import { DatabaseAdapterFlavor, CacheAdapterFlavor } from '../EntityCompanionProvider';
 import EntityConfiguration from '../EntityConfiguration';
 import { UUIDField, StringField } from '../EntityFields';

@@ -28,15 +27,11 @@ describe(EntityConfiguration, () => {
        columnName: 'unique_but_not_cacheable',
      }),
    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  });

  it('returns correct fields', () => {
    expect(blahEntityConfiguration.idField).toEqual('id');
    expect(blahEntityConfiguration.tableName).toEqual('blah_table');
-    expect(blahEntityConfiguration.databaseAdapterFlavor).toEqual(DatabaseAdapterFlavor.POSTGRES);
-    expect(blahEntityConfiguration.cacheAdapterFlavor).toEqual(CacheAdapterFlavor.REDIS);
  });

  it('filters cacheable fields', () => {
@@ -53,8 +48,6 @@ describe(EntityConfiguration, () => {
            columnName: 'id',
          }),
        },
-        databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-        cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
      });
      expect(entityConfiguration.cacheKeyVersion).toEqual(0);
    });
@@ -68,8 +61,6 @@ describe(EntityConfiguration, () => {
            columnName: 'id',
          }),
        },
-        databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-        cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
        cacheKeyVersion: 100,
      });
      expect(entityConfiguration.cacheKeyVersion).toEqual(100);
@@ -209,6 +209,14 @@ describe(EntityDatabaseAdapter, () => {
  });

  describe('deleteAsync', () => {
+    it('throws when update result count zero', async () => {
+      const queryContext = instance(mock(EntityQueryContext));
+      const adapter = new TestEntityDatabaseAdapter({ deleteCount: 0 });
+      await expect(adapter.deleteAsync(queryContext, 'customIdField', 'wat')).rejects.toThrowError(
+        'No deletions from database adapter delet'
+      );
+    });
+
    it('throws when update result count greater than 1', async () => {
      const queryContext = instance(mock(EntityQueryContext));
      const adapter = new TestEntityDatabaseAdapter({ deleteCount: 2 });
@@ -1,319 +0,0 @@
-import Entity from '../Entity';
-import {
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-  EntityCompanionDefinition,
-} from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
-import { UUIDField, EntityEdgeDeletionBehavior } from '../EntityFields';
-import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
-import { CacheStatus } from '../internal/ReadThroughEntityCache';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-import TestViewerContext from '../testfixtures/TestViewerContext';
-import { InMemoryFullCacheStubCacheAdapter } from '../utils/testing/StubCacheAdapter';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
-
-interface ParentFields {
-  id: string;
-}
-
-interface ChildFields {
-  id: string;
-  parent_id: string;
-}
-
-interface GrandChildFields {
-  id: string;
-  parent_id: string;
-}
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  any,
-  string,
-  TestViewerContext,
-  any,
-  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
-const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
-  class ParentEntity extends Entity<ParentFields, string, TestViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<
-      ParentFields,
-      string,
-      TestViewerContext,
-      ParentEntity,
-      TestEntityPrivacyPolicy
-    > {
-      return parentEntityCompanion;
-    }
-  }
-
-  class ChildEntity extends Entity<ChildFields, string, TestViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<
-      ChildFields,
-      string,
-      TestViewerContext,
-      ChildEntity,
-      TestEntityPrivacyPolicy
-    > {
-      return childEntityCompanion;
-    }
-  }
-
-  class GrandChildEntity extends Entity<GrandChildFields, string, TestViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<
-      GrandChildFields,
-      string,
-      TestViewerContext,
-      GrandChildEntity,
-      TestEntityPrivacyPolicy
-    > {
-      return grandChildEntityCompanion;
-    }
-  }
-
-  const parentEntityConfiguration = new EntityConfiguration<ParentFields>({
-    idField: 'id',
-    tableName: 'parents',
-    getInboundEdges: () => [ChildEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-  });
-
-  const childEntityConfiguration = new EntityConfiguration<ChildFields>({
-    idField: 'id',
-    tableName: 'children',
-    getInboundEdges: () => [GrandChildEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_id: new UUIDField({
-        columnName: 'parent_id',
-        cache: true,
-        association: {
-          getAssociatedEntityClass: () => ParentEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-  });
-
-  const grandChildEntityConfiguration = new EntityConfiguration<GrandChildFields>({
-    idField: 'id',
-    tableName: 'grandchildren',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_id: new UUIDField({
-        columnName: 'parent_id',
-        cache: true,
-        association: {
-          getAssociatedEntityClass: () => ChildEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-  });
-
-  const parentEntityCompanion = new EntityCompanionDefinition({
-    entityClass: ParentEntity,
-    entityConfiguration: parentEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-  });
-
-  const childEntityCompanion = new EntityCompanionDefinition({
-    entityClass: ChildEntity,
-    entityConfiguration: childEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-  });
-
-  const grandChildEntityCompanion = new EntityCompanionDefinition({
-    entityClass: GrandChildEntity,
-    entityConfiguration: grandChildEntityConfiguration,
-    privacyPolicyClass: TestEntityPrivacyPolicy,
-  });
-
-  return {
-    ParentEntity,
-    ChildEntity,
-    GrandChildEntity,
-  };
-};
-
-describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
-  describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
-    it('deletes', async () => {
-      const { ParentEntity, ChildEntity, GrandChildEntity } = makeEntityClasses(
-        EntityEdgeDeletionBehavior.CASCADE_DELETE
-      );
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-
-      const parent = await ParentEntity.creator(viewerContext).enforceCreateAsync();
-      const child = await ChildEntity.creator(viewerContext)
-        .setField('parent_id', parent.getID())
-        .enforceCreateAsync();
-      const grandchild = await GrandChildEntity.creator(viewerContext)
-        .setField('parent_id', child.getID())
-        .enforceCreateAsync();
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
-      ).resolves.not.toBeNull();
-
-      await ParentEntity.enforceDeleteAsync(parent);
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
-      ).resolves.toBeNull();
-      await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
-      ).resolves.toBeNull();
-    });
-  });
-
-  describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
-    it('sets null', async () => {
-      const { ParentEntity, ChildEntity, GrandChildEntity } = makeEntityClasses(
-        EntityEdgeDeletionBehavior.SET_NULL
-      );
-
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-
-      const parent = await ParentEntity.creator(viewerContext).enforceCreateAsync();
-      const child = await ChildEntity.creator(viewerContext)
-        .setField('parent_id', parent.getID())
-        .enforceCreateAsync();
-      const grandchild = await GrandChildEntity.creator(viewerContext)
-        .setField('parent_id', child.getID())
-        .enforceCreateAsync();
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
-      ).resolves.not.toBeNull();
-
-      await ParentEntity.enforceDeleteAsync(parent);
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.toBeNull();
-
-      const loadedChild = await ChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(child.getID());
-      expect(loadedChild.getField('parent_id')).toBeNull();
-
-      const loadedGrandchild = await GrandChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(grandchild.getID());
-      expect(loadedGrandchild.getField('parent_id')).toEqual(loadedChild.getID());
-    });
-  });
-
-  describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
-    it('invalidates the cache', async () => {
-      const { ParentEntity, ChildEntity, GrandChildEntity } = makeEntityClasses(
-        EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE
-      );
-
-      const companionProvider = createUnitTestEntityCompanionProvider();
-      const viewerContext = new TestViewerContext(companionProvider);
-
-      const parent = await ParentEntity.creator(viewerContext).enforceCreateAsync();
-      const child = await ChildEntity.creator(viewerContext)
-        .setField('parent_id', parent.getID())
-        .enforceCreateAsync();
-      const grandchild = await GrandChildEntity.creator(viewerContext)
-        .setField('parent_id', child.getID())
-        .enforceCreateAsync();
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID())
-      ).resolves.not.toBeNull();
-
-      const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
-        'entityCompanion'
-      ]['tableDataCoordinator']['cacheAdapter'] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
-      const childCachedBefore = await childCacheAdapter.loadManyAsync('parent_id', [
-        parent.getID(),
-      ]);
-      expect(childCachedBefore.get(parent.getID())?.status).toEqual(CacheStatus.HIT);
-
-      const grandChildCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
-        GrandChildEntity
-      )['entityCompanion']['tableDataCoordinator'][
-        'cacheAdapter'
-      ] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
-      const grandChildCachedBefore = await grandChildCacheAdapter.loadManyAsync('parent_id', [
-        child.getID(),
-      ]);
-      expect(grandChildCachedBefore.get(child.getID())?.status).toEqual(CacheStatus.HIT);
-
-      await ParentEntity.enforceDeleteAsync(parent);
-
-      const childCachedAfter = await childCacheAdapter.loadManyAsync('parent_id', [parent.getID()]);
-      expect(childCachedAfter.get(parent.getID())?.status).toEqual(CacheStatus.MISS);
-
-      const grandChildCachedAfter = await grandChildCacheAdapter.loadManyAsync('parent_id', [
-        child.getID(),
-      ]);
-      expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.MISS);
-
-      await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
-      ).resolves.toBeNull();
-      await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
-      ).resolves.not.toBeNull();
-      await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
-      ).resolves.not.toBeNull();
-    });
-  });
-});
@@ -1,6 +1,6 @@
 import { EntityFieldDefinition } from '../EntityFields';

-class TestFieldDefinition extends EntityFieldDefinition {}
+class TestFieldDefinition extends EntityFieldDefinition<any> {}

 describe(EntityFieldDefinition, () => {
  it('returns correct column name and defaults cache to false', () => {
@@ -12,4 +12,21 @@ describe(EntityFieldDefinition, () => {
    expect(fieldDefinition2.columnName).toEqual('wat');
    expect(fieldDefinition2.cache).toEqual(true);
  });
+
+  it('defaults validator to no-op', () => {
+    const fieldDefinition = new TestFieldDefinition({ columnName: 'wat', cache: true });
+    expect(fieldDefinition.validator).toEqual({});
+
+    const fn = async (): Promise<void> => {
+      throw new Error();
+    };
+    const fieldDefinition2 = new TestFieldDefinition({
+      columnName: 'wat',
+      cache: true,
+      validator: {
+        write: fn,
+      },
+    });
+    expect(fieldDefinition2.validator.write).toEqual(fn);
+  });
 });
@@ -2,6 +2,7 @@ import { enforceAsyncResult } from '@expo/results';
 import { mock, instance, verify, spy, deepEqual, anyOfClass, anything, when } from 'ts-mockito';

 import EntityLoader from '../EntityLoader';
+import { EntityNonTransactionalQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
 import EntityDataManager from '../internal/EntityDataManager';
@@ -20,7 +21,7 @@ describe(EntityLoader, () => {
  it('loads entities', async () => {
    const dateToInsert = new Date();
    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));

    const databaseAdapter = new StubDatabaseAdapter<TestFields>(
      testEntityConfiguration,
@@ -36,7 +37,6 @@ describe(EntityLoader, () => {
                numberField: 5,
                stringField: 'huh',
                dateField: dateToInsert,
-                nullableField: null,
              },
              {
                customIdField: 'world',
@@ -44,7 +44,6 @@ describe(EntityLoader, () => {
                numberField: 3,
                stringField: 'huh',
                dateField: dateToInsert,
-                nullableField: null,
              },
            ],
          ],
@@ -59,13 +58,12 @@ describe(EntityLoader, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      instance(mock<IEntityMetricsAdapter>()),
-      TestEntity.name
+      instance(mock<IEntityMetricsAdapter>())
    );
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManager
@@ -98,7 +96,7 @@ describe(EntityLoader, () => {
    const privacyPolicy = new TestEntityPrivacyPolicy();
    const spiedPrivacyPolicy = spy(privacyPolicy);
    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));

    const databaseAdapter = new StubDatabaseAdapter<TestFields>(
      testEntityConfiguration,
@@ -114,7 +112,6 @@ describe(EntityLoader, () => {
                numberField: 4,
                testIndexedField: '4',
                dateField: new Date(),
-                nullableField: null,
              },
              {
                customIdField: 'world',
@@ -122,7 +119,6 @@ describe(EntityLoader, () => {
                numberField: 4,
                testIndexedField: '5',
                dateField: new Date(),
-                nullableField: null,
              },
              {
                customIdField: 'blah',
@@ -130,7 +126,6 @@ describe(EntityLoader, () => {
                numberField: 4,
                testIndexedField: '6',
                dateField: new Date(),
-                nullableField: null,
              },
            ],
          ],
@@ -144,13 +139,12 @@ describe(EntityLoader, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      instance(mock<IEntityMetricsAdapter>()),
-      TestEntity.name
+      instance(mock<IEntityMetricsAdapter>())
    );
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManager
@@ -178,7 +172,7 @@ describe(EntityLoader, () => {
    const spiedPrivacyPolicy = spy(privacyPolicy);

    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));

    const databaseAdapter = new StubDatabaseAdapter<TestFields>(
      testEntityConfiguration,
@@ -194,7 +188,6 @@ describe(EntityLoader, () => {
                testIndexedField: '1',
                numberField: 3,
                dateField: new Date(),
-                nullableField: null,
              },
            ],
          ],
@@ -208,13 +201,12 @@ describe(EntityLoader, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      instance(mock<IEntityMetricsAdapter>()),
-      TestEntity.name
+      instance(mock<IEntityMetricsAdapter>())
    );
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManager
@@ -225,7 +217,7 @@ describe(EntityLoader, () => {

  it('invalidates upon invalidate one', async () => {
    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));
    const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
    const dataManagerMock = mock(EntityDataManager);
    const dataManagerInstance = instance(dataManagerMock);
@@ -233,7 +225,7 @@ describe(EntityLoader, () => {
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManagerInstance
@@ -247,7 +239,7 @@ describe(EntityLoader, () => {

  it('invalidates upon invalidate by field', async () => {
    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));
    const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
    const dataManagerMock = mock(EntityDataManager);
    const dataManagerInstance = instance(dataManagerMock);
@@ -255,7 +247,7 @@ describe(EntityLoader, () => {
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManagerInstance
@@ -266,34 +258,9 @@ describe(EntityLoader, () => {
    ).once();
  });

-  it('invalidates upon invalidate by entity', async () => {
-    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
-    const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
-    const dataManagerMock = mock(EntityDataManager);
-    const dataManagerInstance = instance(dataManagerMock);
-
-    const entityMock = mock(TestEntity);
-    when(entityMock.getAllDatabaseFields()).thenReturn({ customIdField: 'hello' } as any);
-    const entityInstance = instance(entityMock);
-
-    const entityLoader = new EntityLoader(
-      viewerContext,
-      queryContext,
-      testEntityConfiguration.idField,
-      TestEntity,
-      privacyPolicy,
-      dataManagerInstance
-    );
-    await entityLoader.invalidateEntityAsync(entityInstance);
-    verify(
-      dataManagerMock.invalidateObjectFieldsAsync(deepEqual({ customIdField: 'hello' }))
-    ).once();
-  });
-
  it('returns error result when not allowed', async () => {
    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));
    const privacyPolicyMock = mock(TestEntityPrivacyPolicy);
    const dataManagerMock = mock(EntityDataManager);

@@ -313,7 +280,7 @@ describe(EntityLoader, () => {
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManagerInstance
@@ -327,7 +294,7 @@ describe(EntityLoader, () => {

  it('throws upon database adapter error', async () => {
    const viewerContext = instance(mock(ViewerContext));
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = instance(mock(EntityNonTransactionalQueryContext));
    const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
    const dataManagerMock = mock(EntityDataManager);

@@ -342,7 +309,7 @@ describe(EntityLoader, () => {
    const entityLoader = new EntityLoader(
      viewerContext,
      queryContext,
-      testEntityConfiguration.idField,
+      testEntityConfiguration,
      TestEntity,
      privacyPolicy,
      dataManagerInstance
@@ -224,7 +224,7 @@ class EmptyPolicy extends EntityPrivacyPolicy<BlahFields, string, ViewerContext,
  protected readonly deleteRules = [];
 }

-const blahEntityCompanionDefinition = new EntityCompanionDefinition({
+const blahEntityCompanionDefinition = {
  entityClass: BlahEntity,
  entityConfiguration: new EntityConfiguration<BlahFields>({
    idField: 'id',
@@ -234,11 +234,11 @@ const blahEntityCompanionDefinition = new EntityCompanionDefinition({
        columnName: 'id',
      }),
    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  }),
+  databaseAdaptorFlavor: DatabaseAdapterFlavor.POSTGRES,
+  cacheAdaptorFlavor: CacheAdapterFlavor.REDIS,
  privacyPolicyClass: AlwaysDenyPolicy,
-});
+};

 describe(EntityPrivacyPolicy, () => {
  it('throws EntityNotAuthorizedError when deny', async () => {
@@ -1,327 +0,0 @@
-import Entity from '../Entity';
-import {
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-  EntityCompanionDefinition,
-} from '../EntityCompanionProvider';
-import EntityConfiguration from '../EntityConfiguration';
-import { UUIDField, EntityEdgeDeletionBehavior } from '../EntityFields';
-import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
-import { CacheStatus } from '../internal/ReadThroughEntityCache';
-import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
-import TestViewerContext from '../testfixtures/TestViewerContext';
-import { InMemoryFullCacheStubCacheAdapter } from '../utils/testing/StubCacheAdapter';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
-
-interface CategoryFields {
-  id: string;
-  parent_category_id: string | null;
-}
-
-class CategoryPrivacyPolicy extends EntityPrivacyPolicy<
-  CategoryFields,
-  string,
-  TestViewerContext,
-  any,
-  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
-const makeEntityClass = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
-  class CategoryEntity extends Entity<CategoryFields, string, TestViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<
-      CategoryFields,
-      string,
-      TestViewerContext,
-      CategoryEntity,
-      CategoryPrivacyPolicy
-    > {
-      return categoryEntityCompanion;
-    }
-  }
-
-  const categoryEntityConfiguration = new EntityConfiguration<CategoryFields>({
-    idField: 'id',
-    tableName: 'categories',
-    getInboundEdges: () => [CategoryEntity],
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-        cache: true,
-      }),
-      parent_category_id: new UUIDField({
-        columnName: 'parent_category_id',
-        cache: true,
-        association: {
-          getAssociatedEntityClass: () => CategoryEntity,
-          edgeDeletionBehavior,
-        },
-      }),
-    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-  });
-
-  const categoryEntityCompanion = new EntityCompanionDefinition({
-    entityClass: CategoryEntity,
-    entityConfiguration: categoryEntityConfiguration,
-    privacyPolicyClass: CategoryPrivacyPolicy,
-  });
-
-  return {
-    CategoryEntity,
-  };
-};
-
-describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
-  it('deletes', async () => {
-    const { CategoryEntity } = makeEntityClass(EntityEdgeDeletionBehavior.CASCADE_DELETE);
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
-
-    const parentCategory = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const subCategory = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', parentCategory.getID())
-      .enforceCreateAsync();
-    const subSubCategory = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', subCategory.getID())
-      .enforceCreateAsync();
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
-    ).resolves.not.toBeNull();
-
-    await CategoryEntity.enforceDeleteAsync(parentCategory);
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
-    ).resolves.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
-    ).resolves.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
-    ).resolves.toBeNull();
-  });
-
-  it('handles cycles', async () => {
-    const { CategoryEntity } = makeEntityClass(EntityEdgeDeletionBehavior.CASCADE_DELETE);
-
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
-
-    const categoryA = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const categoryB = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', categoryA.getID())
-      .enforceCreateAsync();
-    await CategoryEntity.updater(categoryA)
-      .setField('parent_category_id', categoryB.getID())
-      .enforceUpdateAsync();
-
-    await CategoryEntity.enforceDeleteAsync(categoryA);
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryA.getID())
-    ).resolves.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryB.getID())
-    ).resolves.toBeNull();
-  });
-});
-
-describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
-  it('sets null', async () => {
-    const { CategoryEntity } = makeEntityClass(EntityEdgeDeletionBehavior.SET_NULL);
-
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
-
-    const parentCategory = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const subCategory = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', parentCategory.getID())
-      .enforceCreateAsync();
-    const subSubCategory = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', subCategory.getID())
-      .enforceCreateAsync();
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
-    ).resolves.not.toBeNull();
-
-    await CategoryEntity.enforceDeleteAsync(parentCategory);
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
-    ).resolves.toBeNull();
-
-    const loadedSubCategory = await CategoryEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(subCategory.getID());
-    expect(loadedSubCategory.getField('parent_category_id')).toBeNull();
-
-    const loadedSubSubCategory = await CategoryEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(subSubCategory.getID());
-    expect(loadedSubSubCategory.getField('parent_category_id')).not.toBeNull();
-  });
-
-  it('handles cycles', async () => {
-    const { CategoryEntity } = makeEntityClass(EntityEdgeDeletionBehavior.SET_NULL);
-
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
-
-    const categoryA = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const categoryB = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', categoryA.getID())
-      .enforceCreateAsync();
-    await CategoryEntity.updater(categoryA)
-      .setField('parent_category_id', categoryB.getID())
-      .enforceUpdateAsync();
-
-    await CategoryEntity.enforceDeleteAsync(categoryA);
-
-    const loadedCategoryB = await CategoryEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(categoryB.getID());
-    expect(loadedCategoryB.getField('parent_category_id')).toBeNull();
-  });
-});
-
-describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
-  it('invalidates the cache', async () => {
-    const { CategoryEntity } = makeEntityClass(
-      EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE
-    );
-
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
-
-    const parentCategory = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const subCategory = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', parentCategory.getID())
-      .enforceCreateAsync();
-    const subSubCategory = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', subCategory.getID())
-      .enforceCreateAsync();
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', parentCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', subCategory.getID())
-    ).resolves.not.toBeNull();
-
-    const categoryCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
-      CategoryEntity
-    )['entityCompanion']['tableDataCoordinator'][
-      'cacheAdapter'
-    ] as InMemoryFullCacheStubCacheAdapter<CategoryFields>;
-    const subCategoryCachedBefore = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      parentCategory.getID(),
-    ]);
-    expect(subCategoryCachedBefore.get(parentCategory.getID())?.status).toEqual(CacheStatus.HIT);
-
-    const subSubCategoryCachedBefore = await categoryCacheAdapter.loadManyAsync(
-      'parent_category_id',
-      [subCategory.getID()]
-    );
-    expect(subSubCategoryCachedBefore.get(subCategory.getID())?.status).toEqual(CacheStatus.HIT);
-
-    await CategoryEntity.enforceDeleteAsync(parentCategory);
-
-    const subCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      parentCategory.getID(),
-    ]);
-    expect(subCategoryCachedAfter.get(parentCategory.getID())?.status).toEqual(CacheStatus.MISS);
-
-    const subSubCategoryCachedAfter = await categoryCacheAdapter.loadManyAsync(
-      'parent_category_id',
-      [subCategory.getID()]
-    );
-    expect(subSubCategoryCachedAfter.get(subCategory.getID())?.status).toEqual(CacheStatus.MISS);
-
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
-    ).resolves.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
-    ).resolves.not.toBeNull();
-  });
-
-  it('handles cycles', async () => {
-    const { CategoryEntity } = makeEntityClass(
-      EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE
-    );
-
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new TestViewerContext(companionProvider);
-
-    const categoryA = await CategoryEntity.creator(viewerContext).enforceCreateAsync();
-    const categoryB = await CategoryEntity.creator(viewerContext)
-      .setField('parent_category_id', categoryA.getID())
-      .enforceCreateAsync();
-    await CategoryEntity.updater(categoryA)
-      .setField('parent_category_id', categoryB.getID())
-      .enforceUpdateAsync();
-
-    await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', categoryA.getID())
-    ).resolves.not.toBeNull();
-    await expect(
-      CategoryEntity.loader(viewerContext)
-        .enforcing()
-        .loadByFieldEqualingAsync('parent_category_id', categoryB.getID())
-    ).resolves.not.toBeNull();
-
-    const categoryCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
-      CategoryEntity
-    )['entityCompanion']['tableDataCoordinator'][
-      'cacheAdapter'
-    ] as InMemoryFullCacheStubCacheAdapter<CategoryFields>;
-    const categoriesCachedBefore = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      categoryA.getID(),
-      categoryB.getID(),
-    ]);
-    expect(categoriesCachedBefore.get(categoryA.getID())?.status).toEqual(CacheStatus.HIT);
-    expect(categoriesCachedBefore.get(categoryB.getID())?.status).toEqual(CacheStatus.HIT);
-
-    await CategoryEntity.enforceDeleteAsync(categoryA);
-
-    const categoriesCachedAfter = await categoryCacheAdapter.loadManyAsync('parent_category_id', [
-      categoryA.getID(),
-      categoryB.getID(),
-    ]);
-    expect(categoriesCachedAfter.get(categoryA.getID())?.status).toEqual(CacheStatus.MISS);
-    expect(categoriesCachedAfter.get(categoryB.getID())?.status).toEqual(CacheStatus.MISS);
-  });
-});
@@ -6,7 +6,6 @@ import { EntityQueryContext } from '../EntityQueryContext';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
 import SimpleTestEntity from '../testfixtures/SimpleTestEntity';
-import TestEntity from '../testfixtures/TestEntity';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';

 describe(ReadonlyEntity, () => {
@@ -32,43 +31,6 @@ describe(ReadonlyEntity, () => {
    });
  });

-  describe('getUniqueIdentifier', () => {
-    it('returns a different value for two different entities of the same type', () => {
-      const viewerContext = instance(mock(ViewerContext));
-      const testEntity = new SimpleTestEntity(viewerContext, {
-        id: '1',
-      });
-      const testEntity2 = new SimpleTestEntity(viewerContext, {
-        id: '2',
-      });
-      expect(testEntity.getUniqueIdentifier()).not.toEqual(testEntity2.getUniqueIdentifier());
-    });
-
-    it('returns the same value even if different viewer context', () => {
-      const viewerContext = instance(mock(ViewerContext));
-      const viewerContext2 = instance(mock(ViewerContext));
-      const data = { id: '1' };
-      const testEntity = new SimpleTestEntity(viewerContext, data);
-      const testEntity2 = new SimpleTestEntity(viewerContext2, data);
-      expect(testEntity.getUniqueIdentifier()).toEqual(testEntity2.getUniqueIdentifier());
-    });
-
-    it('returns a different value for different entities even if same ID', () => {
-      const viewerContext = instance(mock(ViewerContext));
-      const data = { id: '1' };
-      const testEntity = new SimpleTestEntity(viewerContext, data);
-      const testEntity2 = new TestEntity(viewerContext, {
-        customIdField: '1',
-        testIndexedField: '2',
-        stringField: '3',
-        numberField: 4,
-        dateField: new Date(),
-        nullableField: null,
-      });
-      expect(testEntity.getUniqueIdentifier()).not.toEqual(testEntity2.getUniqueIdentifier());
-    });
-  });
-
  it('cannot be created without an ID', () => {
    const viewerContext = instance(mock(ViewerContext));
    const dataWithoutID = {};
@@ -112,7 +74,7 @@ describe(ReadonlyEntity, () => {
    it('creates a new regular query context', () => {
      const companionProvider = createUnitTestEntityCompanionProvider();
      const viewerContext = new ViewerContext(companionProvider);
-      const queryContext = SimpleTestEntity.getQueryContext(viewerContext);
+      const queryContext = SimpleTestEntity.getRegularEntityQueryContext(viewerContext);
      expect(queryContext).toBeInstanceOf(EntityQueryContext);
      expect(queryContext.isInTransaction()).toBe(false);
    });
@@ -11,14 +11,7 @@ describe(ViewerScopedEntityCompanion, () => {
  it('returns viewer scoped loader and mutator factory', () => {
    const vc = instance(mock(ViewerContext));
    const entityCompanion = mock<
-      EntityCompanion<
-        TestFields,
-        string,
-        ViewerContext,
-        TestEntity,
-        TestEntityPrivacyPolicy,
-        keyof TestFields
-      >
+      EntityCompanion<TestFields, string, ViewerContext, TestEntity, TestEntityPrivacyPolicy>
    >();
    const viewerScopedEntityCompanion = new ViewerScopedEntityCompanion(entityCompanion, vc);
    expect(viewerScopedEntityCompanion.getLoaderFactory()).toBeInstanceOf(
@@ -9,17 +9,13 @@ describe(ViewerScopedEntityLoaderFactory, () => {
  it('correctly scopes viewer to entity loads', async () => {
    const viewerContext = instance(mock(ViewerContext));
    const queryContext = instance(mock(EntityQueryContext));
-    const baseLoader = mock<EntityLoaderFactory<any, any, any, any, any, any>>(EntityLoaderFactory);
+    const baseLoader = mock<EntityLoaderFactory<any, any, any, any, any>>(EntityLoaderFactory);
    const baseLoaderInstance = instance(baseLoader);

-    const viewerScopedEntityLoader = new ViewerScopedEntityLoaderFactory<
-      any,
-      any,
-      any,
-      any,
-      any,
-      any
-    >(baseLoaderInstance, viewerContext);
+    const viewerScopedEntityLoader = new ViewerScopedEntityLoaderFactory<any, any, any, any, any>(
+      baseLoaderInstance,
+      viewerContext
+    );

    viewerScopedEntityLoader.forLoad(queryContext);

@@ -20,8 +20,7 @@ describe(ViewerScopedEntityMutatorFactory, () => {
      string,
      ViewerContext,
      TestEntity,
-      TestEntityPrivacyPolicy,
-      keyof TestFields
+      TestEntityPrivacyPolicy
    >(baseMutatorFactoryInstance, viewerContext);

    viewerScopedEntityLoader.forCreate(queryContext);
@@ -1,172 +0,0 @@
-import Entity from '../../Entity';
-import {
-  EntityCompanionDefinition,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-} from '../../EntityCompanionProvider';
-import EntityConfiguration from '../../EntityConfiguration';
-import { UUIDField, EnumField, StringField } from '../../EntityFields';
-import EntityPrivacyPolicy from '../../EntityPrivacyPolicy';
-import ViewerContext from '../../ViewerContext';
-import { successfulResults, failedResults } from '../../entityUtils';
-import AlwaysAllowPrivacyPolicyRule from '../../rules/AlwaysAllowPrivacyPolicyRule';
-import { createUnitTestEntityCompanionProvider } from '../../utils/testing/createUnitTestEntityCompanionProvider';
-
-describe('Two entities backed by the same table', () => {
-  test('load by different types', async () => {
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new ViewerContext(companionProvider);
-
-    const one = await OneTestEntity.creator(viewerContext)
-      .setField('entity_type', EntityType.ONE)
-      .setField('common_other_field', 'wat')
-      .enforceCreateAsync();
-
-    const two = await TwoTestEntity.creator(viewerContext)
-      .setField('entity_type', EntityType.TWO)
-      .setField('other_field', 'blah')
-      .setField('common_other_field', 'wat')
-      .enforceCreateAsync();
-
-    expect(one).toBeInstanceOf(OneTestEntity);
-    expect(two).toBeInstanceOf(TwoTestEntity);
-
-    await expect(
-      TwoTestEntity.loader(viewerContext).enforcing().loadByIDAsync(one.getID())
-    ).rejects.toThrowError('TwoTestEntity must be instantiated with two data');
-
-    await expect(
-      OneTestEntity.loader(viewerContext).enforcing().loadByIDAsync(two.getID())
-    ).rejects.toThrowError('OneTestEntity must be instantiated with one data');
-
-    const manyResults = await OneTestEntity.loader(viewerContext).loadManyByFieldEqualingAsync(
-      'common_other_field',
-      'wat'
-    );
-    const successfulManyResults = successfulResults(manyResults);
-    const failedManyResults = failedResults(manyResults);
-
-    expect(successfulManyResults).toHaveLength(1);
-    expect(failedManyResults).toHaveLength(1);
-
-    expect(successfulManyResults[0].enforceValue().getID()).toEqual(one.getID());
-    expect(failedManyResults[0].enforceError().message).toEqual(
-      'OneTestEntity must be instantiated with one data'
-    );
-
-    const fieldEqualityConjunctionResults = await OneTestEntity.loader(
-      viewerContext
-    ).loadManyByFieldEqualityConjunctionAsync([
-      {
-        fieldName: 'common_other_field',
-        fieldValue: 'wat',
-      },
-    ]);
-    const successfulfieldEqualityConjunctionResultsResults = successfulResults(
-      fieldEqualityConjunctionResults
-    );
-    const failedfieldEqualityConjunctionResultsResults = failedResults(
-      fieldEqualityConjunctionResults
-    );
-    expect(successfulfieldEqualityConjunctionResultsResults).toHaveLength(1);
-    expect(failedfieldEqualityConjunctionResultsResults).toHaveLength(1);
-  });
-});
-
-enum EntityType {
-  ONE,
-  TWO,
-}
-
-interface TestFields {
-  id: string;
-  other_field: string;
-  common_other_field: string;
-  entity_type: EntityType;
-}
-
-type OneTestFields = 'id' | 'entity_type' | 'common_other_field';
-type TwoTestFields = 'id' | 'other_field' | 'entity_type' | 'common_other_field';
-
-const testEntityConfiguration = new EntityConfiguration<TestFields>({
-  idField: 'id',
-  tableName: 'entities',
-  schema: {
-    id: new UUIDField({
-      columnName: 'custom_id',
-      cache: true,
-    }),
-    other_field: new StringField({
-      columnName: 'other_field',
-    }),
-    common_other_field: new StringField({
-      columnName: 'common_other_field',
-    }),
-    entity_type: new EnumField({
-      columnName: 'entity_type',
-    }),
-  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-});
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<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()];
-}
-
-class OneTestEntity extends Entity<TestFields, string, ViewerContext, OneTestFields> {
-  constructor(viewerContext: ViewerContext, rawFields: Readonly<TestFields>) {
-    if (rawFields.entity_type !== EntityType.ONE) {
-      throw new Error('OneTestEntity must be instantiated with one data');
-    }
-    super(viewerContext, rawFields);
-  }
-
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    OneTestEntity,
-    TestEntityPrivacyPolicy,
-    OneTestFields
-  > {
-    return oneTestEntityCompanion;
-  }
-}
-
-class TwoTestEntity extends Entity<TestFields, string, ViewerContext, TwoTestFields> {
-  constructor(viewerContext: ViewerContext, rawFields: Readonly<TestFields>) {
-    if (rawFields.entity_type !== EntityType.TWO) {
-      throw new Error('TwoTestEntity must be instantiated with two data');
-    }
-    super(viewerContext, rawFields);
-  }
-
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    TwoTestEntity,
-    TestEntityPrivacyPolicy,
-    TwoTestFields
-  > {
-    return twoTestEntityCompanion;
-  }
-}
-
-const oneTestEntityCompanion = new EntityCompanionDefinition({
-  entityClass: OneTestEntity,
-  entityConfiguration: testEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-  entitySelectedFields: ['id', 'entity_type', 'common_other_field'],
-});
-
-const twoTestEntityCompanion = new EntityCompanionDefinition({
-  entityClass: TwoTestEntity,
-  entityConfiguration: testEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-  entitySelectedFields: ['id', 'other_field', 'common_other_field', 'entity_type'],
-});
@@ -1,166 +0,0 @@
-import Entity from '../../Entity';
-import {
-  EntityCompanionDefinition,
-  DatabaseAdapterFlavor,
-  CacheAdapterFlavor,
-} from '../../EntityCompanionProvider';
-import EntityConfiguration from '../../EntityConfiguration';
-import { UUIDField, StringField } from '../../EntityFields';
-import EntityPrivacyPolicy from '../../EntityPrivacyPolicy';
-import ViewerContext from '../../ViewerContext';
-import AlwaysAllowPrivacyPolicyRule from '../../rules/AlwaysAllowPrivacyPolicyRule';
-import { createUnitTestEntityCompanionProvider } from '../../utils/testing/createUnitTestEntityCompanionProvider';
-
-describe('Two entities backed by the same table', () => {
-  test('mutate through different types and keep consistent cache and dataloader', async () => {
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new ViewerContext(companionProvider);
-
-    const entity1 = await OneTestEntity.creator(viewerContext)
-      .setField('fake_field', 'hello')
-      .enforceCreateAsync();
-    expect(entity1).toBeInstanceOf(OneTestEntity);
-
-    const entity2 = await TwoTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
-    expect(entity2).toBeInstanceOf(TwoTestEntity);
-
-    const updated2 = await TwoTestEntity.updater(entity2)
-      .setField('fake_field', 'world')
-      .setField('other_field', 'wat')
-      .enforceUpdateAsync();
-    expect(updated2.getAllFields()).toMatchObject({
-      id: updated2.getID(),
-      other_field: 'wat',
-      fake_field: 'world',
-    });
-
-    const loaded1 = await OneTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1.getID());
-    expect(loaded1.getAllFields()).toMatchObject({
-      id: updated2.getID(),
-      fake_field: 'world',
-    });
-  });
-
-  test('cached field that differs between the two to test invalidation', async () => {
-    const companionProvider = createUnitTestEntityCompanionProvider();
-    const viewerContext = new ViewerContext(companionProvider);
-
-    const entity = await TwoTestEntity.creator(viewerContext)
-      .setField('fake_field', 'hello')
-      .setField('other_field', 'huh')
-      .enforceCreateAsync();
-
-    const loadedEntity = await TwoTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('other_field', 'huh');
-    expect(loadedEntity?.getAllFields()).toMatchObject({
-      id: entity.getID(),
-      fake_field: 'hello',
-      other_field: 'huh',
-    });
-
-    const loaded1 = await OneTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity.getID());
-    await OneTestEntity.updater(loaded1).setField('fake_field', 'world').enforceUpdateAsync();
-
-    const loaded2 = await TwoTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('other_field', 'huh');
-    expect(loaded2?.getAllFields()).toMatchObject({
-      id: entity.getID(),
-      fake_field: 'world',
-      other_field: 'huh',
-    });
-
-    const loaded22 = await TwoTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByFieldEqualingAsync('fake_field', 'world');
-    expect(loaded22?.getAllFields()).toMatchObject({
-      id: entity.getID(),
-      fake_field: 'world',
-      other_field: 'huh',
-    });
-  });
-});
-
-interface TestFields {
-  id: string;
-  other_field: string;
-  fake_field: string;
-}
-
-type OneTestFields = 'id' | 'fake_field';
-type TwoTestFields = 'id' | 'other_field' | 'fake_field';
-
-const testEntityConfiguration = new EntityConfiguration<TestFields>({
-  idField: 'id',
-  tableName: 'entities',
-  schema: {
-    id: new UUIDField({
-      columnName: 'custom_id',
-      cache: true,
-    }),
-    other_field: new StringField({
-      columnName: 'other_field',
-      cache: true,
-    }),
-    fake_field: new StringField({
-      columnName: 'fake_field',
-      cache: true,
-    }),
-  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
-});
-
-class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<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()];
-}
-
-class OneTestEntity extends Entity<TestFields, string, ViewerContext, OneTestFields> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    OneTestEntity,
-    TestEntityPrivacyPolicy,
-    OneTestFields
-  > {
-    return oneTestEntityCompanion;
-  }
-}
-
-class TwoTestEntity extends Entity<TestFields, string, ViewerContext, TwoTestFields> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    TestFields,
-    string,
-    ViewerContext,
-    TwoTestEntity,
-    TestEntityPrivacyPolicy,
-    TwoTestFields
-  > {
-    return twoTestEntityCompanion;
-  }
-}
-
-const oneTestEntityCompanion = new EntityCompanionDefinition({
-  entityClass: OneTestEntity,
-  entityConfiguration: testEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-  entitySelectedFields: ['id', 'fake_field'],
-});
-
-const twoTestEntityCompanion = new EntityCompanionDefinition({
-  entityClass: TwoTestEntity,
-  entityConfiguration: testEntityConfiguration,
-  privacyPolicyClass: TestEntityPrivacyPolicy,
-  entitySelectedFields: ['id', 'other_field', 'fake_field'],
-});
@@ -6,7 +6,6 @@ import {
  failedResults,
  successfulResultsFilterMap,
  failedResultsFilterMap,
-  pick,
 } from '../entityUtils';

 describe(enforceResultsAsync, () => {
@@ -43,57 +42,39 @@ describe(failedResults, () => {
 });

 describe(successfulResultsFilterMap, () => {
-  it('filters out failed results', () => {
-    const result1 = result(1);
-    const result2 = result(new Error('hello'));
-    const result3 = result(1);
-    const allResults = new Map(
-      Object.entries({
-        a: result1,
-        b: result2,
-        c: result3,
-      })
-    );
+  const result1 = result(1);
+  const result2 = result(new Error('hello'));
+  const result3 = result(1);
+  const allResults = new Map(
+    Object.entries({
+      a: result1,
+      b: result2,
+      c: result3,
+    })
+  );

-    const resultingMap = successfulResultsFilterMap(allResults);
+  const resultingMap = successfulResultsFilterMap(allResults);

-    expect(resultingMap.get('a')).toEqual(result1);
-    expect(resultingMap.get('b')).toBeUndefined();
-    expect(resultingMap.get('c')).toEqual(result3);
-  });
+  expect(resultingMap.get('a')).toEqual(result1);
+  expect(resultingMap.get('b')).toBeUndefined();
+  expect(resultingMap.get('c')).toEqual(result3);
 });

 describe(failedResultsFilterMap, () => {
-  it('filters out successful results', () => {
-    const result1 = result(1);
-    const result2 = result(new Error('hello'));
-    const result3 = result(1);
-    const allResults = new Map(
-      Object.entries({
-        a: result1,
-        b: result2,
-        c: result3,
-      })
-    );
+  const result1 = result(1);
+  const result2 = result(new Error('hello'));
+  const result3 = result(1);
+  const allResults = new Map(
+    Object.entries({
+      a: result1,
+      b: result2,
+      c: result3,
+    })
+  );

-    const resultingMap = failedResultsFilterMap(allResults);
+  const resultingMap = failedResultsFilterMap(allResults);

-    expect(resultingMap.get('a')).toBeUndefined();
-    expect(resultingMap.get('b')).toEqual(result2);
-    expect(resultingMap.get('c')).toBeUndefined();
-  });
-});
-
-describe(pick, () => {
-  it('picks specified keys', () => {
-    const object = {
-      a: 1,
-      b: 2,
-      c: 3,
-    };
-    expect(pick(object, ['a', 'b'])).toEqual({
-      a: 1,
-      b: 2,
-    });
-  });
+  expect(resultingMap.get('a')).toBeUndefined();
+  expect(resultingMap.get('b')).toEqual(result2);
+  expect(resultingMap.get('c')).toBeUndefined();
 });
@@ -93,10 +93,3 @@ export const partitionErrors = <T>(valuesAndErrors: (T | Error)[]): [T[], Error[
 const isError = <T>(value: T | Error): value is Error => {
  return value instanceof Error;
 };
-
-export const pick = <T extends object, U extends keyof T>(object: T, props: U[]): Pick<T, U> => {
-  const propsSet = new Set(props);
-  return Object.fromEntries(
-    Object.entries(object).filter((entry) => propsSet.has(entry[0] as any))
-  ) as any;
-};
@@ -16,16 +16,13 @@ export * from './EntityFields';
 export { default as EntityLoader } from './EntityLoader';
 export { default as EntityLoaderFactory } from './EntityLoaderFactory';
 export * from './EntityMutator';
-export { default as EntityMutationValidator } from './EntityMutationValidator';
-export * from './EntityMutationTriggerConfiguration';
-export { default as EntityMutationTriggerConfiguration } from './EntityMutationTriggerConfiguration';
 export { default as EntityMutatorFactory } from './EntityMutatorFactory';
 export { default as EntityPrivacyPolicy } from './EntityPrivacyPolicy';
 export * from './EntityPrivacyPolicy';
 export * from './EntityQueryContext';
 export { default as IEntityCacheAdapterProvider } from './IEntityCacheAdapterProvider';
 export { default as IEntityDatabaseAdapterProvider } from './IEntityDatabaseAdapterProvider';
-export { default as EntityQueryContextProvider } from './EntityQueryContextProvider';
+export { default as IEntityQueryContextProvider } from './IEntityQueryContextProvider';
 export { default as ReadonlyEntity } from './ReadonlyEntity';
 export { default as ViewerContext } from './ViewerContext';
 export { default as ViewerScopedEntityCompanion } from './ViewerScopedEntityCompanion';
@@ -4,8 +4,8 @@ import EntityDatabaseAdapter, {
  FieldEqualityCondition,
  QuerySelectionModifiers,
 } from '../EntityDatabaseAdapter';
-import { EntityQueryContext, EntityTransactionalQueryContext } from '../EntityQueryContext';
-import EntityQueryContextProvider from '../EntityQueryContextProvider';
+import { EntityQueryContext } from '../EntityQueryContext';
+import IEntityQueryContextProvider from '../IEntityQueryContextProvider';
 import { partitionErrors } from '../entityUtils';
 import {
  timeAndLogLoadEventAsync,
@@ -15,13 +15,6 @@ import IEntityMetricsAdapter, { EntityMetricsLoadType } from '../metrics/IEntity
 import { computeIfAbsent, zipToMap } from '../utils/collections/maps';
 import ReadThroughEntityCache from './ReadThroughEntityCache';

-type FieldDataLoader<TFields> = DataLoader<
-  NonNullable<TFields[keyof TFields]>,
-  readonly Readonly<TFields>[]
->;
-
-type FieldDataLoadersMap<TFields> = Map<keyof TFields, FieldDataLoader<TFields>>;
-
 /**
 * A data manager is responsible for orchestrating multiple sources of entity
 * data including local caches, {@link EntityCacheAdapter}, and {@link EntityDatabaseAdapter}.
@@ -29,25 +22,22 @@ type FieldDataLoadersMap<TFields> = Map<keyof TFields, FieldDataLoader<TFields>>
 * It is also responsible for invalidating all sources of data when mutated using {@link EntityMutator}.
 */
 export default class EntityDataManager<TFields> {
-  private readonly regularFieldDataLoaders: FieldDataLoadersMap<TFields> = new Map();
-
-  private readonly transactionalFieldDataLoaders: Map<
-    string,
-    FieldDataLoadersMap<TFields>
+  private readonly fieldDataLoaders: Map<
+    keyof TFields,
+    DataLoader<NonNullable<TFields[keyof TFields]>, readonly Readonly<TFields>[]>
  > = new Map();

  constructor(
    private readonly databaseAdapter: EntityDatabaseAdapter<TFields>,
    private readonly entityCache: ReadThroughEntityCache<TFields>,
-    private readonly queryContextProvider: EntityQueryContextProvider,
-    private readonly metricsAdapter: IEntityMetricsAdapter,
-    private readonly entityClassName: string
+    private readonly queryContextProvider: IEntityQueryContextProvider,
+    private readonly metricsAdapter: IEntityMetricsAdapter
  ) {}

-  private getRegularFieldDataLoderForFieldName<N extends keyof TFields>(
+  private getFieldDataLoaderForFieldName<N extends keyof TFields>(
    fieldName: N
-  ): FieldDataLoader<TFields> {
-    return computeIfAbsent(this.regularFieldDataLoaders, fieldName, () => {
+  ): DataLoader<NonNullable<TFields[N]>, readonly Readonly<TFields>[]> {
+    return computeIfAbsent(this.fieldDataLoaders, fieldName, () => {
      return new DataLoader(
        async (
          fieldValues: readonly NonNullable<TFields[N]>[]
@@ -62,62 +52,18 @@ export default class EntityDataManager<TFields> {
    });
  }

-  private getTransactionalFieldDataLoaderForFieldName<N extends keyof TFields>(
-    queryContext: EntityTransactionalQueryContext,
-    fieldName: N
-  ): FieldDataLoader<TFields> {
-    const fieldDataLoaderMap = computeIfAbsent(
-      this.transactionalFieldDataLoaders,
-      queryContext.transactionID,
-      () => new Map<keyof TFields, FieldDataLoader<TFields>>()
-    );
-    return computeIfAbsent(fieldDataLoaderMap, fieldName, () => {
-      return new DataLoader(
-        async (
-          fieldValues: readonly NonNullable<TFields[N]>[]
-        ): Promise<readonly (readonly TFields[])[]> => {
-          const objectMap = await this.loadManyForTransactionalDataLoaderByFieldEqualingAsync(
-            fieldName,
-            fieldValues,
-            queryContext
-          );
-          return fieldValues.map((fv) => objectMap.get(fv) ?? []);
-        }
-      );
-    });
-  }
-
-  private async loadManyForTransactionalDataLoaderByFieldEqualingAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[],
-    queryContext: EntityTransactionalQueryContext
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Readonly<TFields>[]>> {
-    this.metricsAdapter.incrementDataManagerDatabaseLoadCount({
-      fieldValueCount: fieldValues.length,
-      entityClassName: this.entityClassName,
-    });
-    return await this.databaseAdapter.fetchManyWhereAsync(queryContext, fieldName, fieldValues);
-  }
-
  private async loadManyForDataLoaderByFieldEqualingAsync<N extends keyof TFields>(
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Readonly<TFields>[]>> {
-    this.metricsAdapter.incrementDataManagerCacheLoadCount({
-      fieldValueCount: fieldValues.length,
-      entityClassName: this.entityClassName,
-    });
-
+    this.metricsAdapter.incrementDataManagerCacheLoadCount(fieldValues.length);
    return await this.entityCache.readManyThroughAsync(
      fieldName,
      fieldValues,
-      async (fetcherValues: readonly NonNullable<TFields[N]>[]) => {
-        this.metricsAdapter.incrementDataManagerDatabaseLoadCount({
-          fieldValueCount: fieldValues.length,
-          entityClassName: this.entityClassName,
-        });
+      async (fetcherValues) => {
+        this.metricsAdapter.incrementDataManagerDatabaseLoadCount(fieldValues.length);
        return await this.databaseAdapter.fetchManyWhereAsync(
-          this.queryContextProvider.getQueryContext(),
+          this.queryContextProvider.getRegularEntityQueryContext(),
          fieldName,
          fetcherValues
        );
@@ -140,8 +86,7 @@ export default class EntityDataManager<TFields> {
  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Readonly<TFields>[]>> {
    return await timeAndLogLoadMapEventAsync(
      this.metricsAdapter,
-      EntityMetricsLoadType.LOAD_MANY,
-      this.entityClassName
+      EntityMetricsLoadType.LOAD_MANY
    )(this.loadManyByFieldEqualingInternalAsync(queryContext, fieldName, fieldValues));
  }

@@ -150,22 +95,13 @@ export default class EntityDataManager<TFields> {
    fieldName: N,
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Readonly<TFields>[]>> {
-    const nullOrUndefinedValueIndex = fieldValues.findIndex(
-      (value) => value === null || value === undefined
-    );
-    if (nullOrUndefinedValueIndex >= 0) {
-      throw new Error(
-        `Invalid load: ${this.entityClassName} (${fieldName} = ${fieldValues[nullOrUndefinedValueIndex]})`
-      );
+    // don't cache when in transaction, as rollbacks complicate things significantly
+    if (queryContext.isInTransaction()) {
+      return await this.databaseAdapter.fetchManyWhereAsync(queryContext, fieldName, fieldValues);
    }

-    this.metricsAdapter.incrementDataManagerDataloaderLoadCount({
-      fieldValueCount: fieldValues.length,
-      entityClassName: this.entityClassName,
-    });
-    const dataLoader = queryContext.isInTransaction()
-      ? this.getTransactionalFieldDataLoaderForFieldName(queryContext, fieldName)
-      : this.getRegularFieldDataLoderForFieldName(fieldName);
+    this.metricsAdapter.incrementDataManagerDataloaderLoadCount(fieldValues.length);
+    const dataLoader = this.getFieldDataLoaderForFieldName(fieldName);
    const results = await dataLoader.loadMany(fieldValues);
    const [values, errors] = partitionErrors(results);
    if (errors.length > 0) {
@@ -191,8 +127,7 @@ export default class EntityDataManager<TFields> {
  ): Promise<readonly Readonly<TFields>[]> {
    return await timeAndLogLoadEventAsync(
      this.metricsAdapter,
-      EntityMetricsLoadType.LOAD_MANY_EQUALITY_CONJUNCTION,
-      this.entityClassName
+      EntityMetricsLoadType.LOAD_MANY_EQUALITY_CONJUNCTION
    )(
      this.databaseAdapter.fetchManyByFieldEqualityConjunctionAsync(
        queryContext,
@@ -219,8 +154,7 @@ export default class EntityDataManager<TFields> {
  ): Promise<readonly Readonly<TFields>[]> {
    return await timeAndLogLoadEventAsync(
      this.metricsAdapter,
-      EntityMetricsLoadType.LOAD_MANY_RAW,
-      this.entityClassName
+      EntityMetricsLoadType.LOAD_MANY_RAW
    )(
      this.databaseAdapter.fetchManyByRawWhereClauseAsync(
        queryContext,
@@ -236,20 +170,7 @@ export default class EntityDataManager<TFields> {
    fieldValues: readonly NonNullable<TFields[N]>[]
  ): Promise<void> {
    await this.entityCache.invalidateManyAsync(fieldName, fieldValues);
-    const dataLoader = this.getRegularFieldDataLoderForFieldName(fieldName);
-    fieldValues.forEach((fieldValue) => dataLoader.clear(fieldValue));
-  }
-
-  private async invalidateManyByFieldEqualingTransactionalAsync<N extends keyof TFields>(
-    queryContext: EntityQueryContext,
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    if (!queryContext.isInTransaction()) {
-      return;
-    }
-
-    const dataLoader = this.getTransactionalFieldDataLoaderForFieldName(queryContext, fieldName);
+    const dataLoader = this.getFieldDataLoaderForFieldName(fieldName);
    fieldValues.forEach((fieldValue) => dataLoader.clear(fieldValue));
  }

@@ -272,21 +193,4 @@ export default class EntityDataManager<TFields> {
      })
    );
  }
-
-  async invalidateObjectFieldsTransactionalAsync(
-    queryContext: EntityQueryContext,
-    objectFields: Readonly<TFields>
-  ): Promise<void> {
-    const keys = Object.keys(objectFields) as (keyof TFields)[];
-    await Promise.all(
-      keys.map(async (fieldName: keyof TFields) => {
-        const value = objectFields[fieldName];
-        if (value !== undefined) {
-          await this.invalidateManyByFieldEqualingTransactionalAsync(queryContext, fieldName, [
-            value as NonNullable<TFields[keyof TFields]>,
-          ]);
-        }
-      })
-    );
-  }
 }
@@ -1,43 +0,0 @@
-import EntityCacheAdapter from '../EntityCacheAdapter';
-import EntityConfiguration from '../EntityConfiguration';
-import EntityDatabaseAdapter from '../EntityDatabaseAdapter';
-import EntityQueryContextProvider from '../EntityQueryContextProvider';
-import IEntityCacheAdapterProvider from '../IEntityCacheAdapterProvider';
-import IEntityDatabaseAdapterProvider from '../IEntityDatabaseAdapterProvider';
-import IEntityMetricsAdapter from '../metrics/IEntityMetricsAdapter';
-import EntityDataManager from './EntityDataManager';
-import ReadThroughEntityCache from './ReadThroughEntityCache';
-
-/**
- * Responsible for orchestrating fetching and caching of entity data from a
- * table. Note that one instance is shared amongst all entities that read from
- * the table to ensure cross-entity data consistency.
- */
-export default class EntityTableDataCoordinator<TFields> {
-  readonly databaseAdapter: EntityDatabaseAdapter<TFields>;
-  readonly cacheAdapter: EntityCacheAdapter<TFields>;
-  readonly dataManager: EntityDataManager<TFields>;
-
-  constructor(
-    readonly entityConfiguration: EntityConfiguration<TFields>,
-    databaseAdapterProvider: IEntityDatabaseAdapterProvider,
-    cacheAdapterProvider: IEntityCacheAdapterProvider,
-    private readonly queryContextProvider: EntityQueryContextProvider,
-    metricsAdapter: IEntityMetricsAdapter,
-    entityClassName: string
-  ) {
-    this.databaseAdapter = databaseAdapterProvider.getDatabaseAdapter(entityConfiguration);
-    this.cacheAdapter = cacheAdapterProvider.getCacheAdapter(entityConfiguration);
-    this.dataManager = new EntityDataManager(
-      this.databaseAdapter,
-      new ReadThroughEntityCache(entityConfiguration, this.cacheAdapter),
-      queryContextProvider,
-      metricsAdapter,
-      entityClassName
-    );
-  }
-
-  getQueryContextProvider(): EntityQueryContextProvider {
-    return this.queryContextProvider;
-  }
-}
@@ -115,7 +115,6 @@ export default class ReadThroughEntityCache<TFields> {
        if (objects.length > 1) {
          // multiple objects received for what was supposed to be a unique query, don't add to return map nor cache
          // TODO(wschurman): emit or throw here since console may not be available
-          // eslint-disable-next-line no-console
          console.warn(
            `unique key ${fieldName} in ${this.entityConfiguration.tableName} returned multiple rows for ${fieldValue}`
          );
@@ -9,13 +9,12 @@ import {
  spy,
  anyString,
  resetCalls,
-  deepEqual,
 } from 'ts-mockito';

 import EntityDatabaseAdapter from '../../EntityDatabaseAdapter';
 import IEntityMetricsAdapter, { EntityMetricsLoadType } from '../../metrics/IEntityMetricsAdapter';
 import NoOpEntityMetricsAdapter from '../../metrics/NoOpEntityMetricsAdapter';
-import TestEntity, { testEntityConfiguration, TestFields } from '../../testfixtures/TestEntity';
+import { testEntityConfiguration, TestFields } from '../../testfixtures/TestEntity';
 import {
  NoCacheStubCacheAdapterProvider,
  InMemoryFullCacheStubCacheAdapterProvider,
@@ -36,7 +35,6 @@ const getObjects = (): Map<string, TestFields[]> =>
          stringField: 'hello',
          numberField: 1,
          dateField: new Date(),
-          nullableField: null,
        },
        {
          customIdField: '2',
@@ -44,7 +42,6 @@ const getObjects = (): Map<string, TestFields[]> =>
          stringField: 'hello',
          numberField: 1,
          dateField: new Date(),
-          nullableField: null,
        },
        {
          customIdField: '3',
@@ -52,7 +49,6 @@ const getObjects = (): Map<string, TestFields[]> =>
          stringField: 'world',
          numberField: 1,
          dateField: new Date(),
-          nullableField: null,
        },
      ],
    ],
@@ -73,10 +69,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyWhereAsync');
    const cacheSpy = jest.spyOn(entityCache, 'readManyThroughAsync');
@@ -121,10 +116,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyWhereAsync');
    const cacheSpy = jest.spyOn(entityCache, 'readManyThroughAsync');
@@ -169,17 +163,15 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();
    // use second data manager to ensure that cache is hit instead of data loader
    const entityDataManager2 = new EntityDataManager(
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyWhereAsync');
@@ -213,10 +205,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyWhereAsync');
    const cacheSpy = jest.spyOn(entityCache, 'readManyThroughAsync');
@@ -249,10 +240,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyWhereAsync');
    const cacheSpy = jest.spyOn(entityCache, 'readManyThroughAsync');
@@ -293,10 +283,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const objectInQuestion = objects.get(testEntityConfiguration.tableName)![1];

@@ -332,10 +321,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const objectInQuestion = objects.get(testEntityConfiguration.tableName)![1];

@@ -371,8 +359,7 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyWhereAsync');
@@ -409,10 +396,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    const dbSpy = jest.spyOn(databaseAdapter, 'fetchManyByFieldEqualityConjunctionAsync');
    const cacheSpy = jest.spyOn(entityCache, 'readManyThroughAsync');
@@ -455,10 +441,9 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
+      new NoOpEntityMetricsAdapter()
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    await expect(
      entityDataManager.loadManyByFieldEqualingAsync(queryContext, 'customIdField', ['2'])
@@ -482,17 +467,15 @@ describe(EntityDataManager, () => {
      databaseAdapter,
      entityCache,
      StubQueryContextProvider,
-      metricsAdapter,
-      TestEntity.name
+      metricsAdapter
    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
+    const queryContext = StubQueryContextProvider.getRegularEntityQueryContext();

    await entityDataManager.loadManyByFieldEqualingAsync(queryContext, 'customIdField', ['1']);
    verify(
      metricsAdapterMock.logDataManagerLoadEvent(
        objectContaining({
          type: EntityMetricsLoadType.LOAD_MANY,
-          entityClassName: TestEntity.name,
          count: 1,
        })
      )
@@ -512,36 +495,14 @@ describe(EntityDataManager, () => {
      metricsAdapterMock.logDataManagerLoadEvent(
        objectContaining({
          type: EntityMetricsLoadType.LOAD_MANY_EQUALITY_CONJUNCTION,
-          entityClassName: TestEntity.name,
          count: 1,
        })
      )
    ).once();

-    verify(
-      metricsAdapterMock.incrementDataManagerDataloaderLoadCount(
-        deepEqual({
-          fieldValueCount: 1,
-          entityClassName: TestEntity.name,
-        })
-      )
-    ).once();
-    verify(
-      metricsAdapterMock.incrementDataManagerCacheLoadCount(
-        deepEqual({
-          fieldValueCount: 1,
-          entityClassName: TestEntity.name,
-        })
-      )
-    ).once();
-    verify(
-      metricsAdapterMock.incrementDataManagerDatabaseLoadCount(
-        deepEqual({
-          fieldValueCount: 1,
-          entityClassName: TestEntity.name,
-        })
-      )
-    ).once();
+    verify(metricsAdapterMock.incrementDataManagerDataloaderLoadCount(1)).once();
+    verify(metricsAdapterMock.incrementDataManagerCacheLoadCount(1)).once();
+    verify(metricsAdapterMock.incrementDataManagerDatabaseLoadCount(1)).once();

    resetCalls(metricsAdapterMock);

@@ -559,7 +520,6 @@ describe(EntityDataManager, () => {
      metricsAdapterMock.logDataManagerLoadEvent(
        objectContaining({
          type: EntityMetricsLoadType.LOAD_MANY_RAW,
-          entityClassName: TestEntity.name,
          count: 0,
        })
      )
@@ -569,34 +529,4 @@ describe(EntityDataManager, () => {
    verify(metricsAdapterMock.incrementDataManagerCacheLoadCount(anyNumber())).never();
    verify(metricsAdapterMock.incrementDataManagerDatabaseLoadCount(anyNumber())).never();
  });
-
-  it('throws when a load-by value is null or undefined', async () => {
-    const objects = getObjects();
-    const dataStore = StubDatabaseAdapter.convertFieldObjectsToDataStore(
-      testEntityConfiguration,
-      objects
-    );
-    const databaseAdapter = new StubDatabaseAdapter<TestFields>(testEntityConfiguration, dataStore);
-    const cacheAdapterProvider = new NoCacheStubCacheAdapterProvider();
-    const cacheAdapter = cacheAdapterProvider.getCacheAdapter(testEntityConfiguration);
-    const entityCache = new ReadThroughEntityCache(testEntityConfiguration, cacheAdapter);
-    const entityDataManager = new EntityDataManager(
-      databaseAdapter,
-      entityCache,
-      StubQueryContextProvider,
-      new NoOpEntityMetricsAdapter(),
-      TestEntity.name
-    );
-    const queryContext = StubQueryContextProvider.getQueryContext();
-
-    await expect(
-      entityDataManager.loadManyByFieldEqualingAsync(queryContext, 'nullableField', [null as any])
-    ).rejects.toThrowError('Invalid load: TestEntity (nullableField = null)');
-
-    await expect(
-      entityDataManager.loadManyByFieldEqualingAsync(queryContext, 'nullableField', [
-        undefined as any,
-      ])
-    ).rejects.toThrowError('Invalid load: TestEntity (nullableField = undefined)');
-  });
 });
@@ -1,4 +1,3 @@
-import { DatabaseAdapterFlavor, CacheAdapterFlavor } from '../../EntityCompanionProvider';
 import EntityConfiguration from '../../EntityConfiguration';
 import { UUIDField, StringField } from '../../EntityFields';
 import {
@@ -38,8 +37,6 @@ const blahEntityConfiguration = new EntityConfiguration<BlahT>({
      columnName: 'transform_write',
    }),
  },
-  databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-  cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
 });

 describe(getDatabaseFieldForEntityField, () => {
@@ -1,7 +1,6 @@
 import { verify, deepEqual, mock, instance, when, anything } from 'ts-mockito';

 import EntityCacheAdapter from '../../EntityCacheAdapter';
-import { DatabaseAdapterFlavor, CacheAdapterFlavor } from '../../EntityCompanionProvider';
 import EntityConfiguration from '../../EntityConfiguration';
 import { UUIDField } from '../../EntityFields';
 import ReadThroughEntityCache, { CacheStatus } from '../ReadThroughEntityCache';
@@ -17,8 +16,6 @@ const makeEntityConfiguration = (cacheIdField: boolean): EntityConfiguration<Bla
    schema: {
      id: new UUIDField({ columnName: 'id', cache: cacheIdField }),
    },
-    databaseAdapterFlavor: DatabaseAdapterFlavor.POSTGRES,
-    cacheAdapterFlavor: CacheAdapterFlavor.REDIS,
  });

 const createIdFetcher = (ids: string[]) => async <N extends keyof BlahFields>(
@@ -6,8 +6,7 @@ import IEntityMetricsAdapter, {

 export const timeAndLogLoadEventAsync = (
  metricsAdapter: IEntityMetricsAdapter,
-  loadType: EntityMetricsLoadType,
-  entityClassName: string
+  loadType: EntityMetricsLoadType
 ) => async <TFields>(promise: Promise<readonly Readonly<TFields>[]>) => {
  const startTime = Date.now();
  const result = await promise;
@@ -15,7 +14,6 @@ export const timeAndLogLoadEventAsync = (

  metricsAdapter.logDataManagerLoadEvent({
    type: loadType,
-    entityClassName,
    duration: endTime - startTime,
    count: result.length,
  });
@@ -25,8 +23,7 @@ export const timeAndLogLoadEventAsync = (

 export const timeAndLogLoadMapEventAsync = (
  metricsAdapter: IEntityMetricsAdapter,
-  loadType: EntityMetricsLoadType,
-  entityClassName: string
+  loadType: EntityMetricsLoadType
 ) => async <TFields, N extends keyof TFields>(
  promise: Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Readonly<TFields>[]>>
 ) => {
@@ -38,7 +35,6 @@ export const timeAndLogLoadMapEventAsync = (

  metricsAdapter.logDataManagerLoadEvent({
    type: loadType,
-    entityClassName,
    duration: endTime - startTime,
    count,
  });
@@ -48,8 +44,7 @@ export const timeAndLogLoadMapEventAsync = (

 export const timeAndLogMutationEventAsync = (
  metricsAdapter: IEntityMetricsAdapter,
-  mutationType: EntityMetricsMutationType,
-  entityClassName: string
+  mutationType: EntityMetricsMutationType
 ) => async <T>(promise: Promise<T>) => {
  const startTime = Date.now();
  const result = await promise;
@@ -57,7 +52,6 @@ export const timeAndLogMutationEventAsync = (

  metricsAdapter.logMutatorMutationEvent({
    type: mutationType,
-    entityClassName,
    duration: endTime - startTime,
  });

@@ -6,7 +6,6 @@ export enum EntityMetricsLoadType {

 export interface EntityMetricsLoadEvent {
  type: EntityMetricsLoadType;
-  entityClassName: string;
  duration: number;
  count: number;
 }
@@ -19,15 +18,9 @@ export enum EntityMetricsMutationType {

 export interface EntityMetricsMutationEvent {
  type: EntityMetricsMutationType;
-  entityClassName: string;
  duration: number;
 }

-export interface IncrementLoadCountEvent {
-  fieldValueCount: number;
-  entityClassName: string;
-}
-
 /**
 * An interface for gathering metrics about the Entity framework. Information about
 * entity load and mutation operations is piped to an instance of this adapter.
@@ -50,7 +43,7 @@ export default interface IEntityMetricsAdapter {
   * load methods (not equality conjunction or raw).
   * @param fieldValueCount - count of field values being loaded for a field
   */
-  incrementDataManagerDataloaderLoadCount(incrementLoadCountEvent: IncrementLoadCountEvent): void;
+  incrementDataManagerDataloaderLoadCount(fieldValueCount: number): void;

  /**
   * Called when a cache load is initiated via the standard
@@ -58,7 +51,7 @@ export default interface IEntityMetricsAdapter {
   * miss.
   * @param fieldValueCount - count of field values being loaded for a field
   */
-  incrementDataManagerCacheLoadCount(incrementLoadCountEvent: IncrementLoadCountEvent): void;
+  incrementDataManagerCacheLoadCount(fieldValueCount: number): void;

  /**
   * Called when a database load is initiated via the standard
@@ -66,5 +59,5 @@ export default interface IEntityMetricsAdapter {
   * miss or when fetching an uncacheable field.
   * @param fieldValueCount - count of field values being loaded for a field
   */
-  incrementDataManagerDatabaseLoadCount(incrementLoadCountEvent: IncrementLoadCountEvent): void;
+  incrementDataManagerDatabaseLoadCount(fieldValueCount: number): void;
 }
@@ -1,15 +1,12 @@
 import IEntityMetricsAdapter, {
  EntityMetricsLoadEvent,
  EntityMetricsMutationEvent,
-  IncrementLoadCountEvent,
 } from './IEntityMetricsAdapter';

 export default class NoOpEntityMetricsAdapter implements IEntityMetricsAdapter {
  logDataManagerLoadEvent(_loadEvent: EntityMetricsLoadEvent): void {}
  logMutatorMutationEvent(_mutationEvent: EntityMetricsMutationEvent): void {}
-  incrementDataManagerDataloaderLoadCount(
-    _incrementLoadCountEvent: IncrementLoadCountEvent
-  ): void {}
-  incrementDataManagerCacheLoadCount(_incrementLoadCountEvent: IncrementLoadCountEvent): void {}
-  incrementDataManagerDatabaseLoadCount(_incrementLoadCountEvent: IncrementLoadCountEvent): void {}
+  incrementDataManagerDataloaderLoadCount(_fieldValueCount: number): void {}
+  incrementDataManagerCacheLoadCount(_fieldValueCount: number): void {}
+  incrementDataManagerDatabaseLoadCount(_fieldValueCount: number): void {}
 }
@@ -10,9 +10,8 @@ export default class AlwaysAllowPrivacyPolicyRule<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> extends PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
+> extends PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity> {
  async evaluateAsync(
    _viewerContext: TViewerContext,
    _queryContext: EntityQueryContext,
@@ -10,9 +10,8 @@ export default class AlwaysDenyPrivacyPolicyRule<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> extends PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
+> extends PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity> {
  async evaluateAsync(
    _viewerContext: TViewerContext,
    _queryContext: EntityQueryContext,
@@ -10,9 +10,8 @@ export default class AlwaysSkipPrivacyPolicyRule<
  TFields,
  TID,
  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields = keyof TFields
-> extends PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields> {
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext>
+> extends PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity> {
  async evaluateAsync(
    _viewerContext: TViewerContext,
    _queryContext: EntityQueryContext,