connect later #11

Merged
jusax23 merged 2 commits from dev into main 2023-02-25 19:12:17 +01:00
Showing only changes of commit 871c4d6be7 - Show all commits

View file

@ -15,10 +15,10 @@ export class DB {
type: dbType; type: dbType;
mariaPool!: mariadb.Pool; mariaPool!: mariadb.Pool;
//pgPool!: pg.Pool; //pgPool!: pg.Pool;
constructor({ host, user, password, database, connectionLimit = 5, databaseType = dbType.mariadb }: { host: string, user: string, password: string, database: string, connectionLimit?: number, databaseType?: dbType }) { constructor({ host, user, password, database, port = 3306, connectionLimit = 5, databaseType = dbType.mariadb }: { host: string, user: string, password: string, database: string, port?: number, connectionLimit?: number, databaseType?: dbType }) {
this.type = databaseType; this.type = databaseType;
if (databaseType == dbType.mariadb) { if (databaseType == dbType.mariadb) {
this.mariaPool = mariadb.createPool({ host, user, password, database, connectionLimit, multipleStatements: true }); this.mariaPool = mariadb.createPool({ host, user, password, port, database, connectionLimit, multipleStatements: true });
this.handler = new Handler(this); this.handler = new Handler(this);
} }
/*else if (databaseType == dbType.postgres) { /*else if (databaseType == dbType.postgres) {
@ -30,7 +30,7 @@ export class DB {
this.name = database; this.name = database;
} }
async query(query: Query, printQuery = false) { async query(query: Query, printQuery = false) {
if(printQuery)console.log(query); if (printQuery) console.log(query);
if (this.type == dbType.mariadb) return await this.mariaPool.query(query); if (this.type == dbType.mariadb) return await this.mariaPool.query(query);
/*else if (this.type == dbType.postgres) { /*else if (this.type == dbType.postgres) {
let res = await this.pgPool.query(query.sql, query.values); let res = await this.pgPool.query(query.sql, query.values);
@ -115,8 +115,8 @@ export class Attribute {
toStringFunc(handler: Handler) { toStringFunc(handler: Handler) {
return this.table.serialize(handler) + "(" + this.serialize(handler) + ")"; return this.table.serialize(handler) + "(" + this.serialize(handler) + ")";
} }
toString(){ toString() {
return this.table.dbLangTableName + "_" + this.name; return this.table.dbLangTableName + "_" + this.name;
} }
} }