Skip to content

fix(orm): resolve eager loading bugs and add column selection feature #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javad-zobeidi merged 3 commits into from
Nov 11, 2025
Merged

fix(orm): resolve eager loading bugs and add column selection feature #210

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55ca192
fix(orm): resolve concurrent modification error with multiple `includ…
javad-zobeidi Nov 10, 2025
0315d8e
fix(orm): correct eager loading for chained BelongsTo relations
javad-zobeidi Nov 11, 2025
d817d59
feat(orm): support selective column loading in `include()`
javad-zobeidi Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 42 additions & 16 deletions lib/src/database/orm/model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,22 +701,19 @@ abstract class Model extends QueryBuilderImpl {
if (!_relationsRegistered) {
registerRelations();
_relationsRegistered = true;
final rela = _relations[relation];
if (rela != null && rela is MorphTo) {
where(rela.morphType, '=', rela.type!);
}
}

final rela = _relations[relation];
if (rela != null && rela is MorphTo) {
where(rela.morphType, '=', rela.type!);
}

_withRelation.add(_RelationQuery(relation, callback));
return this;
}

void _clearWithRelation(_RelationQuery r) {
if (_withRelation.length == 1) {
_withRelation = [];
} else {
_withRelation.remove(r);
}
_withRelation = _withRelation.where((item) => item != r).toList();
}

Future<void> _eagerLoadRelation(
Expand All @@ -731,6 +728,23 @@ abstract class Model extends QueryBuilderImpl {

String primaryRelation = wr.first;

List<String> getColumns = ['*'];
final relationParts = primaryRelation.split(':');

if (relationParts.length > 1) {
primaryRelation = relationParts.first.trim();

final columnsString = relationParts.last.trim();

if (columnsString.isNotEmpty) {
getColumns = columnsString
.split(',')
.map((col) => col.trim())
.where((col) => col.isNotEmpty)
.toList();
}
}

if (!_relations.containsKey(primaryRelation)) {
throw InvalidArgumentException(
'Relation $relation not found in $runtimeType',
Expand Down Expand Up @@ -774,7 +788,16 @@ abstract class Model extends QueryBuilderImpl {
}
}
} else {
Set ids = models.map((m) => m[rela.localKey]).toSet();
late final String getLocalKey;
if (rela is BelongsTo) {
getLocalKey =
rela.foreignKey ??
'${rela.related.runtimeType.toString()}_id'.toLowerCase();
} else {
getLocalKey = rela.localKey;
}

Set ids = models.map((m) => m[getLocalKey]).toSet();

if (rela is BelongsToMany) {
qb =
Expand All @@ -796,23 +819,26 @@ abstract class Model extends QueryBuilderImpl {
qb = qb.whereIn(rela.foreignKey!, ids.toList()) as Model;
}
}
late final List<Map<String, dynamic>> results;

if (wr.length > 1) {
wr.removeAt(0);
var results = await qb.include(wr.join('.')).get();
callBack(rela.match(models, results, primaryRelation));
results = await qb.include(wr.join('.')).get(getColumns);
} else {
var results = await qb.get();

callBack(rela.match(models, results, primaryRelation));
results = await qb.get(getColumns);
}

callBack(rela.match(models, results, primaryRelation));
}
}

Future<List<Map<String, dynamic>>> _loadRelations(
List<Map<String, dynamic>> result,
) async {
if (_withRelation.isNotEmpty) {
for (_RelationQuery relation in _withRelation) {
final relationsToLoad = List<_RelationQuery>.from(_withRelation);

for (_RelationQuery relation in relationsToLoad) {
await _eagerLoadRelation(result, relation, (callBackResult) {
result = callBackResult;
});
Expand Down