ok?

Author: juleswritescode

crates/pgls_completions/src/providers/columns.rs

@@ -541,19 +541,23 @@ mod tests {
             );
         "#;
 
-        assert_no_complete_results(
-            format!(r#"select "e{}""#, QueryWithCursorPosition::cursor_marker()).as_str(),
-            Some(setup),
-            &pool,
-        )
-        .await;
-
-        // TestCompletionsSuite::new(&pool, Some(setup))
-        //     .with_case(
-        //         TestCompletionsCase::new().type_sql(r#"select "email" from "private"."users";"#),
+        // assert_no_complete_results(
+        //     format!(
+        //         r#"select "email" from "p{}""#,
+        //         QueryWithCursorPosition::cursor_marker()
         //     )
-        //     .snapshot("completes_quoted_columns")
-        //     .await;
+        //     .as_str(),
+        //     Some(setup),
+        //     &pool,
+        // )
+        // .await;
+
+        TestCompletionsSuite::new(&pool, Some(setup))
+            .with_case(
+                TestCompletionsCase::new().type_sql(r#"select "email" from "private"."users";"#),
+            )
+            .snapshot("completes_quoted_columns")
+            .await;
     }
 
     #[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]

crates/pgls_completions/src/relevance/scoring.rs

@@ -33,15 +33,52 @@ impl CompletionScore<'_> {
     }
 
     pub fn calc_score(&mut self, ctx: &TreesitterContext) {
+        let case = (matches!(self.data, CompletionRelevanceData::Schema(_))
+            && self.get_schema_name().is_some_and(|s| s == "pg_catalog"))
+            || (matches!(self.data, CompletionRelevanceData::Table(_))
+                && self.get_table_name().is_some_and(|s| s == "parameters"));
+
+        if case {
+            println!("checking {}", self.get_fully_qualified_name())
+        }
+
         self.check_is_user_defined();
+        if case {
+            println!("{} after user-defined check", self.score);
+        }
+
         self.check_matches_schema(ctx);
+        if case {
+            println!("{} after schema match check", self.score);
+        }
         self.check_matches_query_input(ctx);
+        if case {
+            println!("{} after query input match check", self.score);
+        }
         self.check_is_invocation(ctx);
+        if case {
+            println!("{} after invocation check", self.score);
+        }
         self.check_matching_clause_type(ctx);
+        if case {
+            println!("{} after clause type check", self.score);
+        }
         self.check_matching_wrapping_node(ctx);
+        if case {
+            println!("{} after wrapping node check", self.score);
+        }
         self.check_relations_in_stmt(ctx);
+        if case {
+            println!("{} after relations in stmt check", self.score);
+        }
         self.check_columns_in_stmt(ctx);
+        if case {
+            println!("{} after columns in stmt check", self.score);
+        }
         self.check_is_not_wellknown_migration(ctx);
+        if case {
+            println!("{} after well-known migration check", self.score);
+        }
     }
 
     fn check_matches_query_input(&mut self, ctx: &TreesitterContext) {
@@ -125,6 +162,21 @@ impl CompletionScore<'_> {
                 } else {
                     scorei32 / 3
                 };
+
+                if matches!(self.data, CompletionRelevanceData::Schema(_))
+                    && self.get_schema_name().is_some_and(|s| s == "pg_catalog")
+                {
+                    println!("Debug: Schema pg_catalog match score {}", self.score);
+                }
+
+                if matches!(self.data, CompletionRelevanceData::Table(_))
+                    && self.get_table_name().is_some_and(|s| s == "parameters")
+                {
+                    println!(
+                        "Debug: Table information_schema.parameters match score {}",
+                        self.score
+                    );
+                }
             }
             None => self.skip = true,
         }
@@ -202,9 +254,6 @@ impl CompletionScore<'_> {
         };
 
         let has_qualifier = ctx.has_any_qualifier();
-        let has_node_text = ctx
-            .get_node_under_cursor_content()
-            .is_some_and(|txt| !sanitization::is_sanitized_token(txt.as_str()));
 
         self.score += match self.data {
             CompletionRelevanceData::Table(_) => match wrapping_node {
@@ -224,8 +273,7 @@ impl CompletionScore<'_> {
                 _ => -15,
             },
             CompletionRelevanceData::Schema(_) => match wrapping_node {
-                WrappingNode::Relation if !has_qualifier && !has_node_text => 15,
-                WrappingNode::Relation if !has_qualifier && has_node_text => 0,
+                WrappingNode::Relation if !has_qualifier => 15,
                 _ => -50,
             },
             CompletionRelevanceData::Policy(_) => 0,

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns.snap

@@ -54,10 +54,10 @@ select "e|"
 
 Results:
 email - private.users.email (Column)
-id - private.users.id (Column)
 name - private.users.name (Column)
 quoted_column - private.users.quoted_column (Column)
-apply_error_count - pg_catalog.pg_stat_subscription_stats.apply_error_count (Column)
+elem_count_histogram - pg_catalog.pg_stats.elem_count_histogram (Column)
+encoding - pg_catalog.pg_database.encoding (Column)
 
 --------------
 
@@ -101,9 +101,9 @@ select "email" from "p|"
 Results:
 public - public (Schema)
 private - private (Schema)
-private"."users - private.users (Table)
 pg_catalog - pg_catalog (Schema)
 pg_toast - pg_toast (Schema)
+information_schema"."parameters - information_schema.parameters (Table)
 
 --------------
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns_with_aliases.snap

@@ -90,9 +90,9 @@ select "pr"."email" from p|
 Results:
 public - public (Schema)
 private - private (Schema)
+pg_catalog - pg_catalog (Schema)
+pg_toast - pg_toast (Schema)
 information_schema.parameters - information_schema.parameters (Table)
-pg_catalog.pg_aggregate - pg_catalog.pg_aggregate (Table)
-pg_catalog.pg_am - pg_catalog.pg_am (Table)
 
 --------------
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__does_not_complete_cols_in_join_clauses.snap

@@ -69,9 +69,9 @@ select u.uid, p.content from a|
 
 Results:
 auth - auth (Schema)
-public - public (Schema)
-auth.posts - auth.posts (Table)
-auth.users - auth.users (Table)
+information_schema - information_schema (Schema)
+pg_catalog - pg_catalog (Schema)
+pg_toast - pg_toast (Schema)
 information_schema.administrable_role_authorizations - information_schema.administrable_role_authorizations (Table)
 
 --------------
@@ -90,7 +90,6 @@ select u.uid, p.content from auth.u|
 
 Results:
 users - auth.users (Table)
-posts - auth.posts (Table)
 
 --------------
 
@@ -112,9 +111,9 @@ select u.uid, p.content from auth.users u join a|
 
 Results:
 auth - auth (Schema)
-public - public (Schema)
-auth.posts - auth.posts (Table)
-auth.users - auth.users (Table)
+information_schema - information_schema (Schema)
+pg_catalog - pg_catalog (Schema)
+pg_toast - pg_toast (Schema)
 information_schema.administrable_role_authorizations - information_schema.administrable_role_authorizations (Table)
 
 --------------
@@ -131,7 +130,6 @@ select u.uid, p.content from auth.users u join auth.p|
 
 Results:
 posts - auth.posts (Table)
-users - auth.users (Table)
 
 --------------
 
@@ -162,22 +160,10 @@ select u.uid, p.content from auth.users u join auth.posts p on u.u|
 
 Results:
 uid - auth.users.uid (Column)
-email - auth.users.email (Column)
-name - auth.users.name (Column)
 
 --------------
 
 select u.uid, p.content from auth.users u join auth.posts p on u.uid |
-
-Results:
-p.pid - auth.posts.pid (Column)
-u.uid - auth.users.uid (Column)
-p.content - auth.posts.content (Column)
-p.created_at - auth.posts.created_at (Column)
-u.email - auth.users.email (Column)
-
---------------
-
 select u.uid, p.content from auth.users u join auth.posts p on u.uid = |
 
 Results:
@@ -204,20 +190,7 @@ select u.uid, p.content from auth.users u join auth.posts p on u.uid = p.u|
 
 Results:
 user_id - auth.posts.user_id (Column)
-pid - auth.posts.pid (Column)
-content - auth.posts.content (Column)
-created_at - auth.posts.created_at (Column)
-title - auth.posts.title (Column)
 
 --------------
 
 select u.uid, p.content from auth.users u join auth.posts p on u.uid = p.user_id |
-
-Results:
-p.pid - auth.posts.pid (Column)
-u.uid - auth.users.uid (Column)
-p.content - auth.posts.content (Column)
-p.created_at - auth.posts.created_at (Column)
-u.email - auth.users.email (Column)
-
---------------

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__filters_out_by_aliases_in_join_on.snap

@@ -51,21 +51,10 @@ select u.id, p.content from auth.users u join auth.posts p on u.i|
 Results:
 uid - auth.users.uid (Column)
 email - auth.users.email (Column)
-name - auth.users.name (Column)
 
 --------------
 
 select u.id, p.content from auth.users u join auth.posts p on u.id |
-
-Results:
-p.pid - auth.posts.pid (Column)
-u.uid - auth.users.uid (Column)
-p.content - auth.posts.content (Column)
-p.created_at - auth.posts.created_at (Column)
-u.email - auth.users.email (Column)
-
---------------
-
 select u.id, p.content from auth.users u join auth.posts p on u.id = |
 
 Results:
@@ -93,20 +82,7 @@ select u.id, p.content from auth.users u join auth.posts p on u.id = p.u|
 
 Results:
 user_id - auth.posts.user_id (Column)
-pid - auth.posts.pid (Column)
-content - auth.posts.content (Column)
-created_at - auth.posts.created_at (Column)
-title - auth.posts.title (Column)
 
 --------------
 
 select u.id, p.content from auth.users u join auth.posts p on u.id = p.user_id |
-
-Results:
-p.pid - auth.posts.pid (Column)
-u.uid - auth.users.uid (Column)
-p.content - auth.posts.content (Column)
-p.created_at - auth.posts.created_at (Column)
-u.email - auth.users.email (Column)
-
---------------

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__filters_out_by_aliases_in_select.snap

@@ -49,7 +49,6 @@ select u.i| from auth.users u join auth.posts p on u.id = p.user_id;
 Results:
 email - auth.users.email (Column)
 uid - auth.users.uid (Column)
-name - auth.users.name (Column)
 
 --------------
 
@@ -81,10 +80,6 @@ select u.id, p.p| from auth.users u join auth.posts p on u.id = p.user_id;
 
 Results:
 pid - auth.posts.pid (Column)
-content - auth.posts.content (Column)
-created_at - auth.posts.created_at (Column)
-title - auth.posts.title (Column)
-user_id - auth.posts.user_id (Column)
 
 --------------
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__handles_nested_queries.snap

@@ -29,31 +29,11 @@ select * from (
 ) as subquery
 join public.users u
 on u.id = subquery.id;
-
-Results:
-audio_books - public.audio_books (Table)
-users - public.users (Table)
-private.audio_books - private.audio_books (Table)
-information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
-information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
-
---------------
-
 select * from (
     s|
 ) as subquery
 join public.users u
 on u.id = subquery.id;
-
-Results:
-audio_books - public.audio_books (Table)
-users - public.users (Table)
-private.audio_books - private.audio_books (Table)
-information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
-information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
-
---------------
-
 select * from (
     select |
 ) as subquery
@@ -150,9 +130,9 @@ on u.id = subquery.id;
 Results:
 public - public (Schema)
 private - private (Schema)
-audio_books - public.audio_books (Table)
-users - public.users (Table)
-private.audio_books - private.audio_books (Table)
+pg_catalog - pg_catalog (Schema)
+pg_toast - pg_toast (Schema)
+information_schema.parameters - information_schema.parameters (Table)
 
 --------------
 

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__ignores_cols_in_from_clause.snap

@@ -35,9 +35,9 @@ select * from p|
 Results:
 public - public (Schema)
 private - private (Schema)
-private.users - private.users (Table)
+pg_catalog - pg_catalog (Schema)
+pg_toast - pg_toast (Schema)
 information_schema.parameters - information_schema.parameters (Table)
-pg_catalog.pg_aggregate - pg_catalog.pg_aggregate (Table)
 
 --------------