-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add ability to clean the DB in DevUI
- Loading branch information
1 parent
278966b
commit f955067
Showing
19 changed files
with
452 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,5 +55,4 @@ public DataSourcesExcludedFromHealthChecks get() { | |
} | ||
}; | ||
} | ||
|
||
} |
34 changes: 34 additions & 0 deletions
34
.../src/main/java/io/quarkus/datasource/deployment/devservices/DevUIDatasourceProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package io.quarkus.datasource.deployment.devservices; | ||
|
||
import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collections; | ||
import java.util.List; | ||
|
||
import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; | ||
import io.quarkus.datasource.runtime.DatabaseRecorder; | ||
import io.quarkus.deployment.IsDevelopment; | ||
import io.quarkus.deployment.annotations.BuildStep; | ||
import io.quarkus.deployment.annotations.Record; | ||
import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; | ||
import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; | ||
|
||
public class DevUIDatasourceProcessor { | ||
|
||
@BuildStep | ||
public DevConsoleTemplateInfoBuildItem devConsoleInfo( | ||
DataSourcesBuildTimeConfig dataSourceBuildTimeConfig) { | ||
List<String> names = new ArrayList<>(); | ||
names.add("<default>"); | ||
names.addAll(dataSourceBuildTimeConfig.namedDataSources.keySet()); | ||
Collections.sort(names); | ||
return new DevConsoleTemplateInfoBuildItem("dbs", names); | ||
} | ||
|
||
@BuildStep(onlyIf = IsDevelopment.class) | ||
@Record(value = STATIC_INIT, optional = true) | ||
DevConsoleRouteBuildItem devConsoleCleanDatabaseHandler(DatabaseRecorder recorder) { | ||
return new DevConsoleRouteBuildItem("clean", "POST", recorder.devConsoleCleanDatabaseHandler()); | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
extensions/datasource/deployment/src/main/resources/dev-templates/clean.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
{#include main} | ||
{#title}Clean Databases{/title} | ||
{#body} | ||
<table class="table table-striped"> | ||
<thead class="thead-dark"> | ||
<tr> | ||
<th scope="col">Datasource</th> | ||
<th scope="col">Actions</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
{#for db in info:dbs} | ||
<tr> | ||
<td> | ||
{db} | ||
</td> | ||
<td> | ||
<form method="post" enctype="application/x-www-form-urlencoded"> | ||
<input type="hidden" name="name" value="{db}"> | ||
<input id="invoke" type="submit" value="Invoke" class="btn btn-primary btn-sm"> | ||
</form> | ||
</td> | ||
{/for} | ||
</tbody> | ||
</table> | ||
{/body} | ||
{/include} |
3 changes: 3 additions & 0 deletions
3
extensions/datasource/deployment/src/main/resources/dev-templates/embedded.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<a href="{urlbase}/clean" class="badge badge-light"> | ||
<i class="fa fa-database fa-fw"></i> | ||
Reset Databases</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...ions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DatabaseRecorder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package io.quarkus.datasource.runtime; | ||
|
||
import java.util.ServiceLoader; | ||
|
||
import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; | ||
import io.quarkus.runtime.annotations.Recorder; | ||
import io.vertx.core.Handler; | ||
import io.vertx.core.MultiMap; | ||
import io.vertx.ext.web.RoutingContext; | ||
|
||
@Recorder | ||
public class DatabaseRecorder { | ||
|
||
public Handler<RoutingContext> devConsoleCleanDatabaseHandler() { | ||
// the usual issue of Vert.x hanging on to the first TCCL and setting it on all its threads | ||
final ClassLoader currentCl = Thread.currentThread().getContextClassLoader(); | ||
return new DevConsolePostHandler() { | ||
|
||
@Override | ||
protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { | ||
String name = form.get("name"); | ||
ServiceLoader<DatabaseSchemaProvider> dbs = ServiceLoader.load(DatabaseSchemaProvider.class, | ||
Thread.currentThread().getContextClassLoader()); | ||
for (DatabaseSchemaProvider i : dbs) { | ||
i.resetDatabase(name); | ||
} | ||
flashMessage(event, "Action invoked"); | ||
} | ||
}; | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
...atasource/runtime/src/main/java/io/quarkus/datasource/runtime/DatabaseSchemaProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package io.quarkus.datasource.runtime; | ||
|
||
/** | ||
* A service interface that can be used to reset the database for dev and test mode. | ||
*/ | ||
public interface DatabaseSchemaProvider { | ||
|
||
void resetDatabase(String dbName); | ||
|
||
void resetAllDatabases(); | ||
} |
23 changes: 23 additions & 0 deletions
23
extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywaySchemaProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package io.quarkus.flyway.runtime; | ||
|
||
import io.quarkus.datasource.runtime.DatabaseSchemaProvider; | ||
|
||
public class FlywaySchemaProvider implements DatabaseSchemaProvider { | ||
@Override | ||
public void resetDatabase(String dbName) { | ||
for (FlywayContainer i : FlywayRecorder.FLYWAY_CONTAINERS) { | ||
if (i.getDataSourceName().equals(dbName)) { | ||
i.getFlyway().clean(); | ||
i.getFlyway().migrate(); | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
public void resetAllDatabases() { | ||
for (FlywayContainer i : FlywayRecorder.FLYWAY_CONTAINERS) { | ||
i.getFlyway().clean(); | ||
i.getFlyway().migrate(); | ||
} | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
...src/main/resources/META-INF/services/io.quarkus.datasource.runtime.DatabaseSchemaProvider
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
io.quarkus.flyway.runtime.FlywaySchemaProvider |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...ent/src/test/java/io/quarkus/hibernate/orm/HibernateSchemaRecreateDevConsoleTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package io.quarkus.hibernate.orm; | ||
|
||
import static org.hamcrest.Matchers.is; | ||
|
||
import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
import io.quarkus.test.QuarkusDevModeTest; | ||
import io.restassured.RestAssured; | ||
|
||
public class HibernateSchemaRecreateDevConsoleTestCase { | ||
@RegisterExtension | ||
final static QuarkusDevModeTest TEST = new QuarkusDevModeTest() | ||
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) | ||
.addClasses(MyEntity.class, MyEntityTestResource.class) | ||
.addAsResource("application.properties") | ||
.addAsResource("import.sql")); | ||
|
||
@Test | ||
public void testCleanDatabase() { | ||
RestAssured.when().get("/my-entity/count").then().body(is("2")); | ||
RestAssured.when().get("/my-entity/add").then().body(is("MyEntity:added")); | ||
RestAssured.when().get("/my-entity/count").then().body(is("3")); | ||
RestAssured.with() | ||
.redirects().follow(false).formParam("name", "<default>").post("q/dev/io.quarkus.quarkus-datasource/clean") | ||
.then() | ||
.statusCode(303); | ||
RestAssured.when().get("/my-entity/count").then().body(is("2")); | ||
|
||
} | ||
|
||
private void assertBodyIs(String expectedBody) { | ||
RestAssured.when().get("/my-entity/2").then().body(is(expectedBody)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
extensions/hibernate-orm/deployment/src/test/resources/import.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
INSERT INTO MyEntity(id, name) VALUES(1, 'default sql load script entity'); | ||
INSERT INTO MyEntity(id, name) VALUES(2, 'import.sql load script entity'); | ||
alter sequence myEntitySeq restart with 3; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.