Skip to content

Fix migration dev center schema dump by run db-specific initialization script #18984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2022
Merged

Fix migration dev center schema dump by run db-specific initialization script #18984

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fc723a
Run db-specific initialization script
tuliren Nov 4, 2022
7c830a5
Refactor code
tuliren Nov 4, 2022
0b241b4
Use constants
tuliren Nov 4, 2022
3f77969
Add unit test for dev center
tuliren Nov 4, 2022
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
10 changes: 2 additions & 8 deletions ...b-lib/src/main/java/io/airbyte/db/instance/configs/ConfigsDatabaseMigrationDevCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,26 @@

import io.airbyte.db.Database;
import io.airbyte.db.factory.FlywayFactory;
import io.airbyte.db.instance.DatabaseConstants;
import io.airbyte.db.instance.FlywayDatabaseMigrator;
import io.airbyte.db.instance.development.MigrationDevCenter;
import java.io.IOException;
import javax.sql.DataSource;
import org.flywaydb.core.Flyway;
import org.jooq.DSLContext;

/**
* Helper class for migration development. See README for details.
*/
public class ConfigsDatabaseMigrationDevCenter extends MigrationDevCenter {

public ConfigsDatabaseMigrationDevCenter() {
super("configs", "src/main/resources/configs_database/schema_dump.txt");
super("configs", "src/main/resources/configs_database/schema_dump.txt", DatabaseConstants.CONFIGS_SCHEMA_PATH);
}

@Override
protected FlywayDatabaseMigrator getMigrator(final Database database, final Flyway flyway) {
return new ConfigsDatabaseMigrator(database, flyway);
}

@Override
protected Database getDatabase(final DSLContext dslContext) throws IOException {
return new Database(dslContext);
}

@Override
protected Flyway getFlyway(final DataSource dataSource) {
return FlywayFactory.create(dataSource, getClass().getSimpleName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
Expand Down
23 changes: 10 additions & 13 deletions airbyte-db/db-lib/src/main/java/io/airbyte/db/instance/development/MigrationDevCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,33 @@ private enum Command {

private final String dbIdentifier;
private final String schemaDumpFile;
private final String initialScript;

protected MigrationDevCenter(final String dbIdentifier, final String schemaDumpFile) {
protected MigrationDevCenter(final String dbIdentifier, final String schemaDumpFile, final String initialScript) {
this.dbIdentifier = dbIdentifier;
this.schemaDumpFile = schemaDumpFile;
this.initialScript = initialScript;
}

private static PostgreSQLContainer<?> createContainer() {
private PostgreSQLContainer<?> createContainer() {
final PostgreSQLContainer<?> container = new PostgreSQLContainer<>("postgres:13-alpine")
.withDatabaseName("airbyte")
.withUsername("docker")
.withPassword("docker");
container.start();

initializeDatabase(container);

final var containerDelegate = new JdbcDatabaseDelegate(container, "");
ScriptUtils.runInitScript(containerDelegate, initialScript);
return container;
}

protected abstract FlywayDatabaseMigrator getMigrator(Database database, Flyway flyway);

protected abstract Database getDatabase(DSLContext dslContext) throws IOException;

protected abstract Flyway getFlyway(DataSource dataSource);

private Database getDatabase(final DSLContext dslContext) throws IOException {
return new Database(dslContext);
}

private void createMigration() {
try (final PostgreSQLContainer<?> container = createContainer()) {
final DataSource dataSource =
Expand Down Expand Up @@ -111,12 +114,6 @@ private void dumpSchema() {
}
}

private static void initializeDatabase(final PostgreSQLContainer container) {
final var containerDelegate = new JdbcDatabaseDelegate(container, "");
ScriptUtils.runInitScript(containerDelegate, "configs_database/schema.sql");
ScriptUtils.runInitScript(containerDelegate, "jobs_database/schema.sql");
}

public static void main(final String[] args) {
final MigrationDevCenter devCenter;

Expand Down
10 changes: 2 additions & 8 deletions ...e-db/db-lib/src/main/java/io/airbyte/db/instance/jobs/JobsDatabaseMigrationDevCenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,26 @@

import io.airbyte.db.Database;
import io.airbyte.db.factory.FlywayFactory;
import io.airbyte.db.instance.DatabaseConstants;
import io.airbyte.db.instance.FlywayDatabaseMigrator;
import io.airbyte.db.instance.development.MigrationDevCenter;
import java.io.IOException;
import javax.sql.DataSource;
import org.flywaydb.core.Flyway;
import org.jooq.DSLContext;

/**
* Helper class for migration development. See README for details.
*/
public class JobsDatabaseMigrationDevCenter extends MigrationDevCenter {

public JobsDatabaseMigrationDevCenter() {
super("jobs", "src/main/resources/jobs_database/schema_dump.txt");
super("jobs", "src/main/resources/jobs_database/schema_dump.txt", DatabaseConstants.JOBS_SCHEMA_PATH);
}

@Override
protected FlywayDatabaseMigrator getMigrator(final Database database, final Flyway flyway) {
return new JobsDatabaseMigrator(database, flyway);
}

@Override
protected Database getDatabase(final DSLContext dslContext) throws IOException {
return new Database(dslContext);
}

@Override
protected Flyway getFlyway(final DataSource dataSource) {
return FlywayFactory.create(dataSource, getClass().getSimpleName(), JobsDatabaseMigrator.DB_IDENTIFIER,
Expand Down