check tests

Netflix · Dec 4, 2024 · 612b0b3 · 612b0b3
1 parent 6eb29c3
commit 612b0b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/metacat-connector-polaris/src/functionalTest/resources/schema.sql b/metacat-connector-polaris/src/functionalTest/resources/schema.sql
@@ -24,5 +24,5 @@ create table TBLS (
   created_date TIMESTAMP not null,
   last_updated_by STRING(255),
   last_updated_date TIMESTAMP not null,
-  foreign key (db_name) references DBS(name) ON DELETE CASCADE ON UPDATE CASCADE
+  foreign key (db_name) references DBS(name) ON UPDATE CASCADE
 );
diff --git a/.../src/main/java/com/netflix/metacat/connector/polaris/PolarisConnectorDatabaseService.java b/.../src/main/java/com/netflix/metacat/connector/polaris/PolarisConnectorDatabaseService.java
@@ -87,6 +87,9 @@ public void delete(final ConnectorRequestContext context, final QualifiedName na
         try {
             this.polarisStoreService.deleteDatabase(name.getDatabaseName());
         } catch (DataIntegrityViolationException exception) {
+            if (exception.getCause() instanceof org.hibernate.exception.ConstraintViolationException) {
+                throw new InvalidMetaException(name, "Cannot delete database because it still contains tables.", exception);
+            }
             throw new InvalidMetaException(name, exception);
         } catch (Exception exception) {
             throw new ConnectorException(

diff --git a/.../test/java/com/netflix/metacat/connector/polaris/PolarisConnectorDatabaseServiceTest.java b/.../test/java/com/netflix/metacat/connector/polaris/PolarisConnectorDatabaseServiceTest.java
@@ -8,6 +8,7 @@
 import com.netflix.metacat.common.server.connectors.ConnectorRequestContext;
 import com.netflix.metacat.common.server.connectors.exception.DatabaseAlreadyExistsException;
 import com.netflix.metacat.common.server.connectors.exception.DatabaseNotFoundException;
+import com.netflix.metacat.common.server.connectors.exception.InvalidMetaException;
 import com.netflix.metacat.common.server.connectors.model.AuditInfo;
 import com.netflix.metacat.common.server.connectors.model.DatabaseInfo;
 import com.netflix.metacat.common.server.connectors.model.TableInfo;
@@ -213,7 +214,12 @@ public void testDeleteDbNoCascades() {
         polarisTableService.create(requestContext, tableInfo);
         Assert.assertTrue(polarisTableService.exists(requestContext, qualifiedName));
 
-        polarisDBService.delete(requestContext, DB1_QUALIFIED_NAME);
+        // Expect an InvalidMetaException when trying to delete a non-empty database
+        Assertions.assertThrows(InvalidMetaException.class, () -> {
+            polarisDBService.delete(requestContext, DB1_QUALIFIED_NAME);
+        });
+
+        // Ensure the database still exists after the failed delete attempt
         Assert.assertTrue(polarisDBService.exists(requestContext, DB1_QUALIFIED_NAME));
     }
 }