2 files changed, 29 insertions, 10 deletions
diff --git a/migrations/auth/20221110_05_BaNtL-create-roles-table.py b/migrations/auth/20221110_05_BaNtL-create-roles-table.py
index bf238f6..edf3ea4 100644
--- a/migrations/auth/20221110_05_BaNtL-create-roles-table.py
+++ b/migrations/auth/20221110_05_BaNtL-create-roles-table.py
@@ -10,17 +10,9 @@ steps = [
     step(
         """
         CREATE TABLE IF NOT EXISTS roles(
-            group_id TEXT NOT NULL,
             role_id TEXT NOT NULL PRIMARY KEY,
-            role_name TEXT NOT NULL,
-            FOREIGN KEY(group_id) REFERENCES groups(group_id)
+            role_name TEXT NOT NULL
         ) WITHOUT ROWID
         """,
-        "DROP TABLE IF EXISTS roles"),
-    step(
-        """
-        CREATE INDEX IF NOT EXISTS idx_tbl_roles_cols_group_id
-        ON roles(group_id)
-        """,
-        "DROP INDEX IF EXISTS idx_tbl_roles_cols_group_id")
+        "DROP TABLE IF EXISTS roles")
 ]
diff --git a/migrations/auth/20221114_03_PtWjc-create-group-roles-table.py b/migrations/auth/20221114_03_PtWjc-create-group-roles-table.py
new file mode 100644
index 0000000..f314000
--- /dev/null
+++ b/migrations/auth/20221114_03_PtWjc-create-group-roles-table.py
@@ -0,0 +1,27 @@
+"""
+Create 'group_roles' table
+"""
+
+from yoyo import step
+
+__depends__ = {'20221114_02_DKKjn-drop-generic-role-tables'}
+
+steps = [
+    step(
+        """
+        CREATE TABLE IF NOT EXISTS group_roles(
+            group_id TEXT NOT NULL,
+            role_id TEXT NOT NULL,
+            PRIMARY KEY(group_id, role_id),
+            FOREIGN KEY(group_id) REFERENCES groups(group_id),
+            FOREIGN KEY(role_id) REFERENCES roles(role_id)
+        ) WITHOUT ROWID
+        """,
+        "DROP TABLE IF EXISTS group_roles"),
+    step(
+        """
+        CREATE INDEX IF NOT EXISTS idx_tbl_group_roles_cols_group_id
+        ON group_roles(group_id)
+        """,
+        "DROP INDEX IF EXISTS idx_tbl_group_roles_cols_group_id")
+]