sts-sponsors team mailing list archive

[Alberto Donato <mp+441070@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas-site-manager:varchar-to-text into maas-site-manager:main.

Commit message:
make text columns text instead of varchar

Requested reviews:
  MAAS Committers (maas-committers)

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

diff --git a/backend/msm/db/_tables.py b/backend/msm/db/_tables.py
index e6806ff..ed63497 100644
--- a/backend/msm/db/_tables.py
+++ b/backend/msm/db/_tables.py
@@ -7,7 +7,6 @@ from sqlalchemy import (
     Integer,
     MetaData,
     Numeric,
-    String,
     Table,
     Text,
 )
@@ -20,18 +19,17 @@ Site = Table(
     "site",
     METADATA,
     Column("id", Integer, primary_key=True),
-    Column("city", String(250)),
-    # ISO 3166 Alpha2
-    Column("country", String(2)),
-    Column("latitude", String(20)),
-    Column("longitude", String(20)),
-    Column("name", String(250), unique=True),
-    Column("note", Text()),
-    Column("region", String(250)),
-    Column("street", String(250)),
+    Column("city", Text),
+    Column("country", Text),  # ISO 3166 Alpha2
+    Column("latitude", Text),
+    Column("longitude", Text),
+    Column("name", Text, unique=True),
+    Column("note", Text),
+    Column("region", Text),
+    Column("street", Text),
     # Timezones need be up to x.25 accuracy
     Column("timezone", Numeric(precision=3, scale=2)),
-    Column("url", String(2048)),
+    Column("url", Text),
 )
 
 
@@ -39,10 +37,9 @@ User = Table(
     "user",
     METADATA,
     Column("id", Integer, primary_key=True),
-    Column("email", String(250), unique=True, index=True),
-    Column("full_name", String(250)),
-    # this is the hashed password
-    Column("password", String(100)),
+    Column("email", Text, unique=True, index=True),
+    Column("full_name", Text),
+    Column("password", Text),  # this is the hashed password
     Column("disabled", Boolean),
 )
 
diff --git a/backend/msm/schema.py b/backend/msm/schema.py
index 69c4a66..d1772d6 100644
--- a/backend/msm/schema.py
+++ b/backend/msm/schema.py
@@ -50,7 +50,7 @@ class CreateSite(BaseModel):
 
     name: str
     city: str | None
-    country: str | None
+    country: str | None = Field(min_length=2, max_length=2)
     latitude: str | None
     longitude: str | None
     note: str | None