Skip to content

Commit d977863

Browse files
authored
fix(dependencies): rollback ts-postgres (#105)
unexpected issue with versions higher than 1.3.0
1 parent 4bdcb19 commit d977863

3 files changed

Lines changed: 201 additions & 228 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "datadrop",
3-
"version": "1.11.0",
3+
"version": "1.11.1",
44
"type": "module",
55
"main": "./build/index.js",
66
"scripts": {
@@ -28,7 +28,7 @@
2828
"@sendgrid/mail": "8.1.3",
2929
"discord.js": "^14.16.2",
3030
"dotenv": "^16.4.5",
31-
"ts-postgres": "^1.9.0"
31+
"ts-postgres": "1.3.0"
3232
},
3333
"devDependencies": {
3434
"@types/node": "^20.12.7",

src/services/PostgresDatabaseService.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Snowflake } from 'discord.js';
2-
import { Client, DatabaseError, PreparedStatement } from 'ts-postgres';
2+
import { Client, DatabaseError, PreparedStatement, Value } from 'ts-postgres';
33

44
import { ConsoleLogger } from '@hunteroi/advanced-logger';
55

@@ -24,17 +24,14 @@ export default class PostgresDatabaseService implements IDatabaseService {
2424
port: Number(process.env.DATABASE_PORT),
2525
database: process.env.POSTGRES_DB
2626
});
27-
this.#database.on('error', (error: DatabaseError) => this.#logger.error(`Une erreur est survenue lors de l'utilisation de la base de données: \n${error.message}`));
27+
this.#listenToDatabaseEvents();
2828
}
2929

3030
/**
3131
* @inherited
3232
*/
3333
public async start(): Promise<void> {
34-
const connectionInfo = await this.#database.connect();
35-
if (!connectionInfo) throw new Error('Impossible de se connecter à la base de données.');
36-
37-
this.#logger.info(`Connecté à la base de données avec les données suivantes: ${JSON.stringify(connectionInfo)}`);
34+
await this.#database.connect();
3835

3936
await this.#database.query(`CREATE TABLE IF NOT EXISTS Migrations (
4037
id serial PRIMARY KEY,
@@ -166,6 +163,12 @@ export default class PostgresDatabaseService implements IDatabaseService {
166163
}
167164
}
168165

166+
#listenToDatabaseEvents() {
167+
this.#database.on('connect', () => this.#logger.info('Connexion établie avec la base de données!'));
168+
this.#database.on('end', () => this.#logger.info('Connexion fermée avec la base de données!'));
169+
this.#database.on('error', (error: DatabaseError) => this.#logger.error(`Une erreur est survenue lors de l'utilisation de la base de données: \n${error.message}`));
170+
}
171+
169172
#ascendingSort(string1: string, string2: string): number {
170173
if (string1 > string2) return 1;
171174
if (string1 < string2) return -1;
@@ -184,11 +187,11 @@ export default class PostgresDatabaseService implements IDatabaseService {
184187
return values.map(([prop], index) => prop + ' = $' + (index + offset)).join(', ');
185188
}
186189

187-
#deconstructValues(values: [string, any][]): any[] {
190+
#deconstructValues(values: [string, any][]): Value[] {
188191
return values.flatMap(([, v]) => v instanceof Object && typeof v !== 'bigint' ? JSON.stringify(v) : (v ?? null));
189192
}
190193

191-
async #executeStatement(statement: PreparedStatement, values: any[] = [], isSelect = true): Promise<User | undefined | null> {
194+
async #executeStatement(statement: PreparedStatement, values: Value[] = [], isSelect = true): Promise<User | undefined | null> {
192195
const notFoundMessage = 'User not found';
193196
try {
194197
const entities = await statement.execute(values);

0 commit comments

Comments
 (0)