sts-sponsors team mailing list archive

[Alberto Donato <mp+440881@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-site-manager:fix-db-schema into maas-site-manager:main.

Commit message:
remove extra indexes on primary keys, make SiteData.site_id unique

Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~ack/maas-site-manager/+git/site-manager/+merge/440881
-- 
Your team MAAS Committers is requested to review the proposed merge of ~ack/maas-site-manager:fix-db-schema into maas-site-manager:main.

diff --git a/backend/msm/db/_tables.py b/backend/msm/db/_tables.py
index 14dddc4..eb161d3 100644
--- a/backend/msm/db/_tables.py
+++ b/backend/msm/db/_tables.py
@@ -19,7 +19,7 @@ METADATA = MetaData()
 Site = Table(
     "sites",
     METADATA,
-    Column("id", Integer, primary_key=True, index=True),
+    Column("id", Integer, primary_key=True),
     Column("city", String(250)),
     # ISO 3166 Alpha2
     Column("country", String(2)),
@@ -39,7 +39,7 @@ Site = Table(
 User = Table(
     "users",
     METADATA,
-    Column("id", Integer, primary_key=True, index=True),
+    Column("id", Integer, primary_key=True),
     Column("email", String(250), unique=True, index=True),
     Column("full_name", String(250)),
     # this is the hashed password
@@ -51,7 +51,7 @@ User = Table(
 Token = Table(
     "tokens",
     METADATA,
-    Column("id", Integer, primary_key=True, index=True),
+    Column("id", Integer, primary_key=True),
     Column("site_id", Integer, ForeignKey("sites.id"), index=True),
     Column(
         "value", UUID(as_uuid=True), nullable=False, index=True, default=uuid4
@@ -64,9 +64,9 @@ Token = Table(
 SiteData = Table(
     "site_data",
     METADATA,
-    Column("id", Integer, primary_key=True, index=True),
+    Column("id", Integer, primary_key=True),
     Column(
-        "site_id", Integer, ForeignKey("sites.id"), index=True, nullable=False
+        "site_id", Integer, ForeignKey("sites.id"), unique=True, nullable=False
     ),
     Column("allocated_machines", Integer),
     Column("deployed_machines", Integer),