|
|
|
@ -6472,7 +6472,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
return pkValues; |
|
|
|
|
} else if (this.model.primaryKey) { |
|
|
|
|
return ( |
|
|
|
|
data[this.model.primaryKey.title] || |
|
|
|
|
data[this.model.primaryKey.title] ?? |
|
|
|
|
data[this.model.primaryKey.column_name] |
|
|
|
|
); |
|
|
|
|
} else { |
|
|
|
@ -8747,7 +8747,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
typeof childIds[0] === 'object' |
|
|
|
|
? childIds.map( |
|
|
|
|
(c) => |
|
|
|
|
c[parentTable.primaryKey.title] || |
|
|
|
|
c[parentTable.primaryKey.title] ?? |
|
|
|
|
c[parentTable.primaryKey.column_name], |
|
|
|
|
) |
|
|
|
|
: childIds, |
|
|
|
@ -8830,7 +8830,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
typeof childIds[0] === 'object' |
|
|
|
|
? childIds.map( |
|
|
|
|
(c) => |
|
|
|
|
c[parentTable.primaryKey.title] || |
|
|
|
|
c[parentTable.primaryKey.title] ?? |
|
|
|
|
c[parentTable.primaryKey.column_name], |
|
|
|
|
) |
|
|
|
|
: childIds, |
|
|
|
@ -8871,7 +8871,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
typeof childIds[0] === 'object' |
|
|
|
|
? childIds.map( |
|
|
|
|
(c) => |
|
|
|
|
c[childTable.primaryKey.title] || |
|
|
|
|
c[childTable.primaryKey.title] ?? |
|
|
|
|
c[childTable.primaryKey.column_name], |
|
|
|
|
) |
|
|
|
|
: childIds, |
|
|
|
@ -9113,7 +9113,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
(r) => |
|
|
|
|
r[parentColumn.column_name] === |
|
|
|
|
(typeof id === 'object' |
|
|
|
|
? id[parentTable.primaryKey.title] || |
|
|
|
|
? id[parentTable.primaryKey.title] ?? |
|
|
|
|
id[parentTable.primaryKey.column_name] |
|
|
|
|
: id), |
|
|
|
|
), |
|
|
|
@ -9139,7 +9139,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
typeof childIds[0] === 'object' |
|
|
|
|
? childIds.map( |
|
|
|
|
(c) => |
|
|
|
|
c[parentTable.primaryKey.title] || |
|
|
|
|
c[parentTable.primaryKey.title] ?? |
|
|
|
|
c[parentTable.primaryKey.column_name], |
|
|
|
|
) |
|
|
|
|
: childIds, |
|
|
|
@ -9182,7 +9182,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
parentTable.primaryKey.column_name, |
|
|
|
|
childIds.map( |
|
|
|
|
(c) => |
|
|
|
|
c[parentTable.primaryKey.title] || |
|
|
|
|
c[parentTable.primaryKey.title] ?? |
|
|
|
|
c[parentTable.primaryKey.column_name], |
|
|
|
|
), |
|
|
|
|
); |
|
|
|
@ -9201,7 +9201,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
(r) => |
|
|
|
|
r[parentColumn.column_name] === |
|
|
|
|
(typeof id === 'object' |
|
|
|
|
? id[parentTable.primaryKey.title] || |
|
|
|
|
? id[parentTable.primaryKey.title] ?? |
|
|
|
|
id[parentTable.primaryKey.column_name] |
|
|
|
|
: id), |
|
|
|
|
), |
|
|
|
@ -9225,7 +9225,7 @@ class BaseModelSqlv2 {
|
|
|
|
|
typeof childIds[0] === 'object' |
|
|
|
|
? childIds.map( |
|
|
|
|
(c) => |
|
|
|
|
c[parentTable.primaryKey.title] || |
|
|
|
|
c[parentTable.primaryKey.title] ?? |
|
|
|
|
c[parentTable.primaryKey.column_name], |
|
|
|
|
) |
|
|
|
|
: childIds, |
|
|
|
|