fix(completion): include PostgreSQL function parameters

This commit is contained in:
zipg authored and GitHub committed 2026-07-28 21:25:30 +08:00
1 parent a0d4a31467
commit 89c69ebe65
11 files changed
+166 -7

No files matched your search

+4
View File
@@ -1919,6 +1919,7 @@ pub async fn completion_assistant_search(
parent_name: None,
comment: None,
data_type: None,
signature: None,
});
}
}
@@ -1944,6 +1945,7 @@ pub async fn completion_assistant_search(
.map(|s| fix_potential_double_encoding(&s))
.filter(|s| !s.is_empty()),
data_type: None,
signature: None,
});
}
}
@@ -1969,6 +1971,7 @@ pub async fn completion_assistant_search(
.map(|s| fix_potential_double_encoding(&s))
.filter(|s| !s.is_empty()),
data_type: get_opt_str(&row, "data_type"),
signature: None,
});
}
}
@@ -1990,6 +1993,7 @@ pub async fn completion_assistant_search(
.map(|s| fix_potential_double_encoding(&s))
.filter(|s| !s.is_empty()),
data_type: Some(get_str_by_name(&row, "data_type")),
signature: None,
});
}
}
+7 -1
View File
@@ -1869,6 +1869,7 @@ pub async fn completion_assistant_search(
parent_name: None,
comment: None,
data_type: None,
signature: None,
});
}
}
@@ -1897,6 +1898,7 @@ pub async fn completion_assistant_search(
parent_name: row.try_get::<_, Option<String>>(5).ok().flatten(),
comment: row.try_get::<_, Option<String>>(3).ok().flatten(),
data_type: None,
signature: None,
});
}
}
@@ -1925,6 +1927,7 @@ pub async fn completion_assistant_search(
parent_name: None,
comment: row.try_get::<_, Option<String>>(3).ok().flatten(),
data_type: row.try_get::<_, Option<String>>(4).ok().flatten(),
signature: row.try_get::<_, Option<String>>(5).ok().flatten(),
});
}
}
@@ -1962,6 +1965,7 @@ pub async fn completion_assistant_search(
parent_name: Some(table.to_string()),
comment: row.try_get::<_, Option<String>>(2).ok().flatten(),
data_type: Some(pg_row_try_string(&row, 1)),
signature: None,
});
}
}
@@ -1990,7 +1994,8 @@ fn postgres_completion_tables_sql() -> &'static str {
fn postgres_completion_routines_sql() -> &'static str {
"SELECT p.proname, n.nspname, CASE p.prokind WHEN 'p' THEN 'PROCEDURE' ELSE 'FUNCTION' END, \
obj_description(p.oid) AS routine_comment, COALESCE(pg_get_function_result(p.oid), '') AS data_type \
obj_description(p.oid) AS routine_comment, COALESCE(pg_get_function_result(p.oid), '') AS data_type, \
pg_get_function_identity_arguments(p.oid) AS signature \
FROM pg_catalog.pg_proc p \
JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace \
WHERE n.nspname = $1 AND p.prokind::text = ANY($3::text[]) \
@@ -5651,6 +5656,7 @@ mod tests {
assert!(postgres_completion_tables_sql().contains("ORDER BY c.relname LIMIT $4"));
assert!(postgres_completion_routines_sql().contains("p.proname ILIKE $2 ESCAPE '~'"));
assert!(postgres_completion_routines_sql().contains("p.prokind::text = ANY($3::text[])"));
assert!(postgres_completion_routines_sql().contains("pg_get_function_identity_arguments(p.oid) AS signature"));
assert!(postgres_completion_routines_sql().contains("ORDER BY p.proname LIMIT $4"));
assert!(postgres_completion_columns_sql().contains("a.attname ILIKE $3 ESCAPE '~'"));
assert!(postgres_visible_table_schema_sql().contains("pg_catalog.pg_table_is_visible(c.oid)"));
+3
View File
@@ -1376,6 +1376,7 @@ fn sqlite_completion_schemas(
parent_name: None,
comment: None,
data_type: None,
signature: None,
})
.collect())
}
@@ -1429,6 +1430,7 @@ fn sqlite_completion_tables(
parent_name: None,
comment: None,
data_type: None,
signature: None,
})
})
.map_err(|e| e.to_string())?;
@@ -1467,6 +1469,7 @@ fn sqlite_completion_columns(
parent_name: Some(table.to_string()),
comment: None,
data_type: Some(data_type),
signature: None,
});
if candidates.len() >= limit {
break;
+1
View File
@@ -1338,6 +1338,7 @@ pub async fn completion_assistant_search(
parent_name: row.get::<&str, _>(4).map(str::to_string),
comment: row.get::<&str, _>(5).filter(|s: &&str| !s.is_empty()).map(|s| (*s).to_string()),
data_type: row.get::<&str, _>(6).map(str::to_string),
signature: None,
}
})
.collect::<Vec<_>>();
+6
View File
@@ -591,6 +591,7 @@ fn duckdb_completion_schemas(
parent_name: None,
comment: None,
data_type: None,
signature: None,
})
})
.map_err(|e| e.to_string())?;
@@ -641,6 +642,7 @@ fn duckdb_completion_tables(
parent_name: None,
comment: None,
data_type: None,
signature: None,
})
})
.map_err(|e| e.to_string())?;
@@ -686,6 +688,7 @@ fn duckdb_completion_columns(
parent_name: Some(table.to_string()),
comment: None,
data_type: Some(row.get(1)?),
signature: None,
})
})
.map_err(|e| e.to_string())?;
@@ -4327,6 +4330,7 @@ async fn completion_assistant_fallback_core(
parent_name: None,
comment: None,
data_type: None,
signature: None,
});
}
if candidates.len() >= limit {
@@ -4364,6 +4368,7 @@ async fn completion_assistant_fallback_core(
parent_name: table.parent_name,
comment: table.comment,
data_type: None,
signature: None,
});
if candidates.len() >= limit {
return Ok(db::CompletionAssistantResponse { candidates, incomplete: true, fallback_used: true });
@@ -4385,6 +4390,7 @@ async fn completion_assistant_fallback_core(
parent_name: Some(table.to_string()),
comment: column.comment,
data_type: Some(column.data_type),
signature: None,
});
}
if candidates.len() >= limit {
+1
View File
@@ -215,6 +215,7 @@ pub struct CompletionAssistantCandidate {
pub parent_name: Option<String>,
pub comment: Option<String>,
pub data_type: Option<String>,
pub signature: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]