lsst-felis 27.2024.3200__tar.gz → 27.2024.3400__tar.gz

{lsst_felis-27.2024.3200/python/lsst_felis.egg-info → lsst_felis-27.2024.3400}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 27.2024.3200
+Version: 27.2024.3400
 Summary: A vocabulary for describing catalogs and acting on those descriptions
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: GNU General Public License v3 or later (GPLv3+)

{lsst_felis-27.2024.3200 → lsst_felis-27.2024.3400}/python/felis/datamodel.py

@@ -492,7 +492,7 @@ class Table(BaseObject):
     tap_table_index: int | None = Field(None, alias="tap:table_index")
     """IVOA TAP_SCHEMA table index of the table."""
 
-    mysql_engine: str | None = Field(None, alias="mysql:engine")
+    mysql_engine: str | None = Field("MyISAM", alias="mysql:engine")
     """MySQL engine to use for the table."""
 
     mysql_charset: str | None = Field(None, alias="mysql:charset")
@@ -773,6 +773,31 @@ class Schema(BaseObject):
                 table_indicies.add(table_index)
         return self
 
+    @model_validator(mode="after")
+    def check_unique_constraint_names(self: Schema) -> Schema:
+        """Check for duplicate constraint names in the schema.
+
+        Raises
+        ------
+        ValueError
+            Raised if duplicate constraint names are found in the schema.
+        """
+        constraint_names = set()
+        duplicate_names = []
+
+        for table in self.tables:
+            for constraint in table.constraints:
+                constraint_name = constraint.name
+                if constraint_name in constraint_names:
+                    duplicate_names.append(constraint_name)
+                else:
+                    constraint_names.add(constraint_name)
+
+        if duplicate_names:
+            raise ValueError(f"Duplicate constraint names found in schema: {duplicate_names}")
+
+        return self
+
     def _create_id_map(self: Schema) -> Schema:
         """Create a map of IDs to objects.
 

lsst_felis-27.2024.3400/python/felis/version.py

@@ -0,0 +1,2 @@
+__all__ = ["__version__"]
+__version__ = "27.2024.3400"

{lsst_felis-27.2024.3200 → lsst_felis-27.2024.3400/python/lsst_felis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 27.2024.3200
+Version: 27.2024.3400
 Summary: A vocabulary for describing catalogs and acting on those descriptions
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: GNU General Public License v3 or later (GPLv3+)

{lsst_felis-27.2024.3200 → lsst_felis-27.2024.3400}/tests/test_datamodel.py

@@ -466,6 +466,18 @@ class SchemaTestCase(unittest.TestCase):
             # Test that an invalid id raises an exception.
             sch["#bad_id"]
 
+    def test_check_unique_constraint_names(self) -> None:
+        """Test that constraint names are unique."""
+        test_col = Column(name="testColumn", id="#test_col_id", datatype="string", length=256)
+        test_tbl = Table(name="testTable", id="#test_table_id", columns=[test_col])
+        test_cons = UniqueConstraint(name="testConstraint", id="#test_constraint_id", columns=["testColumn"])
+        test_cons2 = UniqueConstraint(
+            name="testConstraint", id="#test_constraint2_id", columns=["testColumn"]
+        )
+        test_tbl.constraints = [test_cons, test_cons2]
+        with self.assertRaises(ValidationError):
+            Schema(name="testSchema", id="#test_id", tables=[test_tbl])
+
     def test_model_validate(self) -> None:
         """Load a YAML test file and validate the schema data model."""
         with open(TEST_YAML) as test_yaml:

lsst_felis-27.2024.3200/python/felis/version.py

@@ -1,2 +0,0 @@
-__all__ = ["__version__"]
-__version__ = "27.2024.3200"