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

Added Optional

Browse source
This commit is contained in:
thomashii@dukefirehawk.com 2021-05-03 21:47:12 +08:00
parent d241d7ca77
commit f27fe7381b
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/orm/angel_orm/lib/src/query.dart
View file

@ -27,6 +27,7 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
Query({this.parent});
@override
Map<String, dynamic> get substitutionValues =>
parent?.substitutionValues ?? super.substitutionValues;
@ -64,6 +65,8 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
n = nn;
nn++;
_names[name] = nn;
} else {
_names[name] = 1;
}
return n == 0 ? name : '$name$n';
}
@ -138,7 +141,7 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
}
}
String? Function() _compileJoin(tableName, Set<String> trampoline) {
String Function() _compileJoin(tableName, Set<String> trampoline) {
if (tableName is String) {
return () => tableName;
} else if (tableName is Query) {
@ -248,7 +251,8 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
var compiledJoins = <JoinBuilder, String?>{};
if (fields == null) {
//if (fields == null) {
if (fields.isEmpty) {
f = ['*'];
} else {
f = List<String>.from(fields.map((s) {
@ -325,7 +329,7 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
return super.getOne(executor);
}
Future<List<T>?> delete(QueryExecutor executor) {
Future<List<T>> delete(QueryExecutor executor) {
var sql = compile({}, preamble: 'DELETE', withFields: false);
if (_joins.isEmpty) {
@ -345,12 +349,12 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
}
}
Future<T?> deleteOne(QueryExecutor executor) {
return delete(executor)
.then((it) => it?.isEmpty == true ? null : it?.first);
Future<Optional<T>> deleteOne(QueryExecutor executor) {
return delete(executor).then((it) =>
it.isEmpty == true ? Optional.empty() : Optional.ofNullable(it.first));
}
Future<T?> insert(QueryExecutor executor) {
Future<Optional<T>> insert(QueryExecutor executor) {
var insertion = values.compileInsert(this, tableName);
if (insertion == null) {
@ -360,9 +364,10 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
var returning = fields.map(adornWithTableName).join(', ');
var sql = compile({});
sql = 'WITH $tableName as ($insertion RETURNING $returning) ' + sql;
return executor
.query(tableName, sql, substitutionValues)
.then((it) => it.isEmpty ? null : deserialize(it.first));
return executor.query(tableName, sql, substitutionValues).then((it) =>
it.isEmpty
? Optional.empty()
: Optional.ofNullable(deserialize(it.first)));
}
}
@ -390,7 +395,8 @@ abstract class Query<T, Where extends QueryWhere?> extends QueryBase<T> {
}
}
Future<T?> updateOne(QueryExecutor executor) {
return update(executor).then((it) => it.isEmpty ? null : it.first);
Future<Optional<T>> updateOne(QueryExecutor executor) {
return update(executor).then(
(it) => it.isEmpty ? Optional.empty() : Optional.ofNullable(it.first));
}
}

2
packages/orm/angel_orm/lib/src/query_executor.dart
View file

@ -19,5 +19,5 @@ abstract class QueryExecutor {
///
/// Whether nested transactions are supported depends on the
/// underlying driver.
Future<T?> transaction<T>(FutureOr<T> Function(QueryExecutor) f);
Future<T> transaction<T>(FutureOr<T> Function(QueryExecutor) f);
}

4
packages/orm/angel_orm/lib/src/query_values.dart
View file

@ -22,7 +22,7 @@ abstract class QueryValues {
var fieldSet = data.keys.join(', ');
var b = StringBuffer('INSERT INTO $tableName ($fieldSet) VALUES (');
int i = 0;
var i = 0;
for (var entry in data.entries) {
if (i++ > 0) b.write(', ');
@ -41,7 +41,7 @@ abstract class QueryValues {
var data = toMap();
if (data.isEmpty) return null;
var b = StringBuffer('SET');
int i = 0;
var i = 0;
for (var entry in data.entries) {
if (i++ > 0) b.write(',');