ok

Author: juleswritescode

crates/pgls_completions/src/providers/columns.rs

@@ -79,12 +79,12 @@ mod tests {
         TestCompletionsCase::new()
         .inside_static_statement(r#"
             select * from (
-                <sql>
+                <sql> from private.audio_books
             ) as subquery
             join public.users u
             on u.id = subquery.id;
             "#)
-            .type_sql("select id, narrator_id<1> from private.audio_books")
+            .type_sql("select id, narrator_id<1>")
             .comment("Should prefer the one from private.audio_audiobooks, since the other tables are out of scope.")
         )
             .snapshot("handles_nested_queries")

crates/pgls_completions/src/relevance/scoring.rs

@@ -444,9 +444,16 @@ impl CompletionScore<'_> {
         }
 
         // "public" is the default postgres schema where users
-        // create objects. Prefer it by a slight bit.
+        // create objects. Prefer it by a slight bit, but do not suggest the literal one.
         if schema_name.as_str() == "public" {
-            self.score += 2;
+            match self.data {
+                CompletionRelevanceData::Schema(_) => {
+                    self.score -= 2;
+                }
+                _ => {
+                    self.score += 2;
+                }
+            }
         }
 
         let item_name = self.get_item_name().to_string();

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__handles_nested_queries.snap

@@ -25,141 +25,79 @@ create table private.audio_books (
 --------------
 
 select * from (
-    |
+    | from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;
 select * from (
-    s|
+    s| from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;
 select * from (
-    select |
+    select | from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;
 
 Results:
+id - private.audio_books.id (Column)
+narrator_id - private.audio_books.narrator_id (Column)
 id - public.audio_books.id (Column)
 name - public.users.name (Column)
 narrator - public.audio_books.narrator (Column)
-id - private.audio_books.id (Column)
-narrator_id - private.audio_books.narrator_id (Column)
 
 --------------
 
 select * from (
-    select i|
+    select i| from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;
 
 Results:
-id - public.audio_books.id (Column)
+id - private.audio_books.id (Column)
 narrator_id - private.audio_books.narrator_id (Column)
-iclikejoinsel - Schema: pg_catalog.iclikejoinsel (Function)
-iclikesel - Schema: pg_catalog.iclikesel (Function)
-icnlikejoinsel - Schema: pg_catalog.icnlikejoinsel (Function)
+id - public.audio_books.id (Column)
+ident - pg_catalog.pg_backend_memory_contexts.ident (Column)
+identity_cycle - information_schema.columns.identity_cycle (Column)
 
 --------------
 
 select * from (
-    select id, |
+    select id, | from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;
 **Should prefer the one from private.audio_audiobooks, since the other tables are out of scope.**
 
 Results:
+narrator_id - private.audio_books.narrator_id (Column)
+id - private.audio_books.id (Column)
 name - public.users.name (Column)
 narrator - public.audio_books.narrator (Column)
-narrator_id - private.audio_books.narrator_id (Column)
 id - public.audio_books.id (Column)
-pg_catalog.RI_FKey_cascade_del() - Schema: pg_catalog.RI_FKey_cascade_del (Function)
 
 --------------
 
 select * from (
-    select id, n|
+    select id, n| from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;
 **Should prefer the one from private.audio_audiobooks, since the other tables are out of scope.**
 
 Results:
+narrator_id - private.audio_books.narrator_id (Column)
 name - public.users.name (Column)
 narrator - public.audio_books.narrator (Column)
-narrator_id - private.audio_books.narrator_id (Column)
-name - Schema: pg_catalog.name (Function)
-nameconcatoid - Schema: pg_catalog.nameconcatoid (Function)
-
---------------
-
-select * from (
-    select id, narrator_id |
-) as subquery
-join public.users u
-on u.id = subquery.id;
-select * from (
-    select id, narrator_id f|
-) as subquery
-join public.users u
-on u.id = subquery.id;
-select * from (
-    select id, narrator_id from |
-) as subquery
-join public.users u
-on u.id = subquery.id;
-
-Results:
-audio_books - public.audio_books (Table)
-users - public.users (Table)
-private - private (Schema)
-private.audio_books - private.audio_books (Table)
-information_schema - information_schema (Schema)
-
---------------
-
-select * from (
-    select id, narrator_id from p|
-) as subquery
-join public.users u
-on u.id = subquery.id;
-
-Results:
-public - public (Schema)
-private - private (Schema)
-pg_catalog - pg_catalog (Schema)
-pg_toast - pg_toast (Schema)
-information_schema.parameters - information_schema.parameters (Table)
-
---------------
-
-select * from (
-    select id, narrator_id from private.|
-) as subquery
-join public.users u
-on u.id = subquery.id;
-
-Results:
-audio_books - private.audio_books (Table)
-
---------------
-
-select * from (
-    select id, narrator_id from private.a|
-) as subquery
-join public.users u
-on u.id = subquery.id;
-
-Results:
-audio_books - private.audio_books (Table)
+n_dead_tup - pg_catalog.pg_stat_all_tables.n_dead_tup (Column)
+n_distinct - pg_catalog.pg_stats.n_distinct (Column)
 
 --------------
 
 select * from (
-    select id, narrator_id from private.audio_books |
+    select id, narrator_id | from private.audio_books
 ) as subquery
 join public.users u
 on u.id = subquery.id;

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__ignores_cols_in_from_clause.snap

@@ -33,8 +33,8 @@ select * from p|
 **No column suggestions.**
 
 Results:
-public - public (Schema)
 private - private (Schema)
+public - public (Schema)
 pg_catalog - pg_catalog (Schema)
 pg_toast - pg_toast (Schema)
 information_schema.parameters - information_schema.parameters (Table)