Rename equals to equalsExp and equalsVal to equals

This commit is contained in:
Simon Binder 2019-02-10 10:47:34 +01:00
parent c143d17759
commit 05f020e7fe
4 changed files with 7 additions and 7 deletions

View File

@ -24,10 +24,10 @@ class Todos extends Table {
class ShopDb extends _$ShopDb { class ShopDb extends _$ShopDb {
Future<List<User>> allUsers() => select(users).get(); Future<List<User>> allUsers() => select(users).get();
Future<List<User>> userByName(String name) => Future<List<User>> userByName(String name) =>
(select(users)..where((u) => u.name.equalsVal(name))).get(); (select(users)..where((u) => u.name.equals(name))).get();
Future<void> deleteUser(User user) => Future<void> deleteUser(User user) =>
(delete(users)..where((u) => u.id.equalsVal(user.id))).go(); (delete(users)..where((u) => u.id.equals(user.id))).go();
@override @override
MigrationStrategy get migration => MigrationStrategy(); MigrationStrategy get migration => MigrationStrategy();

View File

@ -5,8 +5,8 @@ import 'package:sally/src/runtime/expressions/expression.dart';
import 'package:sally/src/runtime/sql_types.dart'; import 'package:sally/src/runtime/sql_types.dart';
abstract class Column<T, S extends SqlType<T>> extends Expression<S> { abstract class Column<T, S extends SqlType<T>> extends Expression<S> {
Expression<BoolType> equals(Expression<S> compare); Expression<BoolType> equalsExp(Expression<S> compare);
Expression<BoolType> equalsVal(T compare); Expression<BoolType> equals(T compare);
} }
abstract class IntColumn extends Column<int, IntType> { abstract class IntColumn extends Column<int, IntType> {

View File

@ -29,7 +29,7 @@ abstract class GeneratedColumn<T, S extends SqlType<T>> extends Column<T, S> {
String get typeName; String get typeName;
@override @override
Expression<BoolType> equals(Expression<S> compare) => Expression<BoolType> equalsExp(Expression<S> compare) =>
Comparison.equal(this, compare); Comparison.equal(this, compare);
@override @override
@ -38,7 +38,7 @@ abstract class GeneratedColumn<T, S extends SqlType<T>> extends Column<T, S> {
} }
@override @override
Expression<BoolType> equalsVal(T compare) => equals(Variable<T, S>(compare)); Expression<BoolType> equals(T compare) => equalsExp(Variable<T, S>(compare));
} }
class GeneratedTextColumn extends GeneratedColumn<String, StringType> class GeneratedTextColumn extends GeneratedColumn<String, StringType>

View File

@ -38,7 +38,7 @@ void main() {
test('generates complex predicates', () { test('generates complex predicates', () {
(db.select(db.users) (db.select(db.users)
..where((u) => ..where((u) =>
and(not(u.name.equalsVal('Dash')), (u.id.isBiggerThan(12))))) and(not(u.name.equals('Dash')), (u.id.isBiggerThan(12)))))
.get(); .get();
verify(executor.runSelect( verify(executor.runSelect(