jeez

Author: juleswritescode

crates/pg_completions/src/item.rs

@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
 pub enum CompletionItemKind {
  Table,
  Function,
+ Column,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

crates/pg_completions/src/providers/columns.rs

@@ -12,7 +12,7 @@ pub fn complete_columns(ctx: &CompletionContext, builder: &mut CompletionBuilder
  score: CompletionRelevanceData::Column(col).get_score(ctx),
  description: format!("Table: {}.{}", col.schema_name, col.table_name),
  preselected: false,
- kind: CompletionItemKind::Function,
+ kind: CompletionItemKind::Column,
  };
 
  builder.add_item(item);

crates/pg_completions/src/relevance.rs

@@ -150,8 +150,7 @@ impl<'a> CompletionRelevance<'a> {
 
  fn check_relations_in_stmt(&mut self, ctx: &CompletionContext) {
  match self.data {
- CompletionRelevanceData::Table(_) => return,
- CompletionRelevanceData::Function(_) => return,
+ CompletionRelevanceData::Table(_) | CompletionRelevanceData::Function(_) => return,
  _ => {}
  }
 

crates/pg_test_utils/Cargo.toml

@@ -15,10 +15,6 @@ version = "0.0.0"
 name = "tree_print"
 path = "src/bin/tree_print.rs"
 
-[[bin]]
-name = "query_debug"
-path = "src/bin/tree_query_debug.rs"
-
 [dependencies]
 anyhow = "1.0.81"
 clap = { version = "4.5.23", features = ["derive"] }

crates/pg_test_utils/src/bin/tree_query_debug.rs

@@ -55,16 +55,13 @@ impl<'a> QueryResultIter<'a> {
 impl<'a> Iterator for QueryResultIter<'a> {
  type Item = &'a QueryResult<'a>;
  fn next(&mut self) -> Option<Self::Item> {
- match self.inner.next() {
- None => return None,
- Some(n) => {
- if self.range.as_ref().is_some_and(|r| !n.within_range(r)) {
- return self.next();
- }
-
- Some(n)
- }
+ let next = self.inner.next()?;
+
+ if self.range.as_ref().is_some_and(|r| !next.within_range(r)) {
+ return self.next();
  }
+
+ Some(next)
  }
 }