|
|
|
@ -99,9 +99,10 @@ class BaseModelSqlv2 {
|
|
|
|
|
|
|
|
|
|
qb.where(_wherePk(this.model.primaryKeys, id)); |
|
|
|
|
|
|
|
|
|
const data = (await this.extractRawQueryAndExec(qb))?.[0]; |
|
|
|
|
let data = (await this.extractRawQueryAndExec(qb))?.[0]; |
|
|
|
|
|
|
|
|
|
if (data) { |
|
|
|
|
data = this.convertAttachmentType(data); |
|
|
|
|
const proto = await this.getProto(); |
|
|
|
|
data.__proto__ = proto; |
|
|
|
|
} |
|
|
|
@ -251,7 +252,8 @@ class BaseModelSqlv2 {
|
|
|
|
|
|
|
|
|
|
if (!ignoreViewFilterAndSort) applyPaginate(qb, rest); |
|
|
|
|
const proto = await this.getProto(); |
|
|
|
|
const data = await this.extractRawQueryAndExec(qb); |
|
|
|
|
let data = await this.extractRawQueryAndExec(qb); |
|
|
|
|
data = this.convertAttachmentType(data); |
|
|
|
|
|
|
|
|
|
return data?.map((d) => { |
|
|
|
|
d.__proto__ = proto; |
|
|
|
@ -423,7 +425,8 @@ class BaseModelSqlv2 {
|
|
|
|
|
.as('list') |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
const children = await this.extractRawQueryAndExec(childQb); |
|
|
|
|
let children = await this.extractRawQueryAndExec(childQb); |
|
|
|
|
children = this.convertAttachmentType(children); |
|
|
|
|
const proto = await ( |
|
|
|
|
await Model.getBaseModelSQL({ |
|
|
|
|
id: childTable.id, |
|
|
|
@ -550,7 +553,8 @@ class BaseModelSqlv2 {
|
|
|
|
|
|
|
|
|
|
await childModel.selectObject({ qb }); |
|
|
|
|
|
|
|
|
|
const children = await this.extractRawQueryAndExec(qb); |
|
|
|
|
let children = await this.extractRawQueryAndExec(qb); |
|
|
|
|
children = this.convertAttachmentType(children); |
|
|
|
|
|
|
|
|
|
const proto = await ( |
|
|
|
|
await Model.getBaseModelSQL({ |
|
|
|
@ -668,6 +672,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
let children = await this.extractRawQueryAndExec(finalQb); |
|
|
|
|
children = this.convertAttachmentType(children); |
|
|
|
|
if (this.isMySQL) { |
|
|
|
|
children = children[0]; |
|
|
|
|
} |
|
|
|
@ -735,7 +740,8 @@ class BaseModelSqlv2 {
|
|
|
|
|
qb.limit(+rest?.limit || 25); |
|
|
|
|
qb.offset(+rest?.offset || 0); |
|
|
|
|
|
|
|
|
|
const children = await this.extractRawQueryAndExec(qb); |
|
|
|
|
let children = await this.extractRawQueryAndExec(qb); |
|
|
|
|
children = this.convertAttachmentType(children); |
|
|
|
|
const proto = await ( |
|
|
|
|
await Model.getBaseModelSQL({ id: rtnId, dbDriver: this.dbDriver }) |
|
|
|
|
).getProto(); |
|
|
|
@ -1076,7 +1082,8 @@ class BaseModelSqlv2 {
|
|
|
|
|
applyPaginate(qb, rest); |
|
|
|
|
|
|
|
|
|
const proto = await childModel.getProto(); |
|
|
|
|
const data = await this.extractRawQueryAndExec(qb); |
|
|
|
|
let data = await this.extractRawQueryAndExec(qb); |
|
|
|
|
data = this.convertAttachmentType(data); |
|
|
|
|
|
|
|
|
|
return data.map((c) => { |
|
|
|
|
c.__proto__ = proto; |
|
|
|
@ -1194,7 +1201,8 @@ class BaseModelSqlv2 {
|
|
|
|
|
applyPaginate(qb, rest); |
|
|
|
|
|
|
|
|
|
const proto = await parentModel.getProto(); |
|
|
|
|
const data = await this.extractRawQueryAndExec(qb); |
|
|
|
|
let data = await this.extractRawQueryAndExec(qb); |
|
|
|
|
data = this.convertAttachmentType(data); |
|
|
|
|
|
|
|
|
|
return data.map((c) => { |
|
|
|
|
c.__proto__ = proto; |
|
|
|
@ -2726,6 +2734,30 @@ class BaseModelSqlv2 {
|
|
|
|
|
) |
|
|
|
|
: await this.dbDriver.raw(query); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private convertAttachmentType(data) { |
|
|
|
|
// attachment is stored in text and parse in UI
|
|
|
|
|
// convertAttachmentType is used to convert the response in string to array of object in API response
|
|
|
|
|
if (data) { |
|
|
|
|
const attachmentColumns = this.model.columns.filter( |
|
|
|
|
(c) => c.uidt === UITypes.Attachment |
|
|
|
|
); |
|
|
|
|
if (attachmentColumns.length) { |
|
|
|
|
if (!Array.isArray(data)) { |
|
|
|
|
data = [data]; |
|
|
|
|
} |
|
|
|
|
data = data.map((d) => { |
|
|
|
|
attachmentColumns.forEach((col) => { |
|
|
|
|
if (d[col.title] && typeof d[col.title] === 'string') { |
|
|
|
|
d[col.title] = JSON.parse(d[col.title]); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
return d; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return data; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function extractSortsObject( |
|
|
|
|