fix(sql-file): preserve Oracle schema during file execution
Closes #10502
This commit is contained in:
20 files changed
+269
-41
No files matched your search
@@ -8653,6 +8653,21 @@ mod tests {
|
||||
assert_eq!(scoped.database.as_deref(), Some("ORCL"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn connection_root_schema_databases_keep_the_configured_database() {
|
||||
for database_type in [DatabaseType::Oracle, DatabaseType::Dameng, DatabaseType::OceanbaseOracle] {
|
||||
let mut config = mysql_config(Some("tenant_service"));
|
||||
config.db_type = database_type;
|
||||
|
||||
let scoped = database_connection_config(&config, Some("APP"));
|
||||
|
||||
assert_eq!(scoped.database.as_deref(), Some("tenant_service"));
|
||||
}
|
||||
|
||||
let mysql = database_connection_config(&mysql_config(Some("tenant_service")), Some("analytics"));
|
||||
assert_eq!(mysql.database.as_deref(), Some("analytics"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_reuses_connection_scoped_pool_for_schema_database_keys() {
|
||||
assert_eq!(
|
||||
|
||||
@@ -589,7 +589,7 @@ async fn set_relational_constraints_enabled(
|
||||
&request.connection_id,
|
||||
&request.database,
|
||||
sql,
|
||||
None,
|
||||
request.schema.as_deref(),
|
||||
Some(token.clone()),
|
||||
QueryExecutionOptions::default(),
|
||||
)
|
||||
@@ -604,10 +604,13 @@ async fn sql_file_transaction_schema(state: &AppState, request: &SqlFileRequest)
|
||||
let sessions = state.transaction_sessions.read().await;
|
||||
let session =
|
||||
sessions.get(session_id).ok_or("SQL file transaction session not found; no statements were retried")?;
|
||||
if session.connection_id != request.connection_id || session.database != request.database {
|
||||
if session.connection_id != request.connection_id
|
||||
|| session.database != request.database
|
||||
|| request.schema.as_ref().is_some_and(|schema| session.schema.as_ref() != Some(schema))
|
||||
{
|
||||
return Err("SQL file target does not match its manual transaction".to_string());
|
||||
}
|
||||
Ok(session.schema.clone())
|
||||
Ok(request.schema.clone().or_else(|| session.schema.clone()))
|
||||
}
|
||||
|
||||
async fn with_sql_file_transaction<T>(
|
||||
@@ -2592,7 +2595,7 @@ async fn execute_sql_file_statement(
|
||||
&request.connection_id,
|
||||
&request.database,
|
||||
sql,
|
||||
None,
|
||||
request.schema.as_deref(),
|
||||
Some(child_token),
|
||||
QueryExecutionOptions { execution_id: Some(execution_id), timeout_secs, ..Default::default() },
|
||||
)
|
||||
@@ -2704,6 +2707,7 @@ mod tests {
|
||||
execution_id: "file-missing-session".to_string(),
|
||||
connection_id: "unconfigured".to_string(),
|
||||
database: String::new(),
|
||||
schema: None,
|
||||
file_path: String::new(),
|
||||
continue_on_error: false,
|
||||
selected_tables: None,
|
||||
@@ -3056,6 +3060,7 @@ mod tests {
|
||||
execution_id: "file-progress".to_string(),
|
||||
connection_id: "unconfigured".to_string(),
|
||||
database: String::new(),
|
||||
schema: None,
|
||||
file_path: path.to_string_lossy().to_string(),
|
||||
continue_on_error: false,
|
||||
selected_tables: None,
|
||||
@@ -3488,6 +3493,7 @@ mod tests {
|
||||
execution_id: "gauss-stop-on-error".to_string(),
|
||||
connection_id: "gauss-stream".to_string(),
|
||||
database: String::new(),
|
||||
schema: None,
|
||||
file_path: path.to_string_lossy().to_string(),
|
||||
continue_on_error: true,
|
||||
selected_tables: None,
|
||||
|
||||
@@ -11427,7 +11427,11 @@ for line in sys.stdin:
|
||||
request = json.loads(line)
|
||||
method = request.get("method")
|
||||
if method == "execute_query":
|
||||
sql = request.get("params", {{}}).get("sql", "")
|
||||
params = request.get("params", {{}})
|
||||
sql = params.get("sql", "")
|
||||
if "REQUIRE_APP_SCHEMA" in sql and params.get("schema") != "APP":
|
||||
print(json.dumps({{"jsonrpc": "2.0", "id": request["id"], "error": {{"code": -32000, "message": "schema was not forwarded"}}}}), flush=True)
|
||||
continue
|
||||
if "RAISE_FILE_ERROR" in sql:
|
||||
print(json.dumps({{"jsonrpc": "2.0", "id": request["id"], "error": {{"code": -32000, "message": "file statement rejected"}}}}), flush=True)
|
||||
continue
|
||||
@@ -11491,7 +11495,7 @@ for line in sys.stdin:
|
||||
snapshot_rotation_safe: true,
|
||||
connection_id: "agent-conn".to_string(),
|
||||
database: "ORCL".to_string(),
|
||||
schema: None,
|
||||
schema: Some("APP".to_string()),
|
||||
},
|
||||
);
|
||||
(state, txn_session_id, dir)
|
||||
@@ -11503,6 +11507,7 @@ for line in sys.stdin:
|
||||
execution_id: "manual-file-test".to_string(),
|
||||
connection_id: "agent-conn".to_string(),
|
||||
database: "ORCL".to_string(),
|
||||
schema: Some("APP".to_string()),
|
||||
file_path: String::new(),
|
||||
continue_on_error: false,
|
||||
selected_tables: None,
|
||||
@@ -11521,7 +11526,7 @@ for line in sys.stdin:
|
||||
crate::data::sql_file_import::execute_sql_file_content(
|
||||
&state,
|
||||
&request,
|
||||
"UPDATE T SET V = 1; UPDATE T SET V = 2;",
|
||||
"SELECT REQUIRE_APP_SCHEMA; UPDATE T SET V = 2;",
|
||||
CancellationToken::new(),
|
||||
std::time::Instant::now(),
|
||||
|event| events.push(event),
|
||||
@@ -11637,6 +11642,23 @@ for line in sys.stdin:
|
||||
assert!(events.is_empty());
|
||||
assert!(state.transaction_sessions.read().await.contains_key(&session_id));
|
||||
}
|
||||
let mut request = manual_sql_file_request(&session_id);
|
||||
request.schema = Some("OTHER".to_string());
|
||||
let mut events = Vec::new();
|
||||
let error = crate::data::sql_file_import::execute_sql_file_content(
|
||||
&state,
|
||||
&request,
|
||||
"UPDATE T SET V = 1;",
|
||||
CancellationToken::new(),
|
||||
std::time::Instant::now(),
|
||||
|event| events.push(event),
|
||||
)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert!(error.contains("target does not match"));
|
||||
assert!(events.is_empty());
|
||||
assert!(state.transaction_sessions.read().await.contains_key(&session_id));
|
||||
|
||||
rollback_manual_transaction(&state, &session_id).await.unwrap();
|
||||
let error = crate::data::sql_file_import::execute_sql_file_content(
|
||||
&state,
|
||||
|
||||
Reference in new issue
Block a user