|
|
@ -4679,7 +4679,9 @@ class BaseModelSqlv2 { |
|
|
|
`${parentTable.table_name}.${parentColumn.column_name}`, |
|
|
|
`${parentTable.table_name}.${parentColumn.column_name}`, |
|
|
|
).andOn( |
|
|
|
).andOn( |
|
|
|
`${vTable.table_name}.${vChildCol.column_name}`, |
|
|
|
`${vTable.table_name}.${vChildCol.column_name}`, |
|
|
|
this.dbDriver.raw('?', [row[childColumn.column_name]]), |
|
|
|
this.dbDriver.raw('?', [ |
|
|
|
|
|
|
|
row[childColumn.title] ?? row[childColumn.column_name], |
|
|
|
|
|
|
|
]), |
|
|
|
); |
|
|
|
); |
|
|
|
}); |
|
|
|
}); |
|
|
|
// .where(_wherePk(parentTable.primaryKeys, childId))
|
|
|
|
// .where(_wherePk(parentTable.primaryKeys, childId))
|
|
|
|