chore(medusa): Typeorm upgrade to 0.3.11 (#3041)
This commit is contained in:
@@ -2,7 +2,7 @@ const path = require("path")
|
||||
|
||||
const { getConfigFile } = require("medusa-core-utils")
|
||||
const { dropDatabase } = require("pg-god")
|
||||
const { createConnection } = require("typeorm")
|
||||
const { DataSource } = require("typeorm")
|
||||
const dbFactory = require("./use-template-db")
|
||||
|
||||
const DB_HOST = process.env.DB_HOST
|
||||
@@ -27,13 +27,13 @@ const keepTables = [
|
||||
"currency",
|
||||
]
|
||||
|
||||
let connectionType = "postgresql"
|
||||
let dataSourceType = "postgresql"
|
||||
|
||||
const DbTestUtil = {
|
||||
db_: null,
|
||||
|
||||
setDb: function (connection) {
|
||||
this.db_ = connection
|
||||
setDb: function (dataSource) {
|
||||
this.db_ = dataSource
|
||||
},
|
||||
|
||||
clear: async function () {
|
||||
@@ -47,7 +47,7 @@ const DbTestUtil = {
|
||||
|
||||
const manager = this.db_.manager
|
||||
|
||||
if (connectionType === "sqlite") {
|
||||
if (dataSourceType === "sqlite") {
|
||||
await manager.query(`PRAGMA foreign_keys = OFF`)
|
||||
} else {
|
||||
await manager.query(`SET session_replication_role = 'replica';`)
|
||||
@@ -64,7 +64,7 @@ const DbTestUtil = {
|
||||
await manager.query(`DELETE
|
||||
FROM "${entity.tableName}";`)
|
||||
}
|
||||
if (connectionType === "sqlite") {
|
||||
if (dataSourceType === "sqlite") {
|
||||
await manager.query(`PRAGMA foreign_keys = ON`)
|
||||
} else {
|
||||
await manager.query(`SET session_replication_role = 'origin';`)
|
||||
@@ -72,7 +72,7 @@ const DbTestUtil = {
|
||||
},
|
||||
|
||||
shutdown: async function () {
|
||||
await this.db_.close()
|
||||
await this.db_.destroy()
|
||||
return await dropDatabase({ DB_NAME }, pgGodCredentials)
|
||||
},
|
||||
}
|
||||
@@ -88,14 +88,12 @@ module.exports = {
|
||||
require("@medusajs/medusa/dist/loaders/feature-flags").default
|
||||
|
||||
const featureFlagsRouter = featureFlagsLoader({ featureFlags })
|
||||
|
||||
const modelsLoader = require("@medusajs/medusa/dist/loaders/models").default
|
||||
|
||||
const entities = modelsLoader({}, { register: false })
|
||||
|
||||
if (projectConfig.database_type === "sqlite") {
|
||||
connectionType = "sqlite"
|
||||
const dbConnection = await createConnection({
|
||||
dataSourceType = "sqlite"
|
||||
const dataSource = new DataSource({
|
||||
type: "sqlite",
|
||||
database: projectConfig.database_database,
|
||||
synchronize: true,
|
||||
@@ -103,8 +101,10 @@ module.exports = {
|
||||
extra: database_extra ?? {},
|
||||
})
|
||||
|
||||
instance.setDb(dbConnection)
|
||||
return dbConnection
|
||||
const dbDataSource = await dataSource.initialize()
|
||||
|
||||
instance.setDb(dbDataSource)
|
||||
return dbDataSource
|
||||
} else {
|
||||
await dbFactory.createFromTemplate(DB_NAME)
|
||||
|
||||
@@ -138,7 +138,7 @@ module.exports = {
|
||||
(e) => typeof e.isFeatureEnabled === "undefined" || e.isFeatureEnabled()
|
||||
)
|
||||
|
||||
const dbConnection = await createConnection({
|
||||
const dbDataSource = new DataSource({
|
||||
type: "postgres",
|
||||
url: DB_URL,
|
||||
entities: enabledEntities.concat(moduleModels),
|
||||
@@ -147,10 +147,12 @@ module.exports = {
|
||||
name: "integration-tests",
|
||||
})
|
||||
|
||||
await dbConnection.runMigrations()
|
||||
await dbDataSource.initialize()
|
||||
|
||||
instance.setDb(dbConnection)
|
||||
return dbConnection
|
||||
await dbDataSource.runMigrations()
|
||||
|
||||
instance.setDb(dbDataSource)
|
||||
return dbDataSource
|
||||
}
|
||||
},
|
||||
useDb: function () {
|
||||
|
||||
Reference in New Issue
Block a user