columns can now be passed into the select method

Author: dantownsend

docs/src/piccolo/query_types/select.rst

@@ -17,15 +17,15 @@ To get certain rows:
 
 .. code-block:: python
 
-    >>> Band.select().columns(Band.name).run_sync()
+    >>> Band.select(Band.name).run_sync()
     [{'name': 'Rustaceans'}, {'name': 'Pythonistas'}]
 
 Or making an alias to make it shorter:
 
 .. code-block:: python
 
     >>> b = Band
-    >>> b.select().columns(b.name).run_sync()
+    >>> b.select(b.name).run_sync()
     [{'id': 1, 'name': 'Pythonistas', 'manager': 1, 'popularity': 1000},
      {'id': 2, 'name': 'Rustaceans', 'manager': 2, 'popularity': 500}]
 
@@ -39,7 +39,7 @@ One of the most powerful things about select is it's support for joins.
 .. code-block:: python
 
     b = Band
-    b.select().columns(
+    b.select(
         b.name,
         b.manager.name
     ).run_sync()
@@ -50,7 +50,7 @@ The joins can go several layers deep.
 .. code-block:: python
 
     c = Concert
-    c.select().columns(
+    c.select(
         c.id,
         c.band_1.manager.name
     ).run_sync()
@@ -74,7 +74,8 @@ By default all columns are returned from the queried table.
     # Equivalent to SELECT * from band
     b.select().run_sync()
 
-To restrict the returned columns, used the `columns` method.
+To restrict the returned columns, either pass in the columns into the
+``select`` method, or use the `columns` method.
 
 .. code-block:: python
 

piccolo/query/base.py

@@ -22,7 +22,6 @@ def __init__(
         self.base = base
         self.table = table
         self._setup_delegates()
-        super().__init__()
 
     def _setup_delegates(self):
         pass

piccolo/query/methods/exists.py

@@ -24,8 +24,8 @@ def response_handler(self, response) -> bool:
     @property
     def querystring(self) -> QueryString:
         select = Select(
-            self.table,
-            QueryString(f"SELECT * FROM {self.table._meta.tablename}"),
+            table=self.table,
+            base=QueryString(f"SELECT * FROM {self.table._meta.tablename}"),
         )
         select.where_delegate._where = self.where_delegate._where
         return QueryString('SELECT EXISTS({}) AS "exists"', select.querystring)

piccolo/query/methods/objects.py

@@ -72,7 +72,7 @@ def response_handler(self, response):
 
     @property
     def querystring(self) -> QueryString:
-        select = Select(table=self.table, column_names=[])
+        select = Select(table=self.table)
 
         for attr in (
             "limit_delegate",

piccolo/query/methods/select.py

@@ -32,6 +32,15 @@ class Select(Query):
         "where_delegate",
     )
 
+    def __init__(
+        self,
+        table: t.Type[Table],
+        base: QueryString = QueryString(""),
+        columns: t.List[Column] = [],
+    ):
+        super().__init__(table=table, base=base)
+        self.columns(*columns)
+
     def _setup_delegates(self):
         self.columns_delegate = ColumnsDelegate()
         self.distinct_delegate = DistinctDelegate()

piccolo/table.py

@@ -285,14 +285,14 @@ def raw(cls, sql: str, *args: t.Any) -> Raw:
         return Raw(table=cls, base=QueryString(sql, *args))
 
     @classmethod
-    def select(cls) -> Select:
+    def select(cls, *columns: Column) -> Select:
         """
         Get data in the form of a list of dictionaries, with each dictionary
         representing a row.
 
         await Band.select().columns(Band.name).run()
         """
-        return Select(table=cls)
+        return Select(table=cls, columns=columns)
 
     @classmethod
     def delete(cls, force=False) -> Delete: