lsst-felis 28.0.0rc1__tar.gz → 28.2024.4500__tar.gz

{lsst_felis-28.0.0rc1/python/lsst_felis.egg-info → lsst_felis-28.2024.4500}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 28.0.0rc1
+Version: 28.2024.4500
 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-28.0.0rc1 → lsst_felis-28.2024.4500}/python/felis/db/utils.py

@@ -280,7 +280,12 @@ class DatabaseContext:
         create a new schema. For other variants, this is an unsupported
         operation.
         """
+        if self.engine.dialect.name == "sqlite":
+            # Initialization is unneeded for sqlite.
+            return
         schema_name = self.metadata.schema
+        if schema_name is None:
+            raise ValueError("Schema name is required to initialize the schema.")
         try:
             if self.dialect_name == "mysql":
                 logger.debug(f"Checking if MySQL database exists: {schema_name}")
@@ -304,11 +309,6 @@ class DatabaseContext:
                     raise ValueError(f"PostgreSQL schema '{schema_name}' already exists.")
                 logger.debug(f"Creating PG schema: {schema_name}")
                 self.execute(CreateSchema(schema_name))
-            elif self.dialect_name == "sqlite":
-                # Just silently ignore this operation for SQLite. The database
-                # will still be created if it does not exist and the engine
-                # URL is valid.
-                pass
             else:
                 raise ValueError(f"Initialization not supported for: {self.dialect_name}")
         except SQLAlchemyError as e:
@@ -326,24 +326,24 @@ class DatabaseContext:
         Notes
         -----
         In MySQL, this will drop a database. In PostgreSQL, it will drop a
-        schema. For other variants, this is an unsupported operation.
+        schema. A SQlite database will have all its tables dropped. For other
+        database variants, this is currently an unsupported operation.
         """
-        schema_name = self.metadata.schema
-        if not self.engine.dialect.name == "sqlite" and self.metadata.schema is None:
-            raise ValueError("Schema name is required to drop the schema.")
         try:
-            if self.dialect_name == "mysql":
-                logger.debug(f"Dropping MySQL database if exists: {schema_name}")
-                self.execute(text(f"DROP DATABASE IF EXISTS {schema_name}"))
-            elif self.dialect_name == "postgresql":
-                logger.debug(f"Dropping PostgreSQL schema if exists: {schema_name}")
-                self.execute(DropSchema(schema_name, if_exists=True, cascade=True))
-            elif self.dialect_name == "sqlite":
+            if self.dialect_name == "sqlite":
                 if isinstance(self.engine, Engine):
                     logger.debug("Dropping tables in SQLite schema")
                     self.metadata.drop_all(bind=self.engine)
             else:
-                raise ValueError(f"Drop operation not supported for: {self.dialect_name}")
+                schema_name = self.metadata.schema
+                if schema_name is None:
+                    raise ValueError("Schema name is required to drop the schema.")
+                if self.dialect_name == "mysql":
+                    logger.debug(f"Dropping MySQL database if exists: {schema_name}")
+                    self.execute(text(f"DROP DATABASE IF EXISTS {schema_name}"))
+                elif self.dialect_name == "postgresql":
+                    logger.debug(f"Dropping PostgreSQL schema if exists: {schema_name}")
+                    self.execute(DropSchema(schema_name, if_exists=True, cascade=True))
         except SQLAlchemyError as e:
             logger.error(f"Error dropping schema: {e}")
             raise

lsst_felis-28.2024.4500/python/felis/version.py

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

{lsst_felis-28.0.0rc1 → lsst_felis-28.2024.4500/python/lsst_felis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lsst-felis
-Version: 28.0.0rc1
+Version: 28.2024.4500
 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-28.0.0rc1/python/felis/version.py

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