From 05f020e7fe75dfe909e18134f9514d6c900b01f5 Mon Sep 17 00:00:00 2001
From: Simon Binder <simon@binder-online.biz>
Date: Sun, 10 Feb 2019 10:47:34 +0100
Subject: [PATCH] Rename equals to equalsExp and equalsVal to equals

---
 example/lib/example.dart                     | 4 ++--
 sally/lib/src/dsl/columns.dart               | 4 ++--
 sally/lib/src/runtime/structure/columns.dart | 4 ++--
 sally/test/queries_test.dart                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/example/lib/example.dart b/example/lib/example.dart
index b9cb0d19..89ba524b 100644
--- a/example/lib/example.dart
+++ b/example/lib/example.dart
@@ -24,10 +24,10 @@ class Todos extends Table {
 class ShopDb extends _$ShopDb {
   Future<List<User>> allUsers() => select(users).get();
   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) =>
-      (delete(users)..where((u) => u.id.equalsVal(user.id))).go();
+      (delete(users)..where((u) => u.id.equals(user.id))).go();
 
   @override
   MigrationStrategy get migration => MigrationStrategy();
diff --git a/sally/lib/src/dsl/columns.dart b/sally/lib/src/dsl/columns.dart
index a2843ecf..93dd627c 100644
--- a/sally/lib/src/dsl/columns.dart
+++ b/sally/lib/src/dsl/columns.dart
@@ -5,8 +5,8 @@ import 'package:sally/src/runtime/expressions/expression.dart';
 import 'package:sally/src/runtime/sql_types.dart';
 
 abstract class Column<T, S extends SqlType<T>> extends Expression<S> {
-  Expression<BoolType> equals(Expression<S> compare);
-  Expression<BoolType> equalsVal(T compare);
+  Expression<BoolType> equalsExp(Expression<S> compare);
+  Expression<BoolType> equals(T compare);
 }
 
 abstract class IntColumn extends Column<int, IntType> {
diff --git a/sally/lib/src/runtime/structure/columns.dart b/sally/lib/src/runtime/structure/columns.dart
index 8cc83c55..66cac965 100644
--- a/sally/lib/src/runtime/structure/columns.dart
+++ b/sally/lib/src/runtime/structure/columns.dart
@@ -29,7 +29,7 @@ abstract class GeneratedColumn<T, S extends SqlType<T>> extends Column<T, S> {
   String get typeName;
 
   @override
-  Expression<BoolType> equals(Expression<S> compare) =>
+  Expression<BoolType> equalsExp(Expression<S> compare) =>
       Comparison.equal(this, compare);
 
   @override
@@ -38,7 +38,7 @@ abstract class GeneratedColumn<T, S extends SqlType<T>> extends Column<T, S> {
   }
 
   @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>
diff --git a/sally/test/queries_test.dart b/sally/test/queries_test.dart
index d57cb96c..d231897d 100644
--- a/sally/test/queries_test.dart
+++ b/sally/test/queries_test.dart
@@ -38,7 +38,7 @@ void main() {
     test('generates complex predicates', () {
       (db.select(db.users)
             ..where((u) =>
-                and(not(u.name.equalsVal('Dash')), (u.id.isBiggerThan(12)))))
+                and(not(u.name.equals('Dash')), (u.id.isBiggerThan(12)))))
           .get();
 
       verify(executor.runSelect(