From 4b374597eb250c13da5062c1cc922e8fe7619e68 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 18:40:30 -0400
Subject: [PATCH] deletions

---
 .../lib/src/orm_generator.dart                | 11 ++++++
 .../lib/src/postgresql_orm_generator.dart     | 34 +++++++++++++++++++
 .../test/models/author.orm.g.dart             |  1 +
 .../test/models/author.postgresql.orm.g.dart  |  8 +++++
 .../test/models/car.orm.g.dart                |  1 +
 .../test/models/car.postgresql.orm.g.dart     |  8 +++++
 .../test/models/customer.orm.g.dart           |  1 +
 .../models/customer.postgresql.orm.g.dart     |  8 +++++
 .../test/models/foot.orm.g.dart               |  1 +
 .../test/models/foot.postgresql.orm.g.dart    |  8 +++++
 .../test/models/fruit.orm.g.dart              |  1 +
 .../test/models/fruit.postgresql.orm.g.dart   |  8 +++++
 .../test/models/order.orm.g.dart              |  1 +
 .../test/models/order.postgresql.orm.g.dart   |  8 +++++
 .../test/models/role.orm.g.dart               |  1 +
 .../test/models/role.postgresql.orm.g.dart    |  8 +++++
 16 files changed, 108 insertions(+)

diff --git a/angel_orm_generator/lib/src/orm_generator.dart b/angel_orm_generator/lib/src/orm_generator.dart
index f72e1191..359eb985 100644
--- a/angel_orm_generator/lib/src/orm_generator.dart
+++ b/angel_orm_generator/lib/src/orm_generator.dart
@@ -116,6 +116,7 @@ class OrmGenerator extends GeneratorForAnnotation<Orm> {
         // Next, add method stubs.
         // * getAll
         // * getById
+        // * deleteById
         // * updateX()
         // * createX()
         // * query()
@@ -141,6 +142,16 @@ class OrmGenerator extends GeneratorForAnnotation<Orm> {
               ..type = refer('String')));
         }));
 
+        // deleteById
+        clazz.methods.add(new Method((m) {
+          m
+            ..name = 'deleteById'
+            ..returns = futureOf(ctx.buildContext.modelClassName)
+            ..requiredParameters.add(new Parameter((b) => b
+              ..name = 'id'
+              ..type = refer('String')));
+        }));
+
         // createX()
         clazz.methods.add(new Method((m) {
           m
diff --git a/angel_orm_generator/lib/src/postgresql_orm_generator.dart b/angel_orm_generator/lib/src/postgresql_orm_generator.dart
index 29204b42..caac4456 100644
--- a/angel_orm_generator/lib/src/postgresql_orm_generator.dart
+++ b/angel_orm_generator/lib/src/postgresql_orm_generator.dart
@@ -71,6 +71,7 @@ class PostgreSqlOrmGenerator extends GeneratorForAnnotation<Orm> {
         }))
         ..methods.add(buildParseRowMethod(ctx))
         ..methods.add(buildGetById(ctx))
+        ..methods.add(buildDeleteById(ctx))
         ..methods.add(buildGetAll(ctx))
         ..methods.add(buildCreate(ctx))
         ..methods.add(buildUpdate(ctx));
@@ -213,6 +214,39 @@ class PostgreSqlOrmGenerator extends GeneratorForAnnotation<Orm> {
     });
   }
 
+  Method buildDeleteById(OrmBuildContext ctx) {
+    /* 
+      @override
+      Future<Author> getById(id) async  {
+        var r = await connection.query('');
+        return parseRow(r.first);
+      }
+     */
+    return new Method((m) {
+      m
+        ..name = 'deleteById'
+        ..annotations.add(refer('override'))
+        ..modifier = MethodModifier.async
+        ..requiredParameters.add(new Parameter((b) => b
+          ..name = 'id'
+          ..type = refer('String')))
+        ..returns = new TypeReference((b) => b
+          ..symbol = 'Future'
+          ..types.add(ctx.buildContext.modelClassType))
+        ..body = new Block((b) {
+          var fields = buildQuotedFieldString(ctx);
+          var queryString =
+              'DELETE FROM "${ctx.tableName}" WHERE id = @id RETURNING $fields;';
+          applyQueryAndReturnOne(
+              b,
+              queryString,
+              literalMap({
+                'id': refer('int').property('parse').call([refer('id')])
+              }));
+        });
+    });
+  }
+
   Method buildGetAll(OrmBuildContext ctx) {
     /*
       @override
diff --git a/angel_orm_generator/test/models/author.orm.g.dart b/angel_orm_generator/test/models/author.orm.g.dart
index e7c30d86..43d3befd 100644
--- a/angel_orm_generator/test/models/author.orm.g.dart
+++ b/angel_orm_generator/test/models/author.orm.g.dart
@@ -15,6 +15,7 @@ abstract class AuthorOrm {
 
   Future<List<Author>> getAll();
   Future<Author> getById(String id);
+  Future<Author> deleteById(String id);
   Future<Author> createAuthor(Author model);
   Future<Author> updateAuthor(Author model);
   AuthorQuery query();
diff --git a/angel_orm_generator/test/models/author.postgresql.orm.g.dart b/angel_orm_generator/test/models/author.postgresql.orm.g.dart
index e11d30ec..767b44f9 100644
--- a/angel_orm_generator/test/models/author.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/author.postgresql.orm.g.dart
@@ -27,6 +27,14 @@ class _PostgreSqlAuthorOrmImpl implements AuthorOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Author> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "authors" WHERE id = @id RETURNING  "id", "name", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Author>> getAll() async {
     var r = await connection
diff --git a/angel_orm_generator/test/models/car.orm.g.dart b/angel_orm_generator/test/models/car.orm.g.dart
index 8e7a44b1..9595ca52 100644
--- a/angel_orm_generator/test/models/car.orm.g.dart
+++ b/angel_orm_generator/test/models/car.orm.g.dart
@@ -15,6 +15,7 @@ abstract class CarOrm {
 
   Future<List<Car>> getAll();
   Future<Car> getById(String id);
+  Future<Car> deleteById(String id);
   Future<Car> createCar(Car model);
   Future<Car> updateCar(Car model);
   CarQuery query();
diff --git a/angel_orm_generator/test/models/car.postgresql.orm.g.dart b/angel_orm_generator/test/models/car.postgresql.orm.g.dart
index d48c2207..68270a27 100644
--- a/angel_orm_generator/test/models/car.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/car.postgresql.orm.g.dart
@@ -30,6 +30,14 @@ class _PostgreSqlCarOrmImpl implements CarOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Car> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "cars" WHERE id = @id RETURNING  "id", "make", "description", "family_friendly", "recalled_at", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Car>> getAll() async {
     var r = await connection.query(
diff --git a/angel_orm_generator/test/models/customer.orm.g.dart b/angel_orm_generator/test/models/customer.orm.g.dart
index 3afef6b8..da67eb6e 100644
--- a/angel_orm_generator/test/models/customer.orm.g.dart
+++ b/angel_orm_generator/test/models/customer.orm.g.dart
@@ -15,6 +15,7 @@ abstract class CustomerOrm {
 
   Future<List<Customer>> getAll();
   Future<Customer> getById(String id);
+  Future<Customer> deleteById(String id);
   Future<Customer> createCustomer(Customer model);
   Future<Customer> updateCustomer(Customer model);
   CustomerQuery query();
diff --git a/angel_orm_generator/test/models/customer.postgresql.orm.g.dart b/angel_orm_generator/test/models/customer.postgresql.orm.g.dart
index 2ca1fe76..61e75a2a 100644
--- a/angel_orm_generator/test/models/customer.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/customer.postgresql.orm.g.dart
@@ -26,6 +26,14 @@ class _PostgreSqlCustomerOrmImpl implements CustomerOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Customer> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "customers" WHERE id = @id RETURNING  "id", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Customer>> getAll() async {
     var r = await connection
diff --git a/angel_orm_generator/test/models/foot.orm.g.dart b/angel_orm_generator/test/models/foot.orm.g.dart
index 99295919..a71aa11c 100644
--- a/angel_orm_generator/test/models/foot.orm.g.dart
+++ b/angel_orm_generator/test/models/foot.orm.g.dart
@@ -15,6 +15,7 @@ abstract class FootOrm {
 
   Future<List<Foot>> getAll();
   Future<Foot> getById(String id);
+  Future<Foot> deleteById(String id);
   Future<Foot> createFoot(Foot model);
   Future<Foot> updateFoot(Foot model);
   FootQuery query();
diff --git a/angel_orm_generator/test/models/foot.postgresql.orm.g.dart b/angel_orm_generator/test/models/foot.postgresql.orm.g.dart
index 7442a506..e495a82c 100644
--- a/angel_orm_generator/test/models/foot.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/foot.postgresql.orm.g.dart
@@ -28,6 +28,14 @@ class _PostgreSqlFootOrmImpl implements FootOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Foot> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "foots" WHERE id = @id RETURNING  "id", "leg_id", "n_toes", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Foot>> getAll() async {
     var r = await connection.query(
diff --git a/angel_orm_generator/test/models/fruit.orm.g.dart b/angel_orm_generator/test/models/fruit.orm.g.dart
index b4e17442..b48b91d4 100644
--- a/angel_orm_generator/test/models/fruit.orm.g.dart
+++ b/angel_orm_generator/test/models/fruit.orm.g.dart
@@ -15,6 +15,7 @@ abstract class FruitOrm {
 
   Future<List<Fruit>> getAll();
   Future<Fruit> getById(String id);
+  Future<Fruit> deleteById(String id);
   Future<Fruit> createFruit(Fruit model);
   Future<Fruit> updateFruit(Fruit model);
   FruitQuery query();
diff --git a/angel_orm_generator/test/models/fruit.postgresql.orm.g.dart b/angel_orm_generator/test/models/fruit.postgresql.orm.g.dart
index 54b91920..275b2c22 100644
--- a/angel_orm_generator/test/models/fruit.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/fruit.postgresql.orm.g.dart
@@ -28,6 +28,14 @@ class _PostgreSqlFruitOrmImpl implements FruitOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Fruit> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "fruits" WHERE id = @id RETURNING  "id", "tree_id", "common_name", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Fruit>> getAll() async {
     var r = await connection.query(
diff --git a/angel_orm_generator/test/models/order.orm.g.dart b/angel_orm_generator/test/models/order.orm.g.dart
index 24258464..694cd615 100644
--- a/angel_orm_generator/test/models/order.orm.g.dart
+++ b/angel_orm_generator/test/models/order.orm.g.dart
@@ -15,6 +15,7 @@ abstract class OrderOrm {
 
   Future<List<Order>> getAll();
   Future<Order> getById(String id);
+  Future<Order> deleteById(String id);
   Future<Order> createOrder(Order model);
   Future<Order> updateOrder(Order model);
   OrderQuery query();
diff --git a/angel_orm_generator/test/models/order.postgresql.orm.g.dart b/angel_orm_generator/test/models/order.postgresql.orm.g.dart
index bb1f2ed2..759ca7c3 100644
--- a/angel_orm_generator/test/models/order.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/order.postgresql.orm.g.dart
@@ -30,6 +30,14 @@ class _PostgreSqlOrderOrmImpl implements OrderOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Order> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "orders" WHERE id = @id RETURNING  "id", "customer_id", "employee_id", "order_date", "shipper_id", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Order>> getAll() async {
     var r = await connection.query(
diff --git a/angel_orm_generator/test/models/role.orm.g.dart b/angel_orm_generator/test/models/role.orm.g.dart
index 66a4c339..993e4c60 100644
--- a/angel_orm_generator/test/models/role.orm.g.dart
+++ b/angel_orm_generator/test/models/role.orm.g.dart
@@ -15,6 +15,7 @@ abstract class RoleOrm {
 
   Future<List<Role>> getAll();
   Future<Role> getById(String id);
+  Future<Role> deleteById(String id);
   Future<Role> createRole(Role model);
   Future<Role> updateRole(Role model);
   RoleQuery query();
diff --git a/angel_orm_generator/test/models/role.postgresql.orm.g.dart b/angel_orm_generator/test/models/role.postgresql.orm.g.dart
index ea65367f..ba7af45c 100644
--- a/angel_orm_generator/test/models/role.postgresql.orm.g.dart
+++ b/angel_orm_generator/test/models/role.postgresql.orm.g.dart
@@ -27,6 +27,14 @@ class _PostgreSqlRoleOrmImpl implements RoleOrm {
     return parseRow(r.first);
   }
 
+  @override
+  Future<Role> deleteById(String id) async {
+    var r = await connection.query(
+        'DELETE FROM "roles" WHERE id = @id RETURNING  "id", "name", "created_at", "updated_at";',
+        substitutionValues: {'id': int.parse(id)});
+    return parseRow(r.first);
+  }
+
   @override
   Future<List<Role>> getAll() async {
     var r = await connection