Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions piccolo/apps/playground/commands/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@

from piccolo.columns import (
JSON,
M2M,
UUID,
Array,
Boolean,
Date,
ForeignKey,
Integer,
Interval,
LazyTableReference,
Numeric,
Serial,
Text,
Expand Down Expand Up @@ -161,6 +163,39 @@ def get_readable(cls) -> Readable:
)


class Movie(Table):
id: Serial
name = Varchar()
genres = M2M(LazyTableReference("GenreToMovie", module_path=__name__))

@classmethod
def get_readable(cls) -> Readable:
return Readable(
template="%s",
columns=[cls.name],
)


class Genre(Table):
id: Serial
name = Varchar()
movies = M2M(LazyTableReference("GenreToMovie", module_path=__name__))

@classmethod
def get_readable(cls) -> Readable:
return Readable(
template="%s",
columns=[cls.name],
)


class GenreToMovie(Table):
id: Serial
movie = ForeignKey(Movie)
genre = ForeignKey(Genre)
reason = Text(help_text="For testing additional columns on join tables.")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would change this to GenreToBand, as we already have a Band table.

Or GenreToAlbum, whichever makes more sense.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll use GenreToBand because as you say the Band table is already here. Thanks



TABLES = (
Manager,
Band,
Expand All @@ -171,6 +206,9 @@ def get_readable(cls) -> Readable:
DiscountCode,
RecordingStudio,
Album,
Movie,
Genre,
GenreToMovie,
)


Expand Down Expand Up @@ -282,6 +320,25 @@ def populate():
),
).run_sync()

movies = Movie.insert(
Movie(name="The Empire Strikes Back"),
Movie(name="Alien: Romulus"),
Movie(name="The Thinking Game"),
).run_sync()

genres = Genre.insert(
Genre(name="Sci-Fi"),
Genre(name="Horror"),
Genre(name="Documentary"),
).run_sync()

GenreToMovie.insert(
GenreToMovie(movie=movies[0]["id"], genre=genres[0]["id"]),
GenreToMovie(movie=movies[1]["id"], genre=genres[0]["id"]),
GenreToMovie(movie=movies[1]["id"], genre=genres[1]["id"]),
GenreToMovie(movie=movies[2]["id"], genre=genres[2]["id"]),
).run_sync()


def run(
engine: str = "sqlite",
Expand Down
65 changes: 18 additions & 47 deletions tests/columns/m2m/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from piccolo.engine.finder import engine_finder
from piccolo.schema import SchemaManager
from piccolo.table import Table, create_db_tables_sync, drop_db_tables_sync
from tests.base import engine_is, engines_skip
from tests.base import engines_skip

engine = engine_finder()

Expand Down Expand Up @@ -51,54 +51,25 @@ def _setUp(self, schema: Optional[str] = None):

create_db_tables_sync(*self.all_tables, if_not_exists=True)

if engine_is("cockroach"):
bands = (
Band.insert(
Band(name="Pythonistas"),
Band(name="Rustaceans"),
Band(name="C-Sharps"),
)
.returning(Band.id)
.run_sync()
)

genres = (
Genre.insert(
Genre(name="Rock"),
Genre(name="Folk"),
Genre(name="Classical"),
)
.returning(Genre.id)
.run_sync()
)

GenreToBand.insert(
GenreToBand(band=bands[0]["id"], genre=genres[0]["id"]),
GenreToBand(band=bands[0]["id"], genre=genres[1]["id"]),
GenreToBand(band=bands[1]["id"], genre=genres[1]["id"]),
GenreToBand(band=bands[2]["id"], genre=genres[0]["id"]),
GenreToBand(band=bands[2]["id"], genre=genres[2]["id"]),
).run_sync()
else:
Band.insert(
Band(name="Pythonistas"),
Band(name="Rustaceans"),
Band(name="C-Sharps"),
).run_sync()
bands = Band.insert(
Band(name="Pythonistas"),
Band(name="Rustaceans"),
Band(name="C-Sharps"),
).run_sync()
Comment on lines +54 to +58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting - this is much cleaner, thanks!


Genre.insert(
Genre(name="Rock"),
Genre(name="Folk"),
Genre(name="Classical"),
).run_sync()
genres = Genre.insert(
Genre(name="Rock"),
Genre(name="Folk"),
Genre(name="Classical"),
).run_sync()

GenreToBand.insert(
GenreToBand(band=1, genre=1),
GenreToBand(band=1, genre=2),
GenreToBand(band=2, genre=2),
GenreToBand(band=3, genre=1),
GenreToBand(band=3, genre=3),
).run_sync()
GenreToBand.insert(
GenreToBand(band=bands[0]["id"], genre=genres[0]["id"]),
GenreToBand(band=bands[0]["id"], genre=genres[1]["id"]),
GenreToBand(band=bands[1]["id"], genre=genres[1]["id"]),
GenreToBand(band=bands[2]["id"], genre=genres[0]["id"]),
GenreToBand(band=bands[2]["id"], genre=genres[2]["id"]),
).run_sync()

def tearDown(self):
drop_db_tables_sync(*self.all_tables)
Expand Down