Skip to content

Commit cc90b21

Browse files
yaroslav8765yaroslav8765
committed
chore: update db logs to support pino logger
1 parent 11efdf3 commit cc90b21

File tree

3 files changed

+22
-48
lines changed

3 files changed

+22
-48
lines changed

‎adminforth/dataConnectors/mysql.ts‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { AdminForthResource, IAdminForthSingleFilter, IAdminForthAndOrFilter, IA
33
import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, } from '../types/Common.js';
44
import AdminForthBaseConnector from './baseConnector.js';
55
import mysql from 'mysql2/promise';
6+
import { dbLogger } from '../modules/logger.js';
67

78
class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataSourceConnector {
89

@@ -317,9 +318,9 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
317318
if (orderBy) selectQuery += ` ${orderBy}`;
318319
if (limit) selectQuery += ` LIMIT ${limit}`;
319320
if (offset) selectQuery += ` OFFSET ${offset}`;
320-
if (process.env.HEAVY_DEBUG_QUERY) {
321-
console.log('🪲📜 MySQL Q:', selectQuery, 'values:', filterValues);
322-
}
321+
322+
dbLogger.trace(`🪲📜 MySQL Q: ${selectQuery} values: ${JSON.stringify(filterValues)}`);
323+
323324
const [results] = await this.client.execute(selectQuery, filterValues);
324325
return results.map((row) => {
325326
const newRow = {};
@@ -341,9 +342,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
341342
}
342343
const { sql: where, values: filterValues } = this.whereClauseAndValues(filters);
343344
const q = `SELECT COUNT(*) FROM ${tableName} ${where}`;
344-
if (process.env.HEAVY_DEBUG_QUERY) {
345-
console.log('🪲📜 MySQL Q:', q, 'values:', filterValues);
346-
}
345+
dbLogger.trace(`🪲📜 MySQL Q: ${q} values: ${JSON.stringify(filterValues)}`);
347346
const [results] = await this.client.execute(q, filterValues);
348347
return +results[0]["COUNT(*)"];
349348
}
@@ -353,9 +352,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
353352
const result = {};
354353
await Promise.all(columns.map(async (col) => {
355354
const q = `SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM ${tableName}`;
356-
if (process.env.HEAVY_DEBUG_QUERY) {
357-
console.log('🪲📜 MySQL Q:', q);
358-
}
355+
dbLogger.trace(`🪲📜 MySQL Q: ${q}`);
359356
const [results] = await this.client.execute(q);
360357
const { min, max } = results[0];
361358
result[col.name] = {
@@ -371,9 +368,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
371368
const placeholders = columns.map(() => '?').join(', ');
372369
const values = columns.map((colName) => typeof record[colName] === 'undefined' ? null : record[colName]);
373370
const q = `INSERT INTO ${tableName} (${columns.join(', ')}) VALUES (${placeholders})`;
374-
if (process.env.HEAVY_DEBUG_QUERY) {
375-
console.log('🪲📜 MySQL Q:', q, 'values:', values);
376-
}
371+
dbLogger.trace(`🪲📜 MySQL Q: ${q} values: ${JSON.stringify(values)}`);
377372
const ret = await this.client.execute(q, values);
378373
return ret.insertId;
379374
}
@@ -382,17 +377,13 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
382377
const values = [...Object.values(newValues), recordId];
383378
const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `${col} = ?`).join(', ');
384379
const q = `UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = ?`;
385-
if (process.env.HEAVY_DEBUG_QUERY) {
386-
console.log('🪲📜 MySQL Q:', q, 'values:', values);
387-
}
380+
dbLogger.trace(`🪲📜 MySQL Q: ${q} values: ${JSON.stringify(values)}`);
388381
await this.client.execute(q, values);
389382
}
390383

391384
async deleteRecord({ resource, recordId }): Promise<boolean> {
392385
const q = `DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} = ?`;
393-
if (process.env.HEAVY_DEBUG_QUERY) {
394-
console.log('🪲📜 MySQL Q:', q, 'values:', [recordId]);
395-
}
386+
dbLogger.trace(`🪲📜 MySQL Q: ${q} values: ${JSON.stringify([recordId])}`);
396387
const res = await this.client.execute(q, [recordId]);
397388
return res.rowCount > 0;
398389
}

‎adminforth/dataConnectors/postgres.ts‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { AdminForthResource, IAdminForthSingleFilter, IAdminForthAndOrFilter, IA
33
import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, } from '../types/Common.js';
44
import AdminForthBaseConnector from './baseConnector.js';
55
import pkg from 'pg';
6+
import { dbLogger } from '../modules/logger.js';
7+
68
const { Client } = pkg;
79

810

@@ -351,9 +353,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
351353
const d = [...filterValues, limit, offset];
352354
const orderBy = sort.length ? `ORDER BY ${sort.map((s) => `"${s.field}" ${this.SortDirectionsMap[s.direction]}`).join(', ')}` : '';
353355
const selectQuery = `SELECT ${columns} FROM "${tableName}" ${where} ${orderBy} ${limitOffset}`;
354-
if (process.env.HEAVY_DEBUG_QUERY) {
355-
console.log('🪲📜 PG Q:', selectQuery, 'params:', d);
356-
}
356+
dbLogger.trace(`🪲📜 PG Q: ${selectQuery}, params: ${JSON.stringify(d)}`);
357357
const stmt = await this.client.query(selectQuery, d);
358358
const rows = stmt.rows;
359359
return rows.map((row) => {
@@ -376,9 +376,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
376376
}
377377
const { sql: where, values: filterValues } = this.whereClauseAndValues(resource, filters);
378378
const q = `SELECT COUNT(*) FROM "${tableName}" ${where}`;
379-
if (process.env.HEAVY_DEBUG_QUERY) {
380-
console.log('🪲📜 PG Q:', q, 'values:', filterValues);
381-
}
379+
dbLogger.trace(`🪲📜 PG Q: ${q}, values: ${JSON.stringify(filterValues)}`);
382380
const stmt = await this.client.query(q, filterValues);
383381
return +stmt.rows[0].count;
384382
}
@@ -388,9 +386,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
388386
const result = {};
389387
await Promise.all(columns.map(async (col) => {
390388
const q = `SELECT MIN(${col.name}) as min, MAX(${col.name}) as max FROM "${tableName}"`;
391-
if (process.env.HEAVY_DEBUG_QUERY) {
392-
console.log('🪲📜 PG Q:', q);
393-
}
389+
dbLogger.trace(`🪲📜 PG Q: ${q}`);
394390
const stmt = await this.client.query(q);
395391
const { min, max } = stmt.rows[0];
396392
result[col.name] = {
@@ -412,9 +408,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
412408
const q = `INSERT INTO "${tableName}" (${columns.join(', ')}) VALUES (${placeholders}) RETURNING "${primaryKey}"`;
413409
// console.log('\n🔵 [PG INSERT]:', q);
414410
// console.log('📦 [VALUES]:', JSON.stringify(values, null, 2));
415-
if (process.env.HEAVY_DEBUG_QUERY) {
416-
console.log('🪲📜 PG Q:', q, 'values:', values);
417-
}
411+
dbLogger.trace(`🪲📜 PG Q: ${q}, values: ${JSON.stringify(values)}`);
418412
const ret = await this.client.query(q, values);
419413
return ret.rows[0][primaryKey];
420414
}
@@ -423,17 +417,13 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
423417
const values = [...Object.values(newValues), recordId];
424418
const columnsWithPlaceholders = Object.keys(newValues).map((col, i) => `"${col}" = $${i + 1}`).join(', ');
425419
const q = `UPDATE "${resource.table}" SET ${columnsWithPlaceholders} WHERE "${this.getPrimaryKey(resource)}" = $${values.length}`;
426-
if (process.env.HEAVY_DEBUG_QUERY) {
427-
console.log('🪲📜 PG Q:', q, 'values:', values);
428-
}
420+
dbLogger.trace(`🪲📜 PG Q: ${q}, values: ${JSON.stringify(values)}`);
429421
await this.client.query(q, values);
430422
}
431423

432424
async deleteRecord({ resource, recordId }): Promise<boolean> {
433425
const q = `DELETE FROM "${resource.table}" WHERE "${this.getPrimaryKey(resource)}" = $1`;
434-
if (process.env.HEAVY_DEBUG_QUERY) {
435-
console.log('🪲📜 PG Q:', q, 'values:', [recordId]);
436-
}
426+
dbLogger.trace(`🪲📜 PG Q: ${q}, values: ${JSON.stringify([recordId])}`);
437427
const res = await this.client.query(q, [recordId]);
438428
return res.rowCount > 0;
439429
}

‎adminforth/dataConnectors/sqlite.ts‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { IAdminForthDataSourceConnector, IAdminForthSingleFilter, IAdminForthAnd
33
import AdminForthBaseConnector from './baseConnector.js';
44
import dayjs from 'dayjs';
55
import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections } from '../types/Common.js';
6+
import { dbLogger } from '../modules/logger.js';
67

78
class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthDataSourceConnector {
89

@@ -287,9 +288,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
287288
const stmt = this.client.prepare(q);
288289
const d = [...filterValues, limit, offset];
289290

290-
if (process.env.HEAVY_DEBUG_QUERY) {
291-
console.log('🪲📜 SQLITE Q', q, 'params:', d);
292-
}
291+
dbLogger.trace(`🪲📜 SQLITE Q: ${q}, params: ${JSON.stringify(d)}`);
293292
const rows = await stmt.all(d);
294293

295294
return rows.map((row) => {
@@ -313,9 +312,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
313312
const where = this.whereClause(filters);
314313
const filterValues = this.getFilterParams(filters);
315314
const q = `SELECT COUNT(*) FROM ${tableName} ${where}`;
316-
if (process.env.HEAVY_DEBUG_QUERY) {
317-
console.log('🪲📜 SQLITE Q', q, 'params:', filterValues);
318-
}
315+
dbLogger.trace(`🪲📜 SQLITE Q: ${q}, params: ${JSON.stringify(filterValues)}`);
319316
const totalStmt = this.client.prepare(q);
320317
return +totalStmt.get([...filterValues])['COUNT(*)'];
321318
}
@@ -343,9 +340,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
343340
//console.log('\n🟢 [SQLITE INSERT]:', sql);
344341
//console.log('📦 [VALUES]:', JSON.stringify(values, null, 2));
345342
const q = this.client.prepare(sql);
346-
if (process.env.HEAVY_DEBUG_QUERY) {
347-
console.log('🪲📜 SQL Q:', q, 'values:', values);
348-
}
343+
dbLogger.trace(`🪲📜 SQLITE Q: ${sql}, values: ${JSON.stringify(values)}`);
349344
const ret = await q.run(values);
350345
return ret.lastInsertRowid;
351346
}
@@ -354,9 +349,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
354349
const columnsWithPlaceholders = Object.keys(newValues).map((col) => `${col} = ?`);
355350
const values = [...Object.values(newValues), recordId];
356351
const q = `UPDATE ${resource.table} SET ${columnsWithPlaceholders} WHERE ${this.getPrimaryKey(resource)} = ?`;
357-
if (process.env.HEAVY_DEBUG_QUERY) {
358-
console.log('🪲📜 SQLITE Q', q, 'params:', values);
359-
}
352+
dbLogger.trace(`🪲📜 SQLITE Q: ${q}, params: ${JSON.stringify(values)}`);
360353
const query = this.client.prepare(q);
361354
await query.run(values);
362355
}

0 commit comments

Comments
 (0)