Skip to content

Commit 2175ffe

Browse files
wschurmanwschurman
committed
fix!: change adaptor -> adapter for consistency
1 parent 364a3bd commit 2175ffe

11 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎packages/entity-database-adapter-knex/src/__integration-tests__/EntityCreationUtils-test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe(createWithUniqueConstraintRecoveryAsync, () => {
9090
name: 'unique',
9191
};
9292

93-
const createdEntities = await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
93+
const createdEntities = await vc1.runInTransactionForDatabaseAdapterFlavorAsync(
9494
'postgres',
9595
async (queryContext) => {
9696
if (parallel) {
@@ -154,7 +154,7 @@ describe(createWithUniqueConstraintRecoveryAsync, () => {
154154
let createdEntities: [PostgresUniqueTestEntity, PostgresUniqueTestEntity];
155155
if (parallel) {
156156
createdEntities = await Promise.all([
157-
vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
157+
vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
158158
return await createWithUniqueConstraintRecoveryAsync(
159159
vc1,
160160
PostgresUniqueTestEntity,
@@ -165,7 +165,7 @@ describe(createWithUniqueConstraintRecoveryAsync, () => {
165165
queryContext,
166166
);
167167
}),
168-
vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
168+
vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
169169
return await createWithUniqueConstraintRecoveryAsync(
170170
vc1,
171171
PostgresUniqueTestEntity,
@@ -179,7 +179,7 @@ describe(createWithUniqueConstraintRecoveryAsync, () => {
179179
]);
180180
} else {
181181
createdEntities = [
182-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
182+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync(
183183
'postgres',
184184
async (queryContext) => {
185185
return await createWithUniqueConstraintRecoveryAsync(
@@ -193,7 +193,7 @@ describe(createWithUniqueConstraintRecoveryAsync, () => {
193193
);
194194
},
195195
),
196-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
196+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync(
197197
'postgres',
198198
async (queryContext) => {
199199
return await createWithUniqueConstraintRecoveryAsync(

‎packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityIntegration-test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('postgres entity integration', () => {
125125
const errorToThrow = new Error('Intentional error');
126126

127127
await expect(
128-
vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
128+
vc1.runInTransactionForDatabaseAdapterFlavorAsync(
129129
'postgres',
130130
async (queryContext) => {
131131
// put another in the DB that will be rolled back due to error thrown
@@ -167,7 +167,7 @@ describe('postgres entity integration', () => {
167167
delay: number,
168168
): Promise<{ error?: Error }> => {
169169
try {
170-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
170+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync(
171171
'postgres',
172172
async (queryContext) => {
173173
const entity = await PostgresTestEntity.loader(vc1, queryContext).loadByIDAsync(
@@ -1311,7 +1311,7 @@ describe('postgres entity integration', () => {
13111311
let preCommitInnerCallCount = 0;
13121312
let postCommitCallCount = 0;
13131313

1314-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
1314+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
13151315
queryContext.appendPostCommitCallback(async () => {
13161316
postCommitCallCount++;
13171317
});
@@ -1343,7 +1343,7 @@ describe('postgres entity integration', () => {
13431343
});
13441344

13451345
await expect(
1346-
vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
1346+
vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
13471347
queryContext.appendPostCommitCallback(async () => {
13481348
postCommitCallCount++;
13491349
});

‎packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityQueryContextProvider-test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe(PostgresEntityQueryContextProvider, () => {
4141
await PostgresUniqueTestEntity.creator(vc1).setField('name', 'wat').createAsync()
4242
).getID();
4343

44-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
44+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
4545
const entity = await PostgresUniqueTestEntity.loader(vc1, queryContext).loadByIDAsync(id);
4646
await PostgresUniqueTestEntity.updater(entity, queryContext)
4747
.setField('name', 'wat2')
@@ -81,7 +81,7 @@ describe(PostgresEntityQueryContextProvider, () => {
8181
const entityLoaded = await PostgresUniqueTestEntity.loader(vc1).loadByIDAsync(entity.getID());
8282
expect(entityLoaded.getField('name')).toEqual('who');
8383

84-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
84+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
8585
const entityLoadedOuter = await PostgresUniqueTestEntity.loader(vc1).loadByIDAsync(
8686
entity.getID(),
8787
);
@@ -124,7 +124,7 @@ describe(PostgresEntityQueryContextProvider, () => {
124124
const entityLoaded = await PostgresUniqueTestEntity.loader(vc1).loadByIDAsync(entity.getID());
125125
expect(entityLoaded.getField('name')).toEqual('who');
126126

127-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
127+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
128128
const entityLoadedOuter = await PostgresUniqueTestEntity.loader(vc1).loadByIDAsync(
129129
entity.getID(),
130130
);
@@ -181,7 +181,7 @@ describe(PostgresEntityQueryContextProvider, () => {
181181
});
182182

183183
await Promise.all([
184-
vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
184+
vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
185185
const entityLoadedOuter = await PostgresUniqueTestEntity.loader(vc1).loadByIDAsync(
186186
entity.getID(),
187187
);
@@ -235,7 +235,7 @@ describe(PostgresEntityQueryContextProvider, () => {
235235
transactionalDataLoaderMode: TransactionalDataLoaderMode,
236236
): Promise<void> => {
237237
const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
238-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
238+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync(
239239
'postgres',
240240
async (outerQueryContext) => {
241241
// put it in local dataloader
@@ -334,7 +334,7 @@ describe(PostgresEntityQueryContextProvider, () => {
334334
transactionalDataLoaderMode: TransactionalDataLoaderMode,
335335
): Promise<void> => {
336336
const vc1 = new ViewerContext(createKnexIntegrationTestEntityCompanionProvider(knexInstance));
337-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync(
337+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync(
338338
'postgres',
339339
async (outerQueryContext) => {
340340
// put it in local dataloader
@@ -432,7 +432,7 @@ describe(PostgresEntityQueryContextProvider, () => {
432432
await PostgresUniqueTestEntity.creator(vc1).setField('name', 'wat').createAsync()
433433
).getID();
434434

435-
await vc1.runInTransactionForDatabaseAdaptorFlavorAsync('postgres', async (queryContext) => {
435+
await vc1.runInTransactionForDatabaseAdapterFlavorAsync('postgres', async (queryContext) => {
436436
await queryContext.runInNestedTransactionAsync(async (innerQueryContext) => {
437437
await innerQueryContext.runInNestedTransactionAsync(async (innerQueryContex2) => {
438438
await innerQueryContex2.runInNestedTransactionAsync(async (innerQueryContex3) => {

‎packages/entity-full-integration-tests/src/__integration-tests__/EntityCacheInconsistency-test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ describe('Entity cache inconsistency', () => {
181181

182182
openBarrier2!();
183183
})(),
184-
viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
184+
viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
185185
'postgres',
186186
async (queryContext) => {
187187
await TestEntity.updater(entity1, queryContext)

‎packages/entity/src/EntityCompanionProvider.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,13 @@ export class EntityCompanionProvider {
208208
});
209209
}
210210

211-
getQueryContextProviderForDatabaseAdaptorFlavor(
211+
getQueryContextProviderForDatabaseAdapterFlavor(
212212
databaseAdapterFlavor: DatabaseAdapterFlavor,
213213
): EntityQueryContextProvider {
214214
const entityDatabaseAdapterFlavor = this.databaseAdapterFlavors.get(databaseAdapterFlavor);
215215
invariant(
216216
entityDatabaseAdapterFlavor,
217-
`No database adaptor configuration found for flavor: ${databaseAdapterFlavor}`,
217+
`No database adapter configuration found for flavor: ${databaseAdapterFlavor}`,
218218
);
219219

220220
return entityDatabaseAdapterFlavor.queryContextProvider;
@@ -233,15 +233,15 @@ export class EntityCompanionProvider {
233233
);
234234
invariant(
235235
entityDatabaseAdapterFlavor,
236-
`No database adaptor configuration found for flavor: ${entityConfiguration.databaseAdapterFlavor}`,
236+
`No database adapter configuration found for flavor: ${entityConfiguration.databaseAdapterFlavor}`,
237237
);
238238

239239
const entityCacheAdapterFlavor = this.cacheAdapterFlavors.get(
240240
entityConfiguration.cacheAdapterFlavor,
241241
);
242242
invariant(
243243
entityCacheAdapterFlavor,
244-
`No cache adaptor configuration found for flavor: ${entityConfiguration.cacheAdapterFlavor}`,
244+
`No cache adapter configuration found for flavor: ${entityConfiguration.cacheAdapterFlavor}`,
245245
);
246246

247247
return new EntityTableDataCoordinator(

‎packages/entity/src/ViewerContext.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,30 @@ export class ViewerContext {
6464
}
6565

6666
/**
67-
* Get the regular (non-transactional) query context for a database adaptor flavor.
68-
* @param databaseAdaptorFlavor - database adaptor flavor
67+
* Get the regular (non-transactional) query context for a database adapter flavor.
68+
* @param databaseAdapterFlavor - database adapter flavor
6969
*/
70-
getQueryContextForDatabaseAdaptorFlavor(
71-
databaseAdaptorFlavor: DatabaseAdapterFlavor,
70+
getQueryContextForDatabaseAdapterFlavor(
71+
databaseAdapterFlavor: DatabaseAdapterFlavor,
7272
): EntityQueryContext {
7373
return this.entityCompanionProvider
74-
.getQueryContextProviderForDatabaseAdaptorFlavor(databaseAdaptorFlavor)
74+
.getQueryContextProviderForDatabaseAdapterFlavor(databaseAdapterFlavor)
7575
.getQueryContext();
7676
}
7777

7878
/**
79-
* Run a transaction of specified database adaptor flavor and execute the provided
79+
* Run a transaction of specified database adapter flavor and execute the provided
8080
* transaction-scoped closure within the transaction.
81-
* @param databaseAdaptorFlavor - databaseAdaptorFlavor
81+
* @param databaseAdapterFlavor - databaseAdapterFlavor
8282
* @param transactionScope - async callback to execute within the transaction
8383
*/
84-
async runInTransactionForDatabaseAdaptorFlavorAsync<TResult>(
85-
databaseAdaptorFlavor: DatabaseAdapterFlavor,
84+
async runInTransactionForDatabaseAdapterFlavorAsync<TResult>(
85+
databaseAdapterFlavor: DatabaseAdapterFlavor,
8686
transactionScope: (queryContext: EntityTransactionalQueryContext) => Promise<TResult>,
8787
transactionConfig?: TransactionConfig,
8888
): Promise<TResult> {
8989
return await this.entityCompanionProvider
90-
.getQueryContextProviderForDatabaseAdaptorFlavor(databaseAdaptorFlavor)
90+
.getQueryContextProviderForDatabaseAdapterFlavor(databaseAdapterFlavor)
9191
.getQueryContext()
9292
.runInTransactionIfNotInTransactionAsync(transactionScope, transactionConfig);
9393
}

‎packages/entity/src/__tests__/EntityQueryContext-test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe(EntityQueryContext, () => {
4949
);
5050
});
5151

52-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
52+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
5353
'postgres',
5454
async (queryContext) => {
5555
queryContext.appendPostCommitCallback(postCommitCallback);
@@ -76,7 +76,7 @@ describe(EntityQueryContext, () => {
7676
const postCommitCallback = jest.fn(async (): Promise<void> => {});
7777

7878
await expect(
79-
viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
79+
viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
8080
'postgres',
8181
async (queryContext) => {
8282
queryContext.appendPostCommitCallback(postCommitCallback);
@@ -105,7 +105,7 @@ describe(EntityQueryContext, () => {
105105
const postCommitCallback = jest.fn(async (): Promise<void> => {});
106106
const postCommitNestedCallback = jest.fn(async (): Promise<void> => {});
107107

108-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
108+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
109109
'postgres',
110110
async (queryContext) => {
111111
queryContext.appendPostCommitCallback(postCommitCallback);
@@ -152,13 +152,13 @@ describe(EntityQueryContext, () => {
152152
const viewerContext = new ViewerContext(companionProvider);
153153

154154
const queryContextProvider =
155-
companionProvider.getQueryContextProviderForDatabaseAdaptorFlavor('postgres');
155+
companionProvider.getQueryContextProviderForDatabaseAdapterFlavor('postgres');
156156
const queryContextProviderSpy = jest.spyOn(queryContextProvider, 'runInTransactionAsync');
157157

158158
const transactionScopeFn = async (): Promise<any> => {};
159159
const transactionConfig = { isolationLevel: TransactionIsolationLevel.SERIALIZABLE };
160160

161-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
161+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
162162
'postgres',
163163
transactionScopeFn,
164164
transactionConfig,
@@ -171,7 +171,7 @@ describe(EntityQueryContext, () => {
171171
const companionProvider = createUnitTestEntityCompanionProvider();
172172
const viewerContext = new ViewerContext(companionProvider);
173173

174-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
174+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
175175
'postgres',
176176
async (queryContext) => {
177177
assert(queryContext.isInTransaction());
@@ -182,7 +182,7 @@ describe(EntityQueryContext, () => {
182182
{ transactionalDataLoaderMode: TransactionalDataLoaderMode.DISABLED },
183183
);
184184

185-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
185+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
186186
'postgres',
187187
async (queryContext) => {
188188
assert(queryContext.isInTransaction());
@@ -193,7 +193,7 @@ describe(EntityQueryContext, () => {
193193
{ transactionalDataLoaderMode: TransactionalDataLoaderMode.ENABLED_BATCH_ONLY },
194194
);
195195

196-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
196+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
197197
'postgres',
198198
async (queryContext) => {
199199
assert(queryContext.isInTransaction());
@@ -252,7 +252,7 @@ describe(EntityQueryContext, () => {
252252
);
253253
const viewerContext = new ViewerContext(companionProvider);
254254

255-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
255+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
256256
'postgres',
257257
async (queryContext) => {
258258
assert(queryContext.isInTransaction());
@@ -263,7 +263,7 @@ describe(EntityQueryContext, () => {
263263
{ transactionalDataLoaderMode: TransactionalDataLoaderMode.DISABLED },
264264
);
265265

266-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
266+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
267267
'postgres',
268268
async (queryContext) => {
269269
assert(queryContext.isInTransaction());
@@ -274,7 +274,7 @@ describe(EntityQueryContext, () => {
274274
{ transactionalDataLoaderMode: TransactionalDataLoaderMode.ENABLED_BATCH_ONLY },
275275
);
276276

277-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
277+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
278278
'postgres',
279279
async (queryContext) => {
280280
assert(queryContext.isInTransaction());

‎packages/entity/src/__tests__/ViewerContext-test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ import { ViewerContext } from '../ViewerContext';
55
import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
66

77
describe(ViewerContext, () => {
8-
describe('getQueryContextForDatabaseAdaptorFlavor', () => {
8+
describe('getQueryContextForDatabaseAdapterFlavor', () => {
99
it('creates a new regular query context', () => {
1010
const companionProvider = createUnitTestEntityCompanionProvider();
1111
const viewerContext = new ViewerContext(companionProvider);
12-
const queryContext = viewerContext.getQueryContextForDatabaseAdaptorFlavor('postgres');
12+
const queryContext = viewerContext.getQueryContextForDatabaseAdapterFlavor('postgres');
1313
expect(queryContext).toBeInstanceOf(EntityQueryContext);
1414
expect(queryContext.isInTransaction()).toBe(false);
1515
});
1616
});
1717

18-
describe('runInTransactionForDatabaseAdaptorFlavorAsync', () => {
18+
describe('runInTransactionForDatabaseAdapterFlavorAsync', () => {
1919
it('creates a new transactional query context', async () => {
2020
const companionProvider = createUnitTestEntityCompanionProvider();
2121
const viewerContext = new ViewerContext(companionProvider);
2222
const didCreateTransaction =
23-
await viewerContext.runInTransactionForDatabaseAdaptorFlavorAsync(
23+
await viewerContext.runInTransactionForDatabaseAdapterFlavorAsync(
2424
'postgres',
2525
async (queryContext) => {
2626
return queryContext.isInTransaction();

‎packages/entity/src/internal/__tests__/EntityDataManager-test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ describe(EntityDataManager, () => {
120120
cacheSpy.mockClear();
121121
});
122122

123-
it('loads from a caching adaptor', async () => {
123+
it('loads from a caching adapter', async () => {
124124
const objects = getObjects();
125125
const dataStore = StubDatabaseAdapter.convertFieldObjectsToDataStore(
126126
testEntityConfiguration,

0 commit comments

Comments
 (0)