Merge branch 'master' of github.com:telerytech/piccolo

Author: dantownsend

piccolo/table.py

@@ -1372,6 +1372,15 @@ def _table_str(
             columns.append(
                 f"{col._meta.name} = {col.__class__.__name__}({params_string})"
             )
+
+        for m2m_relationship in cls._meta.m2m_relationships:
+            joining_table_name = (
+                m2m_relationship._meta.resolved_joining_table.__name__
+            )
+            columns.append(
+                f"{m2m_relationship._meta.name} = M2M({joining_table_name})"
+            )
+
         columns_string = spacer.join(columns)
         tablename = repr(cls._meta.tablename)
 

tests/table/test_str.py

@@ -1,30 +1,20 @@
 from unittest import TestCase
 
-from tests.base import engine_is
-from tests.example_apps.music.tables import Manager
+from piccolo.apps.playground.commands.run import Genre, Manager
 
 
 class TestTableStr(TestCase):
-    def test_str(self):
-        if engine_is("cockroach"):
-            self.assertEqual(
-                Manager._table_str(),
-                (
-                    "class Manager(Table, tablename='manager'):\n"
-                    "    id = Serial(null=False, primary_key=True, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name='id', secret=False)\n"  # noqa: E501
-                    "    name = Varchar(length=50, default='', null=False, primary_key=False, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name=None, secret=False)\n"  # noqa: E501
-                ),
-            )
-        else:
-            self.assertEqual(
-                Manager._table_str(),
-                (
-                    "class Manager(Table, tablename='manager'):\n"
-                    "    id = Serial(null=False, primary_key=True, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name='id', secret=False)\n"  # noqa: E501
-                    "    name = Varchar(length=50, default='', null=False, primary_key=False, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name=None, secret=False)\n"  # noqa: E501
-                ),
-            )
+    def test_all_attributes(self):
+        self.assertEqual(
+            Manager._table_str(),
+            (
+                "class Manager(Table, tablename='manager'):\n"
+                "    id = Serial(null=False, primary_key=True, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name='id', secret=False)\n"  # noqa: E501
+                "    name = Varchar(length=50, default='', null=False, primary_key=False, unique=False, index=False, index_method=IndexMethod.btree, choices=None, db_column_name=None, secret=False)\n"  # noqa: E501
+            ),
+        )
 
+    def test_abbreviated(self):
         self.assertEqual(
             Manager._table_str(abbreviated=True),
             (
@@ -34,5 +24,23 @@ def test_str(self):
             ),
         )
 
-        # We should also be able to print it directly.
+    def test_m2m(self):
+        """
+        Make sure M2M relationships appear in the Table string.
+        """
+
+        self.assertEqual(
+            Genre._table_str(abbreviated=True),
+            (
+                "class Genre(Table):\n"
+                "    id = Serial()\n"
+                "    name = Varchar()\n"
+                "    bands = M2M(GenreToBand)\n"
+            ),
+        )
+
+    def test_print(self):
+        """
+        Make sure we can print it directly without any errors.
+        """
         print(Manager)