@@ -1941,20 +1941,12 @@ public void dropNamespace_forSqlite_shouldDropNamespace() throws Exception {
19411941
19421942 Connection connection = mock (Connection .class );
19431943 PreparedStatement deleteFromNamespaceTablePrepStmt = mock (PreparedStatement .class );
1944- PreparedStatement getInternalTableNamesStatementMock = mock (PreparedStatement .class );
19451944 Statement selectAllFromNamespaceTablePrepStmt = mock (Statement .class );
19461945 Statement dropNamespaceTableStmt = mock (Statement .class );
19471946 when (dataSource .getConnection ()).thenReturn (connection );
19481947 when (connection .createStatement ())
19491948 .thenReturn (selectAllFromNamespaceTablePrepStmt , dropNamespaceTableStmt );
1950- // Mock for getInternalTableNames() check - returns empty ResultSet (no tables in metadata
1951- // schema)
1952- ResultSet emptyInternalTablesResultSet = mock (ResultSet .class );
1953- when (emptyInternalTablesResultSet .next ()).thenReturn (false );
1954- when (getInternalTableNamesStatementMock .executeQuery ())
1955- .thenReturn (emptyInternalTablesResultSet );
1956- when (connection .prepareStatement (anyString ()))
1957- .thenReturn (deleteFromNamespaceTablePrepStmt , getInternalTableNamesStatementMock );
1949+ when (connection .prepareStatement (anyString ())).thenReturn (deleteFromNamespaceTablePrepStmt );
19581950 when (dataSource .getConnection ()).thenReturn (connection );
19591951 // Only the metadata schema is left
19601952 ResultSet resultSet1 =
@@ -2107,10 +2099,10 @@ private void dropNamespace_WithOtherNamespaceLeftForX_shouldOnlyDropNamespace(
21072099 Connection connection = mock (Connection .class );
21082100 Statement dropNamespaceStatementMock = mock (Statement .class );
21092101 PreparedStatement deleteFromNamespaceTableMock = mock (PreparedStatement .class );
2110- PreparedStatement getInternalTableNamesStatementMock = mock (PreparedStatement .class );
21112102 Statement selectNamespaceStatementMock = mock (Statement .class );
21122103 if (rdbEngine != RdbEngine .SQLITE ) {
21132104 PreparedStatement getTableNamesPrepStmt = mock (PreparedStatement .class );
2105+ PreparedStatement getInternalTableNamesStatementMock = mock (PreparedStatement .class );
21142106 when (connection .createStatement ())
21152107 .thenReturn (dropNamespaceStatementMock , selectNamespaceStatementMock );
21162108 ResultSet emptyResultSet = mock (ResultSet .class );
@@ -2130,15 +2122,7 @@ private void dropNamespace_WithOtherNamespaceLeftForX_shouldOnlyDropNamespace(
21302122 getInternalTableNamesStatementMock );
21312123 } else {
21322124 when (connection .createStatement ()).thenReturn (selectNamespaceStatementMock );
2133- // Mock for getInternalTableNames() check - returns non-empty ResultSet (namespaces table
2134- // exists)
2135- ResultSet nonEmptyInternalTablesResultSet = mock (ResultSet .class );
2136- when (nonEmptyInternalTablesResultSet .next ()).thenReturn (true , false );
2137- when (nonEmptyInternalTablesResultSet .getString (1 )).thenReturn ("namespaces" );
2138- when (getInternalTableNamesStatementMock .executeQuery ())
2139- .thenReturn (nonEmptyInternalTablesResultSet );
2140- when (connection .prepareStatement (anyString ()))
2141- .thenReturn (deleteFromNamespaceTableMock , getInternalTableNamesStatementMock );
2125+ when (connection .prepareStatement (anyString ())).thenReturn (deleteFromNamespaceTableMock );
21422126 }
21432127 when (dataSource .getConnection ()).thenReturn (connection );
21442128 // Namespaces table contains other namespaces
0 commit comments