@@ -12,10 +12,8 @@ import { makePgService as makePostGraphilePgService } from 'postgraphile/adaptor
1212
1313import { measureBenchmarkCase } from './metrics' ;
1414import {
15- DATABASE_URL_ENV ,
16- parseWorkerEnvelope ,
15+ parseWorkerProcessArgs ,
1716 redactSecret ,
18- WORKER_CONFIG_ENV ,
1917 writeWorkerResult ,
2018} from './process' ;
2119
@@ -46,26 +44,28 @@ const validateConfig = (value: unknown): ScopedWorkerConfig => {
4644} ;
4745
4846const main = async ( ) : Promise < void > => {
49- const databaseUrl = process . env [ DATABASE_URL_ENV ] ?? '' ;
47+ let databaseUrl = '' ;
5048 let caseName = 'unknown' ;
5149 let release : ( ( ) => Promise < void > ) | null = null ;
5250 try {
53- if ( ! databaseUrl ) throw new Error ( `${ DATABASE_URL_ENV } is required` ) ;
54- const envelope = parseWorkerEnvelope ( process . env [ WORKER_CONFIG_ENV ] ) ;
51+ const workerArgs = parseWorkerProcessArgs ( process . argv . slice ( 2 ) ) ;
52+ databaseUrl = workerArgs . databaseUrl ;
53+ const { envelope } = workerArgs ;
5554 caseName = envelope . caseName ;
5655 const config = validateConfig ( envelope . workerConfig ) ;
5756 const serviceOptions = {
5857 connectionString : databaseUrl ,
5958 schemas : config . schemas ,
6059 pubsub : false ,
6160 } ;
61+ const scopedServiceOptions = {
62+ ...serviceOptions ,
63+ introspectionScopedCatalogTypes : 'dependency-closure' as const ,
64+ } ;
6265 const service =
6366 config . mode === 'stock'
6467 ? makePostGraphilePgService ( serviceOptions )
65- : makeScopedPgService ( {
66- ...serviceOptions ,
67- introspectionScopedCatalogTypes : 'dependency-closure' ,
68- } ) ;
68+ : makeScopedPgService ( scopedServiceOptions ) ;
6969 release = async ( ) => {
7070 await service . release ( ) ;
7171 } ;
0 commit comments