fleshed out objects query

Author: Daniel Townsend

aragorm/query/__init__.py

@@ -27,14 +27,19 @@ class Select(
     OutputMixin,
     WhereMixin,
 ):
-    # columns_str => columns: t.List[str]
-    def __init__(self, table: 'Table', columns_str: str) -> None:
-        self.columns_str = columns_str
+    def __init__(self, table: 'Table', column_names: t.List[str]) -> None:
+        self.column_names = column_names
         super().__init__(table=table, base='')
 
     def __str__(self):
+        if len(self.column_names) == 0:
+            columns_str = '*'
+        else:
+            # TODO - make sure the columns passed in are valid
+            columns_str = ', '.join(self.column_names)
+
         select = 'SELECT DISTINCT' if self.distinct else 'SELECT'
-        query = f'{select} {self.columns_str} FROM "{self.table.Meta.tablename}"'
+        query = f'{select} {columns_str} FROM "{self.table.Meta.tablename}"'
 
         if self._where:
             query += f' WHERE {self._where.__str__()}'
@@ -48,8 +53,6 @@ def __str__(self):
         return query
 
 
-# TODO try and share as much between Select and Objects as possible ...
-#
 class Objects(
     Query,
     LimitMixin,
@@ -59,17 +62,23 @@ class Objects(
     """
     Almost identical to select, except you have to select all fields, and
     table instances are returned, rather than just data.
-
-    Inherits almost everything except OutputMixin, Distinct, Count,
     """
 
-    def __init__(self, table: 'Table') -> None:
-        # TODO - remove base altogether
-        self._output = Output(as_objects=True)
-        super().__init__(table=table, base='')
-
     def __str__(self):
-        pass
+        """
+        Need to do this without repeating select ...
+        """
+        select = Select(
+            table=self.table,
+            column_names=[]
+        )
+
+        for attr in ('_limit', '_where', 'order_by'):
+            setattr(select, attr, getattr(self, attr))
+
+        select._output = Output(as_objects=True)
+
+        return select.__str__()
 
 
 class Insert(Query, AddMixin):

aragorm/table.py

@@ -153,15 +153,9 @@ def select(cls, *column_names: str) -> Select:
         inspect that the column exists, and what we're trying to map it
         to doesn't already exist.
         """
-        if len(column_names) == 0:
-            columns_str = '*'
-        else:
-            # TODO - make sure the columns passed in are valid
-            columns_str = ', '.join(column_names)
-
         return Select(
             table=cls,
-            columns_str=columns_str
+            column_names=column_names
         )
 
     @classmethod
@@ -214,7 +208,8 @@ def update(cls, **columns) -> Update:
         """
         columns_str = ', '.join([
             f'{column} = {getattr(cls, column).format_value(value)}' for (
-                column, value) in columns.items()])
+                column, value) in columns.items()
+        ])
 
         return Update(
             table=cls,