nidx-binding 6.9.5.post667__tar.gz → 6.9.6.post673__tar.gz

{nidx_binding-6.9.5.post667 → nidx_binding-6.9.6.post673}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.9.5.post667
+Version: 6.9.6.post673
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.9.5.post667 → nidx_binding-6.9.6.post673}/nidx_protos/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "nidx_protos"
-version = "6.9.5.post667"
+version = "6.9.6.post673"
 license = "AGPL-3.0-or-later"
 description = "Protobuf definitions for nucliadb/nidx"
 authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]

{nidx_binding-6.9.5.post667 → nidx_binding-6.9.6.post673}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-version = "6.9.5.post667"
+version = "6.9.6.post673"
 
 [project.urls]
 Homepage = "https://nuclia.com"

{nidx_binding-6.9.5.post667 → nidx_binding-6.9.6.post673}/src/metadata.rs

@@ -34,6 +34,8 @@ pub use merge_job::*;
 pub use segment::*;
 pub use shard::*;
 
+use crate::settings::MetadataSettings;
+
 /// A random ID to identify the lock we use during migration
 const MIGRATION_LOCK_ID: i64 = 5324678839066546102;
 
@@ -43,25 +45,34 @@ pub struct NidxMetadata {
 }
 
 impl NidxMetadata {
-    pub async fn new(database_url: &str) -> sqlx::Result<Self> {
+    pub async fn new(settings: &MetadataSettings) -> sqlx::Result<Self> {
         let pool = sqlx::postgres::PgPoolOptions::new()
             .acquire_timeout(Duration::from_secs(2))
-            .connect(database_url)
+            .connect(&settings.database_url)
             .await?;
 
-        Self::new_with_pool(pool).await
+        if !settings.disable_migrations {
+            Self::run_migrations(&pool).await?;
+        }
+
+        Ok(NidxMetadata { pool })
     }
 
     pub async fn new_with_pool(pool: sqlx::PgPool) -> sqlx::Result<Self> {
+        Self::run_migrations(&pool).await?;
+        Ok(NidxMetadata { pool })
+    }
+
+    async fn run_migrations(pool: &sqlx::PgPool) -> sqlx::Result<()> {
         // Run migrations inside a transaction that holds a global lock, avoids races
         let mut tx = pool.begin().await?;
         sqlx::query!("SELECT pg_advisory_xact_lock($1)", MIGRATION_LOCK_ID)
             .execute(&mut *tx)
             .await?;
-        sqlx::migrate!("./migrations").run(&pool).await?;
+        sqlx::migrate!("./migrations").run(pool).await?;
         tx.commit().await?;
 
-        Ok(NidxMetadata { pool })
+        Ok(())
     }
 
     pub async fn transaction(&self) -> sqlx::Result<sqlx::Transaction<'_, sqlx::Postgres>> {

{nidx_binding-6.9.5.post667 → nidx_binding-6.9.6.post673}/src/settings.rs

@@ -173,6 +173,8 @@ fn deserialize_object_store<'de, D: Deserializer<'de>>(deserializer: D) -> Resul
 #[derive(Clone, Debug, Deserialize)]
 pub struct MetadataSettings {
     pub database_url: String,
+    #[serde(default)]
+    pub disable_migrations: bool,
 }
 
 #[derive(Clone, Deserialize, Debug)]
@@ -409,7 +411,7 @@ impl Settings {
     }
 
     pub async fn from_env_settings(settings: EnvSettings) -> anyhow::Result<Self> {
-        let metadata = NidxMetadata::new(&settings.metadata.as_ref().expect("DB config required").database_url).await?;
+        let metadata = NidxMetadata::new(settings.metadata.as_ref().expect("DB config required")).await?;
         Ok(Self { metadata, settings })
     }
 }

{nidx_binding-6.9.5.post667 → nidx_binding-6.9.6.post673}/tests/common/services.rs

@@ -61,6 +61,7 @@ impl NidxFixture {
                 merge: Default::default(),
                 metadata: Some(MetadataSettings {
                     database_url: "ignored".to_string(),
+                    disable_migrations: false,
                 }),
                 telemetry: Default::default(),
                 work_path: None,