Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(databases): preserve initial values in import and starter history (#7575)

Wolf Mermelstein8fc73f6ee243
diff --git a/crates/databases/src/domain/journal.rs b/crates/databases/src/domain/journal.rs
index ae94b724f0..a8c5af04b5 100644
--- a/crates/databases/src/domain/journal.rs
+++ b/crates/databases/src/domain/journal.rs
@@ -518,13 +518,14 @@ pub fn settled_column(
/// The entry of a table made whole, by an import or a new database's
/// starter: its columns and rows, created together. Undoing it removes the
-/// table.
+/// table. The written cells also describe each row's initial history.
pub fn created_table(
database_id: DatabaseId,
table: TableId,
version: TableVersion,
columns: &[ColumnId],
rows: &[RowId],
+ after: CellImage,
) -> JournalEntry {
JournalEntry {
database_id,
@@ -536,6 +537,7 @@ pub fn created_table(
table,
change: models_databases::TableChange::Delete,
}],
+ after,
..ChangeInverse::default()
},
rows: rows
diff --git a/crates/databases/src/outbound/pg_cell_store/transfer.rs b/crates/databases/src/outbound/pg_cell_store/transfer.rs
index 16bcbc31b2..6abb266b91 100644
--- a/crates/databases/src/outbound/pg_cell_store/transfer.rs
+++ b/crates/databases/src/outbound/pg_cell_store/transfer.rs
@@ -6,7 +6,7 @@ use models_databases::{ColumnId, RowId};
use uuid::Uuid;
use super::*;
-use crate::domain::journal::created_table;
+use crate::domain::journal::{CellImage, cell_value, created_table};
use crate::domain::models::{DatabaseId, Table, Viewer};
use crate::domain::transfer::{
DatabaseTransferRepo, ImportFingerprint, ImportOutcome, ImportTable,
@@ -171,6 +171,12 @@ where
.await?;
rows.extend(row_ids);
}
+ let column_ids: HashMap<_, _> = definitions
+ .iter()
+ .copied()
+ .zip(columns.iter().copied())
+ .collect();
+ let mut after = CellImage::default();
for (row, row_cells) in rows.iter().zip(cells) {
for (definition, value) in row_cells {
self.properties
@@ -182,6 +188,11 @@ where
)
.await
.map_err(cells_error)?;
+ if let Some(column) = column_ids.get(definition)
+ && let Some(value) = cell_value(value)
+ {
+ after.cells.entry(*row).or_default().insert(*column, value);
+ }
}
}
let table: Table = table.try_into().map_err(PgDatabasesRepoError::from)?;
@@ -197,6 +208,7 @@ where
table.version,
&columns,
&rows,
+ after,
)],
)
.await?;
diff --git a/crates/databases/src/outbound/pg_databases_repo/test/transfer.rs b/crates/databases/src/outbound/pg_databases_repo/test/transfer.rs
index 857b1fea4c..00fa790705 100644
--- a/crates/databases/src/outbound/pg_databases_repo/test/transfer.rs
+++ b/crates/databases/src/outbound/pg_databases_repo/test/transfer.rs
@@ -1,5 +1,6 @@
use models_properties::service::property_value::PropertyValue;
use properties::outbound::properties_pg_repo::PropertiesPgRepo;
+use std::collections::BTreeMap;
use super::*;
use crate::domain::ports::CellStore;
@@ -8,6 +9,74 @@ use crate::domain::transfer::{
};
use crate::outbound::pg_cell_store::{PgCellStore, PgCellStoreError};
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn an_import_records_initial_values_in_history(pool: PgPool) {
+ let (repo, existing, name) = fixture(&pool).await;
+ let postal_code = insert_definition(&pool, "Postal code").await;
+ let store = PgCellStore::new(pool.clone(), PropertiesPgRepo::new(pool.clone()));
+ let request = ImportTable {
+ request_id: macro_uuid::generate_uuid_v7(),
+ name: "Imported contacts".into(),
+ columns: vec!["Name".into(), "Postal code".into()],
+ rows: vec![
+ vec!["Ada,\"Lovelace\"\nsecond line".into(), "00123".into()],
+ vec![String::new(), String::new()],
+ ],
+ };
+ let ImportOutcome::Created(table) = store
+ .import_table(
+ existing.database_id,
+ &viewer(),
+ &request,
+ &ImportFingerprint("history".into()),
+ &[name, postal_code],
+ &[
+ vec![
+ (name, PropertyValue::Str(request.rows[0][0].clone())),
+ (postal_code, PropertyValue::Str("00123".into())),
+ ],
+ vec![],
+ ],
+ )
+ .await
+ .unwrap()
+ else {
+ panic!("the import should create a table")
+ };
+ let columns = repo.columns_for_tables(&[table.id]).await.unwrap();
+ let rows = repo.row_refs(table.id).await.unwrap();
+ assert_eq!(columns.len(), 2);
+ assert_eq!(rows.len(), 2);
+ for (index, row) in rows.iter().enumerate() {
+ let changes = repo
+ .row_history(table.database_id, table.id, row.id)
+ .await
+ .unwrap();
+ let history = crate::domain::journal::row_history(row.id, changes);
+ assert_eq!(history.len(), 1);
+ assert_eq!(
+ history[0].kind,
+ crate::domain::journal::RowChangeKind::Insert
+ );
+ assert!(history[0].before.is_empty());
+ let expected = if index == 0 {
+ BTreeMap::from([
+ (
+ columns[0].id,
+ models_databases::CellValue::Text(request.rows[0][0].clone()),
+ ),
+ (
+ columns[1].id,
+ models_databases::CellValue::Text("00123".into()),
+ ),
+ ])
+ } else {
+ BTreeMap::new()
+ };
+ assert_eq!(history[0].after, expected);
+ }
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn imports_are_atomic_and_retries_do_not_duplicate_rows(pool: PgPool) {
let (repo, existing, definition) = fixture(&pool).await;
diff --git a/crates/databases/src/outbound/pg_starter.rs b/crates/databases/src/outbound/pg_starter.rs
index e414fb30e8..de3c4d59c3 100644
--- a/crates/databases/src/outbound/pg_starter.rs
+++ b/crates/databases/src/outbound/pg_starter.rs
@@ -15,7 +15,7 @@ use properties::domain::database_definition_writer::{
};
use sqlx::{PgPool, Postgres, Transaction};
-use crate::domain::journal::{JournalActor, created_table};
+use crate::domain::journal::{CellImage, JournalActor, cell_value, created_table};
use crate::domain::models::Viewer;
use crate::domain::starter::{DatabaseStarterRepo, StarterBlueprint, StarterDatabase};
use crate::outbound::pg_databases_repo::{
@@ -192,6 +192,7 @@ where
.await
.map_err(PgDatabasesRepoError::from)?;
let mut seeded = Vec::with_capacity(blueprint.rows.len());
+ let mut after = CellImage::default();
let positions = keys_between(None, None, blueprint.rows.len())?;
for ((name, stage_index), position) in blueprint.rows.iter().zip(positions) {
let stage_option = stage
@@ -214,13 +215,25 @@ where
entity_type: models_properties::EntityType::DatabaseRow,
specific_message_id: None,
};
- for (definition_id, value) in [
- (title.definition.id, PropertyValue::Str((*name).into())),
+ for (column_id, definition_id, value) in [
(
+ title_column_id,
+ title.definition.id,
+ PropertyValue::Str((*name).into()),
+ ),
+ (
+ stage_column_id,
stage.definition.id,
PropertyValue::SelectOption(vec![stage_option.id]),
),
] {
+ if let Some(written) = cell_value(&value) {
+ after
+ .cells
+ .entry(row_id)
+ .or_default()
+ .insert(column_id, written);
+ }
self.properties
.upsert_entity_property_in(&mut transaction, &row, definition_id, Some(value))
.await
@@ -252,6 +265,7 @@ where
version,
&[title_column_id, stage_column_id],
&seeded,
+ after,
)],
)
.await?;
diff --git a/crates/databases/src/outbound/pg_starter/test.rs b/crates/databases/src/outbound/pg_starter/test.rs
index 337c91ccf5..ad86a85ccd 100644
--- a/crates/databases/src/outbound/pg_starter/test.rs
+++ b/crates/databases/src/outbound/pg_starter/test.rs
@@ -40,6 +40,54 @@ fn repo(pool: &PgPool) -> PgDatabaseStarterRepo<PropertiesPgRepo> {
PgDatabaseStarterRepo::new(pool.clone(), PropertiesPgRepo::new(pool.clone()))
}
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn the_starter_records_initial_values_in_history(pool: PgPool) {
+ insert_user(&pool).await;
+ let blueprint = StarterBlueprint::default();
+ let created = repo(&pool)
+ .ensure_starter(&viewer(), &blueprint)
+ .await
+ .unwrap();
+ let database = created.database_id.unwrap();
+ let table = created.table_id.unwrap();
+ let data = PgDatabasesRepo::new(pool.clone(), PropertiesPgRepo::new(pool.clone()));
+ let columns = data.columns_for_tables(&[table]).await.unwrap();
+ let definitions = crate::outbound::pg_definition_store::PgDefinitionStore::new(
+ pool.clone(),
+ PropertiesPgRepo::new(pool.clone()),
+ )
+ .definitions(&[columns[1].property_definition_id])
+ .await
+ .unwrap();
+ let rows = data.row_refs(table).await.unwrap();
+ assert_eq!(rows.len(), blueprint.rows.len());
+ for (row, (name, stage_index)) in rows.iter().zip(blueprint.rows) {
+ let changes = data.row_history(database, table, row.id).await.unwrap();
+ let history = crate::domain::journal::row_history(row.id, changes);
+ assert_eq!(history.len(), 1);
+ assert_eq!(
+ history[0].kind,
+ crate::domain::journal::RowChangeKind::Insert
+ );
+ assert!(history[0].before.is_empty());
+ assert_eq!(
+ history[0].after,
+ std::collections::BTreeMap::from([
+ (
+ columns[0].id,
+ models_databases::CellValue::Text(name.into())
+ ),
+ (
+ columns[1].id,
+ models_databases::CellValue::Options(vec![models_databases::OptionRef::Id(
+ OptionId::from_uuid(definitions[0].property_options[stage_index].id),
+ )]),
+ ),
+ ])
+ );
+ }
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn concurrent_starter_requests_create_one_complete_editable_example(pool: PgPool) {
insert_user(&pool).await;