mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/update-orm'

Browse source
This commit is contained in:
thomashii 2022-01-02 18:16:04 +08:00
commit 03ef2705bd
6 changed files with 29 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/orm/angel_orm_generator/lib/src/orm_generator.dart
View file

@ -575,7 +575,7 @@ class OrmGenerator extends GeneratorForAnnotation<Orm> {
.toString() .toString()
.replaceAll('?', ''); .replaceAll('?', '');
merge.add(''' merge.add('''
$name: $typeLiteral.from(l.$name ?? [])..addAll(model.$name ?? []) $name: $typeLiteral.from(l.$name)..addAll(model.$name)
'''); ''');
} }
}); });

2
packages/orm/angel_orm_test/lib/src/edge_case_test.dart
View file

@ -118,7 +118,7 @@ void edgeCaseTests(FutureOr<QueryExecutor> Function() createExecutor,
fooOpt.ifPresent((foo) { fooOpt.ifPresent((foo) {
//print(foo.toJson()); //print(foo.toJson());
//print(weirdJoin!.toJson()); //print(weirdJoin!.toJson());
expect(foo.weirdJoins![0].id, weirdJoin!.id); expect(foo.weirdJoins[0].id, weirdJoin!.id);
}); });
}); });
}); });

18
packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart
View file

@ -139,8 +139,7 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
users: List<_User>.from(l.users ?? []) users: List<_User>.from(l.users)..addAll(model.users));
..addAll(model.users ?? []));
} }
}); });
}); });
@ -158,8 +157,7 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
users: List<_User>.from(l.users ?? []) users: List<_User>.from(l.users)..addAll(model.users));
..addAll(model.users ?? []));
} }
}); });
}); });
@ -177,8 +175,7 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
users: List<_User>.from(l.users ?? []) users: List<_User>.from(l.users)..addAll(model.users));
..addAll(model.users ?? []));
} }
}); });
}); });
@ -420,8 +417,7 @@ class UserQuery extends Query<User, UserQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles ?? []) roles: List<_Role>.from(l.roles)..addAll(model.roles));
..addAll(model.roles ?? []));
} }
}); });
}); });
@ -439,8 +435,7 @@ class UserQuery extends Query<User, UserQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles ?? []) roles: List<_Role>.from(l.roles)..addAll(model.roles));
..addAll(model.roles ?? []));
} }
}); });
}); });
@ -458,8 +453,7 @@ class UserQuery extends Query<User, UserQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles ?? []) roles: List<_Role>.from(l.roles)..addAll(model.roles));
..addAll(model.roles ?? []));
} }
}); });
}); });

9
packages/orm/angel_orm_test/lib/src/models/tree.g.dart
View file

@ -133,8 +133,7 @@ class TreeQuery extends Query<Tree, TreeQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
fruits: List<_Fruit>.from(l.fruits ?? []) fruits: List<_Fruit>.from(l.fruits)..addAll(model.fruits));
..addAll(model.fruits ?? []));
} }
}); });
}); });
@ -152,8 +151,7 @@ class TreeQuery extends Query<Tree, TreeQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
fruits: List<_Fruit>.from(l.fruits ?? []) fruits: List<_Fruit>.from(l.fruits)..addAll(model.fruits));
..addAll(model.fruits ?? []));
} }
}); });
}); });
@ -171,8 +169,7 @@ class TreeQuery extends Query<Tree, TreeQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
fruits: List<_Fruit>.from(l.fruits ?? []) fruits: List<_Fruit>.from(l.fruits)..addAll(model.fruits));
..addAll(model.fruits ?? []));
} }
}); });
}); });

27
packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart
View file

@ -321,9 +321,8 @@ class WeirdJoinQuery extends Query<WeirdJoin, WeirdJoinQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
numbas: List<_Numba>.from(l.numbas ?? []) numbas: List<_Numba>.from(l.numbas)..addAll(model.numbas),
..addAll(model.numbas ?? []), foos: List<_Foo>.from(l.foos)..addAll(model.foos));
foos: List<_Foo>.from(l.foos ?? [])..addAll(model.foos ?? []));
} }
}); });
}); });
@ -341,9 +340,8 @@ class WeirdJoinQuery extends Query<WeirdJoin, WeirdJoinQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
numbas: List<_Numba>.from(l.numbas ?? []) numbas: List<_Numba>.from(l.numbas)..addAll(model.numbas),
..addAll(model.numbas ?? []), foos: List<_Foo>.from(l.foos)..addAll(model.foos));
foos: List<_Foo>.from(l.foos ?? [])..addAll(model.foos ?? []));
} }
}); });
}); });
@ -361,9 +359,8 @@ class WeirdJoinQuery extends Query<WeirdJoin, WeirdJoinQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
numbas: List<_Numba>.from(l.numbas ?? []) numbas: List<_Numba>.from(l.numbas)..addAll(model.numbas),
..addAll(model.numbas ?? []), foos: List<_Foo>.from(l.foos)..addAll(model.foos));
foos: List<_Foo>.from(l.foos ?? [])..addAll(model.foos ?? []));
} }
}); });
}); });
@ -696,8 +693,8 @@ class FooQuery extends Query<Foo, FooQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
weirdJoins: List<_WeirdJoin>.from(l.weirdJoins ?? []) weirdJoins: List<_WeirdJoin>.from(l.weirdJoins)
..addAll(model.weirdJoins ?? [])); ..addAll(model.weirdJoins));
} }
}); });
}); });
@ -715,8 +712,8 @@ class FooQuery extends Query<Foo, FooQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
weirdJoins: List<_WeirdJoin>.from(l.weirdJoins ?? []) weirdJoins: List<_WeirdJoin>.from(l.weirdJoins)
..addAll(model.weirdJoins ?? [])); ..addAll(model.weirdJoins));
} }
}); });
}); });
@ -734,8 +731,8 @@ class FooQuery extends Query<Foo, FooQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
weirdJoins: List<_WeirdJoin>.from(l.weirdJoins ?? []) weirdJoins: List<_WeirdJoin>.from(l.weirdJoins)
..addAll(model.weirdJoins ?? [])); ..addAll(model.weirdJoins));
} }
}); });
}); });

18
packages/orm/angel_orm_test/lib/src/models/user.g.dart
View file

@ -154,8 +154,7 @@ class UserQuery extends Query<User, UserQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles ?? []) roles: List<_Role>.from(l.roles)..addAll(model.roles));
..addAll(model.roles ?? []));
} }
}); });
}); });
@ -173,8 +172,7 @@ class UserQuery extends Query<User, UserQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles ?? []) roles: List<_Role>.from(l.roles)..addAll(model.roles));
..addAll(model.roles ?? []));
} }
}); });
}); });
@ -192,8 +190,7 @@ class UserQuery extends Query<User, UserQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles ?? []) roles: List<_Role>.from(l.roles)..addAll(model.roles));
..addAll(model.roles ?? []));
} }
}); });
}); });
@ -495,8 +492,7 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
users: List<_User>.from(l.users ?? []) users: List<_User>.from(l.users)..addAll(model.users));
..addAll(model.users ?? []));
} }
}); });
}); });
@ -514,8 +510,7 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
users: List<_User>.from(l.users ?? []) users: List<_User>.from(l.users)..addAll(model.users));
..addAll(model.users ?? []));
} }
}); });
}); });
@ -533,8 +528,7 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
var l = out[idx]; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
users: List<_User>.from(l.users ?? []) users: List<_User>.from(l.users)..addAll(model.users));
..addAll(model.users ?? []));
} }
}); });
}); });