Skip to content

Commit c9fb545

Browse files
committed
Add DatabaseMetaDataPersistFacade.renameSchema()
1 parent c5e19d4 commit c9fb545

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -98,29 +98,23 @@ void assertCreateSchema() {
9898
void assertAlterSchema() {
9999
metaDataManagerPersistService.alterSchema(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()),
100100
"foo_schema", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
101-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getTable()).persist("foo_db", "foo_schema", Collections.emptyList());
102-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getView()).persist("foo_db", "foo_schema", Collections.emptyList());
101+
verify(metaDataPersistFacade.getDatabaseMetaDataFacade()).alterSchema(any(), eq("foo_schema"), anyCollection(), anyCollection(), anyCollection(), anyCollection());
103102
}
104103

105104
@Test
106105
void assertRenameNotEmptySchemaName() {
107106
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
108107
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(schema);
109108
metaDataManagerPersistService.renameSchema(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), "foo_schema", "bar_schema");
110-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getTable()).persist(eq("foo_db"), eq("bar_schema"), anyCollection());
111-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getView()).persist(eq("foo_db"), eq("bar_schema"), anyCollection());
112-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getSchema()).drop("foo_db", "foo_schema");
113-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getSchema(), times(0)).add("foo_db", "bar_schema");
109+
verify(metaDataPersistFacade.getDatabaseMetaDataFacade()).renameSchema(any(), any(), eq("foo_schema"), eq("bar_schema"));
114110
}
115111

116112
@Test
117113
void assertRenameEmptySchemaName() {
118114
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
119-
when(schema.isEmpty()).thenReturn(true);
120115
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getSchema("foo_schema")).thenReturn(schema);
121116
metaDataManagerPersistService.renameSchema(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), "foo_schema", "bar_schema");
122-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getSchema()).drop("foo_db", "foo_schema");
123-
verify(metaDataPersistFacade.getDatabaseMetaDataFacade().getSchema()).add("foo_db", "bar_schema");
117+
verify(metaDataPersistFacade.getDatabaseMetaDataFacade()).renameSchema(any(), any(), eq("foo_schema"), eq("bar_schema"));
124118
}
125119

126120
@Test

mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050

5151
import java.sql.SQLException;
5252
import java.util.Collections;
53-
import java.util.LinkedList;
5453
import java.util.Optional;
5554
import java.util.Properties;
5655

@@ -108,7 +107,7 @@ void assertAlterSchema() {
108107
when(metaDataPersistFacade.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
109108
metaDataManagerPersistService.alterSchema(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()),
110109
"foo_schema", Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
111-
verify(databaseMetaDataFacade.getTable()).persist("foo_db", "foo_schema", new LinkedList<>());
110+
verify(databaseMetaDataFacade).alterSchema(any(), eq("foo_schema"), anyCollection(), anyCollection(), anyCollection(), anyCollection());
112111
}
113112

114113
@Test
@@ -121,9 +120,7 @@ void assertRenameSchemaNameWithEmptyAlteredSchema() {
121120
when(metaDataPersistFacade.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
122121
metaDataManagerPersistService.renameSchema(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), "foo_schema", "bar_schema");
123122
verify(databaseMetaDataFacade.getSchema(), times(0)).add("foo_db", "bar_schema");
124-
verify(databaseMetaDataFacade.getTable()).persist(eq("foo_db"), eq("bar_schema"), anyCollection());
125-
verify(databaseMetaDataFacade.getView()).persist(eq("foo_db"), eq("bar_schema"), anyCollection());
126-
verify(databaseMetaDataFacade.getSchema()).drop("foo_db", "foo_schema");
123+
verify(databaseMetaDataFacade).renameSchema(any(), any(), eq("foo_schema"), eq("bar_schema"));
127124
}
128125

129126
@Test
@@ -137,8 +134,7 @@ void assertRenameSchemaNameWithNotEmptyAlteredSchema() {
137134
DatabaseMetaDataPersistFacade databaseMetaDataFacade = mock(DatabaseMetaDataPersistFacade.class, RETURNS_DEEP_STUBS);
138135
when(metaDataPersistFacade.getDatabaseMetaDataFacade()).thenReturn(databaseMetaDataFacade);
139136
metaDataManagerPersistService.renameSchema(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), "foo_schema", "bar_schema");
140-
verify(databaseMetaDataFacade.getSchema()).add("foo_db", "bar_schema");
141-
verify(databaseMetaDataFacade.getSchema()).drop("foo_db", "foo_schema");
137+
verify(databaseMetaDataFacade).renameSchema(any(), any(), eq("foo_schema"), eq("bar_schema"));
142138
}
143139

144140
@Test

0 commit comments

Comments
 (0)