fix(sidebar): preserve comment-matched tables during remote table list refresh
This commit is contained in:
3 files changed
+89
-12
No files matched your search
@@ -1154,7 +1154,10 @@ fn filter_list_tables_fallback(
|
||||
|
||||
tables
|
||||
.into_iter()
|
||||
.filter(|table| crate::sql::contains_or_fuzzy_match(&table.name, filter))
|
||||
.filter(|table| {
|
||||
crate::sql::contains_or_fuzzy_match(&table.name, filter)
|
||||
|| table.comment.as_deref().is_some_and(|comment| crate::sql::contains_or_fuzzy_match(comment, filter))
|
||||
})
|
||||
.filter(|table| if table.table_type.eq_ignore_ascii_case("VIEW") { wants_view } else { wants_table })
|
||||
.skip(offset.unwrap_or(0))
|
||||
.take(limit.unwrap_or(usize::MAX))
|
||||
@@ -1196,12 +1199,18 @@ fn list_tables_sql(
|
||||
value.replace('\\', "\\\\").replace('%', "\\%").replace('_', "\\_")
|
||||
});
|
||||
sql.push_str(&format!(
|
||||
" AND (LOWER(TABLE_NAME) LIKE {} ESCAPE '\\\\' OR LOWER(TABLE_NAME) LIKE {} ESCAPE '\\\\')",
|
||||
" AND (LOWER(TABLE_NAME) LIKE {} ESCAPE '\\\\' OR LOWER(TABLE_COMMENT) LIKE {} ESCAPE '\\\\' OR LOWER(TABLE_NAME) LIKE {} ESCAPE '\\\\' OR LOWER(TABLE_COMMENT) LIKE {} ESCAPE '\\\\')",
|
||||
quote_value(&pattern),
|
||||
quote_value(&pattern),
|
||||
quote_value(&fuzzy_pattern),
|
||||
quote_value(&fuzzy_pattern)
|
||||
));
|
||||
} else {
|
||||
sql.push_str(&format!(" AND LOWER(TABLE_NAME) LIKE {} ESCAPE '\\\\'", quote_value(&pattern)));
|
||||
sql.push_str(&format!(
|
||||
" AND (LOWER(TABLE_NAME) LIKE {} ESCAPE '\\\\' OR LOWER(TABLE_COMMENT) LIKE {} ESCAPE '\\\\')",
|
||||
quote_value(&pattern),
|
||||
quote_value(&pattern)
|
||||
));
|
||||
}
|
||||
}
|
||||
sql.push_str(" ORDER BY TABLE_NAME");
|
||||
@@ -3051,7 +3060,9 @@ mod tests {
|
||||
assert!(sql.contains("FROM information_schema.TABLES"));
|
||||
assert!(sql.contains("TABLE_SCHEMA = 'app'"));
|
||||
assert!(sql.contains("LOWER(TABLE_NAME) LIKE '%user\\\\_\\\\%%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_COMMENT) LIKE '%user\\\\_\\\\%%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_NAME) LIKE '%u%s%e%r%\\\\_%\\\\%%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_COMMENT) LIKE '%u%s%e%r%\\\\_%\\\\%%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("ORDER BY TABLE_NAME"));
|
||||
assert!(sql.contains("LIMIT 101"));
|
||||
assert!(sql.contains("OFFSET 200"));
|
||||
@@ -3062,7 +3073,9 @@ mod tests {
|
||||
let sql = list_tables_sql("app", Some("sysu"), Some(100), None, None);
|
||||
|
||||
assert!(sql.contains("LOWER(TABLE_NAME) LIKE '%sysu%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_COMMENT) LIKE '%sysu%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_NAME) LIKE '%s%y%s%u%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_COMMENT) LIKE '%s%y%s%u%' ESCAPE '\\\\'"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -3070,7 +3083,9 @@ mod tests {
|
||||
let sql = list_tables_sql("app", Some("u"), Some(100), None, None);
|
||||
|
||||
assert!(sql.contains("LOWER(TABLE_NAME) LIKE '%u%' ESCAPE '\\\\'"));
|
||||
assert!(sql.contains("LOWER(TABLE_COMMENT) LIKE '%u%' ESCAPE '\\\\'"));
|
||||
assert_eq!(sql.matches("LOWER(TABLE_NAME) LIKE").count(), 1);
|
||||
assert_eq!(sql.matches("LOWER(TABLE_COMMENT) LIKE").count(), 1);
|
||||
assert!(!sql.contains(" OR LOWER(TABLE_NAME) LIKE"));
|
||||
}
|
||||
|
||||
@@ -3116,7 +3131,7 @@ mod tests {
|
||||
TableInfo {
|
||||
name: "audit_2025".to_string(),
|
||||
table_type: "BASE TABLE".to_string(),
|
||||
comment: None,
|
||||
comment: Some("purchase order history".to_string()),
|
||||
parent_schema: None,
|
||||
parent_name: None,
|
||||
},
|
||||
@@ -3124,6 +3139,17 @@ mod tests {
|
||||
let filtered = filter_list_tables_fallback(rows, Some("audit"), Some(1), Some(1), Some(&["TABLE".to_string()]));
|
||||
|
||||
assert_eq!(filtered.iter().map(|table| table.name.as_str()).collect::<Vec<_>>(), vec!["audit_2025"]);
|
||||
|
||||
let rows = vec![TableInfo {
|
||||
name: "t_0001".to_string(),
|
||||
table_type: "BASE TABLE".to_string(),
|
||||
comment: Some("food orders".to_string()),
|
||||
parent_schema: None,
|
||||
parent_name: None,
|
||||
}];
|
||||
let filtered = filter_list_tables_fallback(rows, Some("ood"), None, None, Some(&["TABLE".to_string()]));
|
||||
|
||||
assert_eq!(filtered.iter().map(|table| table.name.as_str()).collect::<Vec<_>>(), vec!["t_0001"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in new issue
Block a user