delete tweaks

Author: dantownsend

aragorm/columns/base.py

@@ -63,10 +63,10 @@ def __gt__(self, value) -> Where:
     def __ge__(self, value) -> Where:
         return Where(column=self, value=value, operator=GreaterEqualThan)
 
-    def __eq__(self, value) -> Where:
+    def __eq__(self, value) -> Where:  # type: ignore
         return Where(column=self, value=value, operator=Equal)
 
-    def __ne__(self, value) -> Where:
+    def __ne__(self, value) -> Where:  # type: ignore
         return Where(column=self, value=value, operator=NotEqual)
 
     def __str__(self):

aragorm/query/query_types.py

@@ -27,7 +27,7 @@ class Select(
     OutputMixin,
     WhereMixin,
 ):
-    def __init__(self, table: 'Table', column_names: t.List[str]) -> None:
+    def __init__(self, table: 'Table', column_names: t.Iterable[str]) -> None:
         self.column_names = column_names
         super().__init__(table=table, base='')
 

aragorm/table.py

@@ -24,6 +24,8 @@ class Database(object):
     async def run(*queries):
         """
         Use asyncio.gather here ...
+
+        I think I'll call it Engine instead ...
         """
         pass
 
@@ -110,14 +112,19 @@ def save(self):
         else:
             return cls.insert().add(self)
 
-    def delete(self):
+    def remove(self):
         """
         A proxy to a delete query.
         """
-        if type(self.id) != int:
+        _id = self.id
+
+        if type(_id) != int:
             raise ValueError('Can only delete pre-existing rows with an id.')
+
+        self.id = None
+
         return self.__class__.delete().where(
-            self.__class__.id == self.id
+            self.__class__.id == _id
         )
 
     def get_related(self):
@@ -255,7 +262,7 @@ def update(cls, **columns) -> Update:
         )
 
     @classmethod
-    def delete(cls, **columns) -> Delete:
+    def delete(cls) -> Delete:
         """
         await Pokemon.delete().where(Pokemon.name='weedle').run()
 

tests/table/test_join.py

@@ -3,17 +3,17 @@
 from ..example_project.tables import Pokemon, Stadium, Match
 
 
-# class TestCreateJoin():
+class TestCreateJoin():
 
-#     def test_create_join(self):
+    def test_create_join(self):
 
-#         Pokemon.create().run_sync()
-#         Stadium.create().run_sync()
-#         Match.create().run_sync()
+        Pokemon.create().run_sync()
+        Stadium.create().run_sync()
+        Match.create().run_sync()
 
-#         Match.drop().run_sync()
-#         Pokemon.drop().run_sync()
-#         Stadium.drop().run_sync()
+        Match.drop().run_sync()
+        Pokemon.drop().run_sync()
+        Stadium.drop().run_sync()
 
 
 class TestJoin(TestCase):
@@ -59,7 +59,6 @@ def test_join(self):
         response = select_query.run_sync()
         print(response)
 
-
     # def _test_ref(self):
     #     """
     #     Match.select().count().where(