chore: Deprecate extra in favor of driver options (#6772)

**What**
Deprecate databse_extra in favor of database_driver_options

Co-authored-by: Sebastian Rindom <7554214+srindom@users.noreply.github.com>
This commit is contained in:
Adrien de Peretti
2024-03-21 14:45:11 +00:00
committed by GitHub
co-authored by Sebastian Rindom
parent 56481e683d
commit 1ef9c78cea
8 changed files with 64 additions and 14 deletions
+5 -5
View File
@@ -8,15 +8,15 @@ import {
import {
ContainerRegistrationKeys,
FlagRouter,
MedusaV2Flag,
isObject,
MedusaV2Flag,
} from "@medusajs/utils"
import {
MODULE_PACKAGE_NAMES,
MedusaApp,
MedusaAppMigrateUp,
MedusaAppOutput,
MedusaModule,
MODULE_PACKAGE_NAMES,
Modules,
ModulesDefinition,
} from "@medusajs/modules-sdk"
@@ -71,7 +71,7 @@ export async function migrateMedusaApp(
injectedDependencies[ContainerRegistrationKeys.PG_CONNECTION]?.client
?.config?.connection?.connectionString ??
configModule.projectConfig.database_url,
driverOptions: configModule.projectConfig.database_extra,
driverOptions: configModule.projectConfig.database_driver_options,
debug: !!(configModule.projectConfig.database_logging ?? false),
},
}
@@ -136,7 +136,7 @@ export const loadMedusaApp = async (
const sharedResourcesConfig = {
database: {
clientUrl: configModule.projectConfig.database_url,
driverOptions: configModule.projectConfig.database_extra,
driverOptions: configModule.projectConfig.database_driver_options,
debug: !!(configModule.projectConfig.database_logging ?? false),
},
}
@@ -262,7 +262,7 @@ export async function runModulesLoader({
const sharedResourcesConfig = {
database: {
clientUrl: configModule.projectConfig.database_url,
driverOptions: configModule.projectConfig.database_extra,
driverOptions: configModule.projectConfig.database_driver_options,
debug: !!(configModule.projectConfig.database_logging ?? false),
},
}
+6 -6
View File
@@ -14,18 +14,18 @@ export default async ({ container, configModule }: Options): Promise<any> => {
// Share a knex connection to be consumed by the shared modules
const connectionString = configModule.projectConfig.database_url
const extra: any = configModule.projectConfig.database_extra || {}
const driverOptions: any =
configModule.projectConfig.database_driver_options || {}
const schema = configModule.projectConfig.database_schema || "public"
const idleTimeoutMillis = extra.idleTimeoutMillis ?? undefined // prevent null to be passed
const poolMax = extra.max
const idleTimeoutMillis = driverOptions.pool?.idleTimeoutMillis ?? undefined // prevent null to be passed
const poolMax = driverOptions.pool?.max
delete extra.max
delete extra.idleTimeoutMillis
delete driverOptions.pool
const pgConnection = ModulesSdkUtils.createPgConnection({
clientUrl: connectionString,
schema,
driverOptions: extra,
driverOptions,
pool: {
max: poolMax,
idleTimeoutMillis,