sasat 0.19.1 → 0.19.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -101,12 +101,11 @@ const makeChildFieldName = (column) => {
|
|
|
101
101
|
column.fieldName() +
|
|
102
102
|
EntityName.fromTableName(column.data.reference.parentTable).name);
|
|
103
103
|
};
|
|
104
|
-
const makeJoinCondition = (
|
|
105
|
-
const ref = column.data.reference;
|
|
104
|
+
const makeJoinCondition = (parentColumn, childColumn) => {
|
|
106
105
|
return [
|
|
107
106
|
{
|
|
108
|
-
left: { type: 'parent', field:
|
|
109
|
-
right: { type: 'child', field:
|
|
107
|
+
left: { type: 'parent', field: parentColumn },
|
|
108
|
+
right: { type: 'child', field: childColumn },
|
|
110
109
|
operator: '=',
|
|
111
110
|
},
|
|
112
111
|
];
|
|
@@ -125,7 +124,7 @@ export class ReferenceNode {
|
|
|
125
124
|
}
|
|
126
125
|
static fromReference(entity, column, parentTable) {
|
|
127
126
|
const ref = column.data.reference;
|
|
128
|
-
return new ReferenceNode(entity, ref.fieldName || makeChildFieldName(column), column.table.tableName, ref.parentTable, makeJoinCondition(column), false, false, column.isPrimary(), column.table.gqlOption.enabled && parentTable.gqlOption.enabled);
|
|
127
|
+
return new ReferenceNode(entity, ref.fieldName || makeChildFieldName(column), column.table.tableName, ref.parentTable, makeJoinCondition(column.columnName(), ref.parentColumn), false, false, column.isPrimary(), column.table.gqlOption.enabled && parentTable.gqlOption.enabled);
|
|
129
128
|
}
|
|
130
129
|
static formVirtualRelation(ds, entity, rel) {
|
|
131
130
|
return new ReferenceNode(entity, rel.childFieldName, rel.childTable, rel.parentTable, rel.conditions, false, false, false, ds.table(rel.parentTable).gqlOption.enabled &&
|
|
@@ -146,7 +145,7 @@ export class ReferencedNode {
|
|
|
146
145
|
}
|
|
147
146
|
static fromReference(entity, parentTable, column) {
|
|
148
147
|
const ref = column.data.reference;
|
|
149
|
-
return new ReferencedNode(entity, column.data.reference.parentFieldName || makeParentFieldName(column), column.table.tableName, makeJoinCondition(column), ref.relation === 'Many', ref.relation === 'OneOrZero', column.isPrimary(), parentTable.gqlOption.enabled && column.table.gqlOption.enabled, ref.relation);
|
|
148
|
+
return new ReferencedNode(entity, column.data.reference.parentFieldName || makeParentFieldName(column), column.table.tableName, makeJoinCondition(ref.parentColumn, column.columnName()), ref.relation === 'Many', ref.relation === 'OneOrZero', column.isPrimary(), parentTable.gqlOption.enabled && column.table.gqlOption.enabled, ref.relation);
|
|
150
149
|
}
|
|
151
150
|
static fromVirtualRelation(ds, entity, rel) {
|
|
152
151
|
return new ReferencedNode(entity, rel.parentFieldName, rel.childTable, rel.conditions, rel.relation === 'Many', rel.relation === 'OneOrZero', false, ds.table(rel.parentTable).gqlOption.enabled &&
|