Skip to content
This repository has been archived by the owner on Jul 11, 2024. It is now read-only.

Remove SimpleFlatMapper record mapper from database + test db configurations #621

Merged
merged 5 commits into from
Apr 9, 2021
Merged

Remove SimpleFlatMapper record mapper from database + test db configurations #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14ce4a3
Remove DatabaseUtil
woobianca Apr 7, 2021
f0ab422
Remove SFM record mapper db config
woobianca Apr 7, 2021
fc05056
Remove SFM record mapper test db config
woobianca Apr 7, 2021
6438d8c
Add newDbContext override method with Clock
woobianca Apr 7, 2021
036d9ba
Spotless
woobianca Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...mework/src/main/java/org/curioswitch/common/server/framework/database/DatabaseModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ static DSLContext dbContext(
.set(dbExecutor)
.set(SQLDialect.MYSQL)
.set(new Settings().withRenderSchema(false))
.set(new DataSourceConnectionProvider(dataSource))
.set(DatabaseUtil.sfmRecordMapperProvider());
.set(new DataSourceConnectionProvider(dataSource));
if (config.getLogQueries()) {
configuration.set(new QueryLogger());
}
Expand Down
45 changes: 0 additions & 45 deletions ...ramework/src/main/java/org/curioswitch/common/server/framework/database/DatabaseUtil.java
View file
Open in desktop

This file was deleted.

11 changes: 9 additions & 2 deletions ...ing/framework/src/main/java/org/curioswitch/common/testing/database/DatabaseTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

import com.google.common.collect.ImmutableList;
import java.sql.SQLException;
import org.curioswitch.common.server.framework.database.DatabaseUtil;
import java.time.Clock;
import org.jooq.DSLContext;
import org.jooq.Record;
import org.jooq.Result;
Expand Down Expand Up @@ -71,11 +71,18 @@ public static MockDataProvider mockProvider() {
public static DSLContext newDbContext(MockDataProvider dataProvider) {
MockConnection connection = new MockConnection(dataProvider);
DSLContext db = DSL.using(connection, SQLDialect.MYSQL);
db.configuration().set(DatabaseUtil.sfmRecordMapperProvider());
db.settings().setRenderSchema(false);
return db;
}

/**
* Returns a {@link DSLContext} with a mock connection using the provided {@link MockDataProvider}
* and {@link Clock} to override the system's current time with a fixed timestamp.
*/
public static DSLContext newDbContext(MockDataProvider dataProvider, Clock clock) {
return newDbContext(dataProvider).configuration().set(clock).dsl();
}

/**
* Setup a {@link MockDataProviderStubber} which can be used to set an expectation to return
* records or throw an exception when the {@code query} is executed on the {@code provider}.
Expand Down