Skip to content

Commit 45dac32

Browse files
committed
refactor: implement config class from utils
1 parent 8594bce commit 45dac32

5 files changed

Lines changed: 11 additions & 15 deletions

File tree

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"devDependencies": {
2727
"@secjs/env": "1.2.8",
2828
"@secjs/exceptions": "1.0.4",
29-
"@secjs/utils": "1.7.4",
29+
"@secjs/utils": "1.7.6",
3030
"@types/jest": "27.0.1",
3131
"@types/knex": "0.16.1",
3232
"@types/mime-types": "2.1.1",

src/Database.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414

1515
import { Drivers } from './Drivers/Drivers'
1616
import { JoinType } from './Contracts/JoinType'
17-
import { Config, PaginatedResponse } from '@secjs/utils'
17+
import { Config, PaginatedResponse, Path } from '@secjs/utils'
1818
import { DriverContract } from './Contracts/DriverContract'
1919
import { DatabaseContract } from './Contracts/DatabaseContract'
2020
import { TransactionContract } from './Contracts/TransactionContract'
@@ -66,6 +66,8 @@ export class Database implements DatabaseContract {
6666
}
6767

6868
constructor(runtimeConfig: any = {}) {
69+
new Config().safeLoad(Path.config('database'))
70+
6971
this.runtimeConfig = runtimeConfig
7072
this.driver = this.createDriverInstance()
7173
}

tests/database-mongodb.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import '@secjs/env/src/utils/global'
1111

12-
import { Config, Path } from '@secjs/utils'
1312
import { Database } from '../src/Database'
1413
import { MongoMemoryReplSet } from 'mongodb-memory-server'
1514
import { TableBuilder } from '../src/Builders/TableBuilder'
@@ -40,8 +39,6 @@ describe('\n Database Mongo Class', () => {
4039
process.env.DB_USERNAME = ''
4140
process.env.DB_PASSWORD = ''
4241
process.env.DB_FILENAME = ':memory:'
43-
44-
await new Config().load(Path.config('database.ts'))
4542
})
4643

4744
beforeEach(async () => {

tests/database-postgresql.spec.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import '@secjs/env/src/utils/global'
1111

1212
import { Knex } from 'knex'
13-
import { Config, Path } from '@secjs/utils'
1413
import { Database } from '../src/Database'
1514
import { DatabaseContract } from '../src/Contracts/DatabaseContract'
1615

@@ -24,8 +23,6 @@ describe('\n Database PostgreSQL Class', () => {
2423
process.env.DB_USERNAME = 'postgres'
2524
process.env.DB_PASSWORD = 'root'
2625
process.env.DB_FILENAME = ':memory:'
27-
28-
await new Config().load(Path.config('database.ts'))
2926
})
3027

3128
beforeEach(async () => {

0 commit comments

Comments
 (0)