Merge pull request #4 from mggg/delete-columns

Drop primary key and json value columns from column_value table
mggg · Oct 22, 2024 · ec8cded · ec8cded
2 parents ed77d9f + 2d6df9f
commit ec8cded
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/gerrydb_meta/crud/column.py b/gerrydb_meta/crud/column.py
@@ -202,8 +202,12 @@ def set_values(
 
         # Add the new column values and invalidate the old ones where present.
         geo_ids = [geo.geo_id for geo, _ in values]
-        with_values = (
-            db.query(models.ColumnValue.val_id)
+        with_tuples = (
+            db.query(
+                models.ColumnValue.col_id,
+                models.ColumnValue.geo_id,
+                models.ColumnValue.valid_from,
+            )
             .filter(
                 models.ColumnValue.col_id == col.col_id,
                 models.ColumnValue.geo_id.in_(geo_ids),
@@ -212,6 +216,8 @@ def set_values(
             .all()
         )
 
+        with_values = ["_".join([str(val) for val in tup]) for tup in with_tuples]
+
         with db.begin(nested=True):
             db.execute(insert(models.ColumnValue), rows)
             # Optimization: most column values are only set once, so we don't
@@ -220,9 +226,14 @@ def set_values(
                 db.execute(
                     update(models.ColumnValue)
                     .where(
-                        models.ColumnValue.val_id.in_(
-                            val.val_id for val in with_values
-                        ),
+                        "_".join(
+                            [
+                                str(models.ColumnValue.col_id),
+                                str(models.ColumnValue.geo_id),
+                                str(models.ColumnValue.valid_from),
+                            ]
+                        )
+                        in with_values
                     )
                     .values(valid_to=now)
                 )

diff --git a/gerrydb_meta/models.py b/gerrydb_meta/models.py
@@ -549,31 +549,32 @@ class ColumnValue(Base):
     __tablename__ = "column_value"
     __table_args__ = (UniqueConstraint("col_id", "geo_id", "valid_from"),)
 
-    val_id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     col_id: Mapped[int] = mapped_column(
         Integer,
         ForeignKey("column.col_id"),
         nullable=False,
+        primary_key=True,
     )
     geo_id: Mapped[int] = mapped_column(
         Integer,
         ForeignKey("geography.geo_id"),
         nullable=False,
+        primary_key=True,
     )
     meta_id: Mapped[int] = mapped_column(
         Integer, ForeignKey("meta.meta_id"), nullable=False
     )
     valid_from: Mapped[datetime] = mapped_column(
         DateTime(timezone=True),
         nullable=False,
+        primary_key=True,
     )
     valid_to: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=True)
 
     val_float: Mapped[float] = mapped_column(postgresql.DOUBLE_PRECISION, nullable=True)
     val_int: Mapped[int] = mapped_column(BigInteger, nullable=True)
     val_str: Mapped[str] = mapped_column(Text, nullable=True)
     val_bool: Mapped[bool] = mapped_column(Boolean, nullable=True)
-    val_json: Mapped[Any] = mapped_column(postgresql.JSONB, nullable=True)
 
     meta: Mapped[ObjectMeta] = relationship("ObjectMeta")
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/api/test_column_value.py b/tests/api/test_column_value.py
@@ -18,9 +18,8 @@
         (ColumnType.FLOAT, 1.0, float("inf")),
         (ColumnType.BOOL, True, False),
         (ColumnType.STR, "", "abc"),
-        (ColumnType.JSON, {"key": "value"}, [1, 2, "3"]),
     ],
-    ids=("int", "float", "bool", "str", "json"),
+    ids=("int", "float", "bool", "str"),
 )
 def test_api_column_value_set__two_geos(ctx_public_namespace_read_write, typed_vals):
     col_type, val1, val2 = typed_vals

diff --git a/tests/crud/test_column.py b/tests/crud/test_column.py
@@ -204,9 +204,6 @@ def test_crud_column_set_values(db_with_meta):
     assert cols_list[0].val_bool is None
     assert cols_list[1].val_bool is None
 
-    assert cols_list[0].val_json is None
-    assert cols_list[1].val_json is None
-
 
 def test_crud_column_patch(db_with_meta):
     db, meta = db_with_meta