self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Chore: Refactor BaseModel queries

Browse Source
This commit is contained in:
Laurent Cozic
2023-12-23 21:38:42 +00:00
parent e744cf0171
commit 3dcbb2ed51
1 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/lib/BaseModel.ts
View File

@@ -5,6 +5,7 @@ import uuid from './uuid';
import time from './time';
import JoplinDatabase, { TableField } from './JoplinDatabase';
import { LoadOptions, SaveOptions } from './models/utils/types';
import { SqlQuery } from './services/database/types';
const Mutex = require('async-mutex').Mutex;
// New code should make use of this enum
@@ -336,24 +337,44 @@ class BaseModel {
return this.modelSelectAll(query.sql, query.params);
}
public static modelSelectOne(sql: string, params: any[] = null) {
public static async modelSelectOne(sqlOrSqlQuery: string | SqlQuery, params: any[] = null) {
if (params === null) params = [];
return this.db()
.selectOne(sql, params)
// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
.then((model: any) => {
return this.filter(this.addModelMd(model));
});
let sql = '';
if (typeof sqlOrSqlQuery !== 'string') {
sql = sqlOrSqlQuery.sql;
params = sqlOrSqlQuery.params ? sqlOrSqlQuery.params : [];
} else {
sql = sqlOrSqlQuery;
}
try {
const model = await this.db().selectOne(sql, params);
return this.filter(this.addModelMd(model));
} catch (error) {
error.message = `On query ${JSON.stringify({ sql, params })}: ${error.message}`;
throw error;
}
}
public static modelSelectAll<T = any>(sql: string, params: any[] = null): Promise<T[]> {
public static async modelSelectAll<T = any>(sqlOrSqlQuery: string | SqlQuery, params: any[] = null): Promise<T[]> {
if (params === null) params = [];
return this.db()
.selectAll(sql, params)
// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
.then((models: any[]) => {
return this.filterArray(this.addModelMd(models)) as T[];
});
let sql = '';
if (typeof sqlOrSqlQuery !== 'string') {
sql = sqlOrSqlQuery.sql;
params = sqlOrSqlQuery.params ? sqlOrSqlQuery.params : [];
} else {
sql = sqlOrSqlQuery;
}
try {
const models = await this.db().selectAll(sql, params);
return this.filterArray(this.addModelMd(models)) as T[];
} catch (error) {
error.message = `On query ${JSON.stringify({ sql, params })}: ${error.message}`;
throw error;
}
}
protected static selectFields(options: LoadOptions): string {