moved drop table under alter - to help prevent accidental drops

Author: dantownsend

docs/src/piccolo/migrations/create.rst

@@ -57,7 +57,7 @@ forwards and backwards functions.
 
 
     async def backwards():
-        await Band.drop().run()
+        await Band.alter().drop_table().run()
 
 Running migrations
 ------------------

docs/src/piccolo/query_types/alter.rst

@@ -7,14 +7,16 @@ This is used to modify an existing table.
 
 .. hint:: It is typically used in conjunction with migrations - see :ref:`Migrations`.
 
+
 add_column
 ----------
 
 Used to add a column to an existing table.
 
 .. code-block:: python
 
-    Band.alter().add_column(‘members’, Integer()).run_sync()
+    Band.alter().add_column('members', Integer()).run_sync()
+
 
 drop_column
 -----------
@@ -23,7 +25,18 @@ Used to drop an existing column.
 
 .. code-block:: python
 
-    Band.alter().drop_column('popularity')
+    Band.alter().drop_column('popularity').run_sync()
+
+
+drop_table
+----------
+
+Used to drop the table - use with caution!
+
+.. code-block:: python
+
+    Band.alter().drop_table().run_sync()
+
 
 rename_column
 -------------
@@ -32,7 +45,8 @@ Used to rename an existing column.
 
 .. code-block:: python
 
-    Band.alter().rename_column(Band.popularity, ‘rating’).run_sync()
+    Band.alter().rename_column(Band.popularity, 'rating').run_sync()
+
 
 set_null
 --------

docs/src/piccolo/query_types/drop.rst

@@ -12,7 +12,6 @@ focus on `select`, `insert` and `update`.
     ./count
     ./create
     ./delete
-    ./drop
     ./exists
     ./insert
     ./objects

docs/src/piccolo/query_types/index.rst

@@ -42,7 +42,7 @@ def populate():
     for _table in reversed(TABLES):
         try:
             if _table.table_exists().run_sync():
-                _table.drop().run_sync()
+                _table.alter().drop_table().run_sync()
         except Exception as e:
             print(e)
 

piccolo/commands/playground.py

@@ -8,7 +8,6 @@
     Create,
     Update,
     Raw,
-    Drop,
     TableExists,
     Exists,
     Count,

piccolo/query/__init__.py

@@ -2,7 +2,6 @@
 from .count import Count
 from .create import Create
 from .delete import Delete
-from .drop import Drop
 from .exists import Exists
 from .insert import Insert
 from .objects import Objects

piccolo/query/methods/__init__.py

@@ -85,7 +85,8 @@ def querystring(self) -> QueryString:
 
 
 class Alter(Query):
-    __slots__ = ("_add", "_drop", "_rename", "_unique", "_null")
+
+    __slots__ = ("_add", "_drop", "_rename", "_unique", "_null", "_drop_table")
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -94,6 +95,7 @@ def __init__(self, *args, **kwargs):
         self._rename: t.List[Rename] = []
         self._unique: t.List[Unique] = []
         self._null: t.List[Null] = []
+        self._drop_table = False
 
     def add_column(self, name: str, column: Column) -> Alter:
         """
@@ -109,6 +111,13 @@ def drop_column(self, column: Column) -> Alter:
         self._drop.append(Drop(column))
         return self
 
+    def drop_table(self) -> Alter:
+        """
+        Band.alter().drop_table()
+        """
+        self._drop_table = True
+        return self
+
     def rename_column(self, column: Column, new_name: str) -> Alter:
         """
         Band.alter().rename_column(Band.popularity, ‘rating’)
@@ -132,6 +141,9 @@ def set_unique(self, column: Column, boolean: bool = True) -> Alter:
 
     @property
     def querystring(self) -> QueryString:
+        if self._drop_table:
+            return QueryString(f'DROP TABLE "{self.table._meta.tablename}"')
+
         query = f"ALTER TABLE {self.table._meta.tablename}"
 
         alterations = [

piccolo/query/methods/alter.py

@@ -10,7 +10,6 @@
     Create,
     Count,
     Delete,
-    Drop,
     Exists,
     Insert,
     Objects,
@@ -327,15 +326,6 @@ def create_without_columns(cls) -> Raw:
             base=QueryString(f'CREATE TABLE "{cls._meta.tablename}"()'),
         )
 
-    @classmethod
-    def drop(cls) -> Drop:
-        """
-        Drops the table.
-
-        await Band.drop().run()
-        """
-        return Drop(table=cls)
-
     @classmethod
     def alter(cls) -> Alter:
         """