Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d41209e7c1 | |||
| 03c60f5156 | |||
| 1dfd53e53c | |||
| 532bd8da43 |
@ -85,13 +85,6 @@ impl DatabaseExecutor for MockExecutor {
|
||||
Ok("2026-03-10T00:00:00Z".to_string())
|
||||
}
|
||||
|
||||
fn auth_origin(&self) -> Result<Option<Value>, String> {
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
fn punc_trigger(&self) -> Result<Option<String>, String> {
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
fn get_queries(&self) -> Vec<String> {
|
||||
|
||||
@ -20,11 +20,6 @@ pub trait DatabaseExecutor: Send + Sync {
|
||||
/// Returns the current transaction timestamp
|
||||
fn timestamp(&self) -> Result<String, String>;
|
||||
|
||||
/// Returns the current auth.origin session context if configured
|
||||
fn auth_origin(&self) -> Result<Option<Value>, String>;
|
||||
|
||||
/// Returns the current punc.name session context if configured
|
||||
fn punc_trigger(&self) -> Result<Option<String>, String>;
|
||||
|
||||
#[cfg(test)]
|
||||
fn get_queries(&self) -> Vec<String>;
|
||||
|
||||
@ -151,45 +151,4 @@ impl DatabaseExecutor for SpiExecutor {
|
||||
})
|
||||
}
|
||||
|
||||
fn auth_origin(&self) -> Result<Option<Value>, String> {
|
||||
self.transact(|| {
|
||||
Spi::connect(|client| {
|
||||
let mut tup_table = client
|
||||
.select(
|
||||
"SELECT NULLIF(current_setting('auth.origin', true), '')::jsonb",
|
||||
None,
|
||||
&[],
|
||||
)
|
||||
.map_err(|e| format!("SPI Select Error: {}", e))?;
|
||||
|
||||
if let Some(row) = tup_table.next() {
|
||||
if let Ok(Some(jsonb)) = row.get::<pgrx::JsonB>(1) {
|
||||
return Ok(Some(jsonb.0));
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
fn punc_trigger(&self) -> Result<Option<String>, String> {
|
||||
self.transact(|| {
|
||||
Spi::connect(|client| {
|
||||
let mut tup_table = client
|
||||
.select(
|
||||
"SELECT NULLIF(current_setting('punc.name', true), '')",
|
||||
None,
|
||||
&[],
|
||||
)
|
||||
.map_err(|e| format!("SPI Select Error: {}", e))?;
|
||||
|
||||
if let Some(row) = tup_table.next() {
|
||||
if let Ok(val_opt) = row.get::<String>(1) {
|
||||
return Ok(val_opt);
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@ -206,15 +206,6 @@ impl Database {
|
||||
self.executor.timestamp()
|
||||
}
|
||||
|
||||
/// Returns the current auth.origin session context if configured
|
||||
pub fn auth_origin(&self) -> Result<Option<Value>, String> {
|
||||
self.executor.auth_origin()
|
||||
}
|
||||
|
||||
/// Returns the current punc.name session context if configured
|
||||
pub fn punc_trigger(&self) -> Result<Option<String>, String> {
|
||||
self.executor.punc_trigger()
|
||||
}
|
||||
|
||||
pub fn compile(&mut self, errors: &mut Vec<crate::drop::Error>) {
|
||||
// Phase 1: Registration
|
||||
|
||||
@ -946,25 +946,9 @@ impl Merger {
|
||||
Value::Object(old_vals)
|
||||
};
|
||||
|
||||
let origin = match self.db.auth_origin() {
|
||||
Ok(Some(orig)) => orig,
|
||||
_ => serde_json::json!({
|
||||
"kind": "user",
|
||||
"user_id": user_id
|
||||
}),
|
||||
};
|
||||
|
||||
let trigger = match self.db.punc_trigger() {
|
||||
Ok(Some(trig)) => trig,
|
||||
_ => "merge_entity".to_string(),
|
||||
};
|
||||
|
||||
let entity_type_name = type_name.as_str().unwrap_or(&type_obj.name);
|
||||
|
||||
let mut notification = serde_json::Map::new();
|
||||
notification.insert("type".to_string(), Value::String(entity_type_name.to_string()));
|
||||
notification.insert("trigger".to_string(), Value::String(trigger));
|
||||
notification.insert("origin".to_string(), origin.clone());
|
||||
notification.insert("complete".to_string(), Value::Object(complete));
|
||||
notification.insert("new".to_string(), new_val_obj.clone());
|
||||
|
||||
@ -979,7 +963,7 @@ impl Merger {
|
||||
let mut notify_sql = None;
|
||||
if type_obj.historical && change_kind != "replace" {
|
||||
let change_sql = format!(
|
||||
"INSERT INTO agreego.change (\"old\", \"new\", entity_id, id, kind, modified_at, modified_by, origin, entity_type) VALUES ({}, {}, {}, {}, {}, {}, {}, {}, {})",
|
||||
"INSERT INTO agreego.change (\"old\", \"new\", entity_id, id, kind, modified_at, modified_by, entity_type) VALUES ({}, {}, {}, {}, {}, {}, {}, {})",
|
||||
Self::quote_literal(&old_val_obj),
|
||||
Self::quote_literal(&new_val_obj),
|
||||
Self::quote_literal(id_str),
|
||||
@ -987,7 +971,6 @@ impl Merger {
|
||||
Self::quote_literal(&Value::String(change_kind.to_string())),
|
||||
Self::quote_literal(&Value::String(timestamp.to_string())),
|
||||
Self::quote_literal(&Value::String(user_id.to_string())),
|
||||
Self::quote_literal(&origin),
|
||||
Self::quote_literal(&Value::String(entity_type_name.to_string()))
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user