fix(schema): load MySQL DDL through generic JDBC
This commit is contained in:
1 file changed
+140
-2
@@ -2463,8 +2463,9 @@ mod tests {
|
|||||||
dameng_object_statistics_rows_only_sql, dameng_object_statistics_user_segments_sql, deduplicate_column_infos,
|
dameng_object_statistics_rows_only_sql, dameng_object_statistics_user_segments_sql, deduplicate_column_infos,
|
||||||
ephemeral_agent_metadata_session_id, filter_mongodb_agent_collections,
|
ephemeral_agent_metadata_session_id, filter_mongodb_agent_collections,
|
||||||
filter_mysql_system_databases_for_config, filter_object_infos, filter_table_infos, filter_visible_schema_names,
|
filter_mysql_system_databases_for_config, filter_object_infos, filter_table_infos, filter_visible_schema_names,
|
||||||
gbase8a_object_statistics_sql, is_agent_postgres_metadata_fallback_config, is_retryable_metadata_error,
|
gbase8a_object_statistics_sql, is_agent_postgres_metadata_fallback_config, is_mysql_external_driver_config,
|
||||||
metadata_name_or_comment_matches, mysql_object_source_ddl_column_index, mysql_object_source_sql,
|
is_retryable_metadata_error, metadata_name_or_comment_matches, mysql_external_driver_ddl_from_query_result,
|
||||||
|
mysql_external_driver_ddl_sql, mysql_object_source_ddl_column_index, mysql_object_source_sql,
|
||||||
mysql_table_metadata_catalog, normalize_information_schema_table_type, oracle_columns_from_query_result,
|
mysql_table_metadata_catalog, normalize_information_schema_table_type, oracle_columns_from_query_result,
|
||||||
oracle_columns_sql, oracle_object_statistics_dba_segments_sql, oracle_object_statistics_from_query_result,
|
oracle_columns_sql, oracle_object_statistics_dba_segments_sql, oracle_object_statistics_from_query_result,
|
||||||
oracle_object_statistics_rows_only_sql, oracle_object_statistics_sql,
|
oracle_object_statistics_rows_only_sql, oracle_object_statistics_sql,
|
||||||
@@ -2573,6 +2574,78 @@ mod tests {
|
|||||||
assert_eq!(mysql_table_metadata_catalog("app_db", "tenant_db"), "tenant_db");
|
assert_eq!(mysql_table_metadata_catalog("app_db", "tenant_db"), "tenant_db");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mysql_external_driver_detection_only_accepts_standard_jdbc_signals() {
|
||||||
|
let mut config = test_connection_config(DatabaseType::Jdbc);
|
||||||
|
config.connection_string = Some(" jdbc:mysql://127.0.0.1:3306/demo ".to_string());
|
||||||
|
assert!(is_mysql_external_driver_config(&config));
|
||||||
|
|
||||||
|
config.connection_string = Some("jdbc:mariadb://127.0.0.1:3306/demo".to_string());
|
||||||
|
config.jdbc_driver_class = Some("com.mysql.cj.jdbc.Driver".to_string());
|
||||||
|
assert!(!is_mysql_external_driver_config(&config));
|
||||||
|
|
||||||
|
config.connection_string = None;
|
||||||
|
assert!(is_mysql_external_driver_config(&config));
|
||||||
|
|
||||||
|
config.jdbc_driver_class = Some("org.mariadb.jdbc.Driver".to_string());
|
||||||
|
assert!(!is_mysql_external_driver_config(&config));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mysql_external_driver_ddl_sql_uses_catalog_and_escaped_identifiers() {
|
||||||
|
assert_eq!(
|
||||||
|
mysql_external_driver_ddl_sql("app_db", "tenant`db", "user`events"),
|
||||||
|
"SHOW CREATE TABLE `tenant``db`.`user``events`"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
mysql_external_driver_ddl_sql("app`db", "", "user`events"),
|
||||||
|
"SHOW CREATE TABLE `app``db`.`user``events`"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mysql_external_driver_ddl_reads_named_column_case_insensitively() {
|
||||||
|
let result = db::QueryResult {
|
||||||
|
columns: vec!["Table".to_string(), "Extra".to_string(), "CREATE TABLE".to_string()],
|
||||||
|
column_types: Vec::new(),
|
||||||
|
column_sortables: Vec::new(),
|
||||||
|
rows: vec![vec![
|
||||||
|
serde_json::json!("users"),
|
||||||
|
serde_json::json!("ignored"),
|
||||||
|
serde_json::json!("CREATE TABLE `users` (`id` bigint)"),
|
||||||
|
]],
|
||||||
|
affected_rows: 0,
|
||||||
|
execution_time_ms: 0,
|
||||||
|
truncated: false,
|
||||||
|
session_id: None,
|
||||||
|
has_more: false,
|
||||||
|
elasticsearch_raw_body: None,
|
||||||
|
};
|
||||||
|
|
||||||
|
assert_eq!(mysql_external_driver_ddl_from_query_result(result).unwrap(), "CREATE TABLE `users` (`id` bigint);");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn mysql_external_driver_ddl_falls_back_to_second_column() {
|
||||||
|
let result = db::QueryResult {
|
||||||
|
columns: vec!["name".to_string(), "definition".to_string()],
|
||||||
|
column_types: Vec::new(),
|
||||||
|
column_sortables: Vec::new(),
|
||||||
|
rows: vec![vec![serde_json::json!("users"), serde_json::json!("CREATE TABLE `users` (`id` bigint);\n")]],
|
||||||
|
affected_rows: 0,
|
||||||
|
execution_time_ms: 0,
|
||||||
|
truncated: false,
|
||||||
|
session_id: None,
|
||||||
|
has_more: false,
|
||||||
|
elasticsearch_raw_body: None,
|
||||||
|
};
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
mysql_external_driver_ddl_from_query_result(result).unwrap(),
|
||||||
|
"CREATE TABLE `users` (`id` bigint);\n"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn mysql_object_source_sql_qualifies_cross_database_objects() {
|
fn mysql_object_source_sql_qualifies_cross_database_objects() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
@@ -5344,6 +5417,14 @@ async fn get_table_ddl_core_with_options(
|
|||||||
|
|
||||||
{
|
{
|
||||||
let connections = state.connections.read().await;
|
let connections = state.connections.read().await;
|
||||||
|
if let Some(PoolKind::ExternalDriver { config, session, .. }) = connections.get(&pool_key) {
|
||||||
|
if is_mysql_external_driver_config(config.as_ref()) {
|
||||||
|
let config = config.clone();
|
||||||
|
let session = session.clone();
|
||||||
|
drop(connections);
|
||||||
|
return external_driver_mysql_ddl(session, config.as_ref(), database, schema, table).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
#[cfg(feature = "duckdb-sidecar")]
|
#[cfg(feature = "duckdb-sidecar")]
|
||||||
if let Some(client) = extract_pool!(&connections, &pool_key, DuckDbWorker) {
|
if let Some(client) = extract_pool!(&connections, &pool_key, DuckDbWorker) {
|
||||||
let client = client.clone();
|
let client = client.clone();
|
||||||
@@ -5578,6 +5659,40 @@ fn mysql_qualified_name(database: &str, name: &str) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_mysql_external_driver_config(config: &ConnectionConfig) -> bool {
|
||||||
|
if config.db_type != DatabaseType::Jdbc {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
let connection_string = config.connection_string.as_deref().map(str::trim).filter(|value| !value.is_empty());
|
||||||
|
let driver_class = config.jdbc_driver_class.as_deref().map(str::trim).filter(|value| !value.is_empty());
|
||||||
|
let mysql_url = connection_string.map(|value| value.to_ascii_lowercase().starts_with("jdbc:mysql:"));
|
||||||
|
let mysql_driver = driver_class.map(|value| matches!(value, "com.mysql.cj.jdbc.Driver" | "com.mysql.jdbc.Driver"));
|
||||||
|
|
||||||
|
match (mysql_url, mysql_driver) {
|
||||||
|
(Some(url_matches), Some(driver_matches)) => url_matches && driver_matches,
|
||||||
|
(Some(url_matches), None) => url_matches,
|
||||||
|
(None, Some(driver_matches)) => driver_matches,
|
||||||
|
(None, None) => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mysql_external_driver_ddl_sql(database: &str, schema: &str, table: &str) -> String {
|
||||||
|
format!("SHOW CREATE TABLE {}", mysql_qualified_name(mysql_table_metadata_catalog(database, schema), table))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mysql_external_driver_ddl_from_query_result(result: db::QueryResult) -> Result<String, String> {
|
||||||
|
let row = result.rows.first().ok_or_else(|| "DDL not found".to_string())?;
|
||||||
|
let named_index = result.columns.iter().position(|column| column.trim().eq_ignore_ascii_case("Create Table"));
|
||||||
|
let ddl = named_index
|
||||||
|
.into_iter()
|
||||||
|
.chain(std::iter::once(1))
|
||||||
|
.filter_map(|index| query_result_cell_string(row, index))
|
||||||
|
.find(|value| !value.trim().is_empty())
|
||||||
|
.ok_or_else(|| "Failed to read DDL".to_string())?;
|
||||||
|
Ok(ensure_display_ddl_terminated(ddl))
|
||||||
|
}
|
||||||
|
|
||||||
fn sqlite_object_type(kind: &db::ObjectSourceKind) -> &'static str {
|
fn sqlite_object_type(kind: &db::ObjectSourceKind) -> &'static str {
|
||||||
match kind {
|
match kind {
|
||||||
db::ObjectSourceKind::View | db::ObjectSourceKind::MaterializedView => "view",
|
db::ObjectSourceKind::View | db::ObjectSourceKind::MaterializedView => "view",
|
||||||
@@ -7258,6 +7373,29 @@ pub async fn mysql_ddl(pool: &db::mysql::MySqlPool, database: &str, table: &str)
|
|||||||
Ok(ensure_display_ddl_terminated(ddl))
|
Ok(ensure_display_ddl_terminated(ddl))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn external_driver_mysql_ddl(
|
||||||
|
session: std::sync::Arc<crate::plugins::PluginDriverSession>,
|
||||||
|
config: &ConnectionConfig,
|
||||||
|
database: &str,
|
||||||
|
schema: &str,
|
||||||
|
table: &str,
|
||||||
|
) -> Result<String, String> {
|
||||||
|
let result: db::QueryResult = session
|
||||||
|
.invoke_with_timeout(
|
||||||
|
"executeQuery",
|
||||||
|
serde_json::json!({
|
||||||
|
"connection": config,
|
||||||
|
"database": database,
|
||||||
|
"schema": schema,
|
||||||
|
"sql": mysql_external_driver_ddl_sql(database, schema, table),
|
||||||
|
"maxRows": 1
|
||||||
|
}),
|
||||||
|
agent_metadata_timeout(Some(config)),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
mysql_external_driver_ddl_from_query_result(result)
|
||||||
|
}
|
||||||
|
|
||||||
fn ensure_display_ddl_terminated(sql: String) -> String {
|
fn ensure_display_ddl_terminated(sql: String) -> String {
|
||||||
let trimmed = sql.trim_end();
|
let trimmed = sql.trim_end();
|
||||||
// SHOW CREATE TABLE returns a table definition, not a runnable script; DBX
|
// SHOW CREATE TABLE returns a table definition, not a runnable script; DBX
|
||||||
|
|||||||
Reference in new issue
Block a user