Refactor dbclient so that we can run different sets of migrations (an…

…d therefore, support multiple schemas)

api/Cargo.toml

@@ -25,6 +25,7 @@ diesel = { version = "2.1.0", default-features = false, features = [
 	"uuid",
 	"chrono",
 ] }
+diesel_migrations = "2.1.0"
 diesel-derive-newtype = "2.1.0"
 diesel_json = "0.2.0"
 uuid = { version = "1.3.3", default_features = false, features = [

api/src/presentation/http/bootstrap.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::Result;
+use diesel_migrations::{embed_migrations, EmbeddedMigrations};
 use domain::{AggregateRepository, CompositePublisher, EventPublisher};
 use infrastructure::{amqp, dbclient, event_bus::EXCHANGE_NAME, github};
 use rocket::{Build, Rocket};
@@ -12,12 +13,14 @@ use crate::{
 	Config,
 };
 
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../migrations");
+
 pub async fn bootstrap(config: Config) -> Result<Rocket<Build>> {
 	info!("Bootstrapping api http server");
 	let database = Arc::new(dbclient::Client::new(dbclient::init_pool(
 		config.database.clone(),
 	)?));
-	database.run_migrations()?;
+	database.run_migrations(MIGRATIONS)?;
 
 	let github_api_client: Arc<github::Client> =
 		github::RoundRobinClient::new(config.github_api_client.clone())?.into();

common/infrastructure/src/dbclient/mod.rs

@@ -20,11 +20,9 @@ use crate::diesel_migrations::MigrationHarness;
 pub type Pool = r2d2::Pool<ConnectionManager<PgConnection>>;
 type PooledConnection = r2d2::PooledConnection<ConnectionManager<PgConnection>>;
 
-pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
-
-pub fn run_migrations(pool: &Pool) {
+pub fn run_migrations(pool: &Pool, migrations: EmbeddedMigrations) {
 	let mut connection = pool.get().expect("Unable to get connection from pool");
-	connection.run_pending_migrations(MIGRATIONS).expect("diesel migration failure");
+	connection.run_pending_migrations(migrations).expect("diesel migration failure");
 }
 
 pub struct Client {
@@ -48,9 +46,9 @@ impl Client {
 		})
 	}
 
-	pub fn run_migrations(&self) -> Result<()> {
+	pub fn run_migrations(&self, migrations: EmbeddedMigrations) -> Result<()> {
 		let mut connection = self.connection()?;
-		connection.run_pending_migrations(MIGRATIONS).map_err(|e| {
+		connection.run_pending_migrations(migrations).map_err(|e| {
 			error!(error = e.to_field(), "Failed to run migrations");
 			DatabaseError::Migration(anyhow!(e))
 		})?;

common/infrastructure/src/lib.rs

@@ -15,7 +15,6 @@ pub mod http;
 pub mod tracing;
 pub mod web3;
 
-#[macro_use]
 extern crate diesel_migrations;
 #[macro_use]
 extern crate lazy_static;

common/testing/Cargo.toml

@@ -20,6 +20,7 @@ project-root = "0.2.2"
 serde_json = "1.0.81"
 serde = { version = "1.0.137", features = ["derive"] }
 reqwest = { version = "0.11" }
+diesel_migrations = "2.1.0"
 
 # Local dependecies
 domain = { path = "../domain" }

common/testing/src/context/database.rs

@@ -1,11 +1,14 @@
 use std::sync::Arc;
 
 use anyhow::{anyhow, Result};
+use diesel_migrations::{embed_migrations, EmbeddedMigrations};
 use infrastructure::dbclient;
 use testcontainers::{
 	clients::Cli, core::WaitFor, images::generic::GenericImage, Container, RunnableImage,
 };
 
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../../migrations");
+
 static USER: &str = "postgres";
 static PASSWORD: &str = "Passw0rd";
 static DATABASE: &str = "marketplace_db";
@@ -31,7 +34,7 @@ impl<'docker> Context<'docker> {
 
 		let client = dbclient::Client::new(dbclient::init_pool(config.clone())?);
 
-		client.run_migrations()?;
+		client.run_migrations(MIGRATIONS)?;
 
 		Ok(Self {
 			_container: container,