Skip to content

Commit 61b02ff

Browse files
juleswritescodejuleswritescode
committed
snaps
1 parent 9f8435f commit 61b02ff

8 files changed

+81
-96
lines changed

‎crates/pgls_completions/src/providers/columns.rs‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,9 @@ fn get_completion_text(ctx: &TreesitterContext, col: &Column) -> CompletionText
5050

5151
#[cfg(test)]
5252
mod tests {
53-
use pgls_test_utils::QueryWithCursorPosition;
5453
use sqlx::PgPool;
5554

56-
use crate::test_helper::{
57-
TestCompletionsCase, TestCompletionsSuite, assert_complete_results,
58-
assert_no_complete_results,
59-
};
55+
use crate::test_helper::{TestCompletionsCase, TestCompletionsSuite};
6056

6157
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
6258
async fn handles_nested_queries(pool: PgPool) {
@@ -541,17 +537,6 @@ mod tests {
541537
);
542538
"#;
543539

544-
// assert_no_complete_results(
545-
// format!(
546-
// r#"select "email" from "p{}""#,
547-
// QueryWithCursorPosition::cursor_marker()
548-
// )
549-
// .as_str(),
550-
// Some(setup),
551-
// &pool,
552-
// )
553-
// .await;
554-
555540
TestCompletionsSuite::new(&pool, Some(setup))
556541
.with_case(
557542
TestCompletionsCase::new().type_sql(r#"select "email" from "private"."users";"#),

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__does_not_complete_cols_in_join_clauses.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ select u.uid, p.content from |
5656
**Schema suggestions should be prioritized, since we want to push users to specify them.**
5757

5858
Results:
59-
public - public (Schema)
6059
auth - auth (Schema)
61-
auth.posts - auth.posts (Table)
62-
auth.users - auth.users (Table)
6360
information_schema - information_schema (Schema)
61+
pg_catalog - pg_catalog (Schema)
62+
pg_toast - pg_toast (Schema)
63+
auth.posts - auth.posts (Table)
6464

6565
--------------
6666

@@ -99,11 +99,11 @@ select u.uid, p.content from auth.users u j|
9999
select u.uid, p.content from auth.users u join |
100100

101101
Results:
102-
public - public (Schema)
103102
auth - auth (Schema)
104-
auth.posts - auth.posts (Table)
105-
auth.users - auth.users (Table)
106103
information_schema - information_schema (Schema)
104+
pg_catalog - pg_catalog (Schema)
105+
pg_toast - pg_toast (Schema)
106+
auth.posts - auth.posts (Table)
107107

108108
--------------
109109

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__handles_nested_queries.snap‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ join public.users u
4141
on u.id = subquery.id;
4242

4343
Results:
44-
pg_catalog.RI_FKey_cascade_del() - Schema: pg_catalog.RI_FKey_cascade_del (Function)
45-
pg_catalog.RI_FKey_cascade_upd() - Schema: pg_catalog.RI_FKey_cascade_upd (Function)
46-
pg_catalog.RI_FKey_check_ins() - Schema: pg_catalog.RI_FKey_check_ins (Function)
47-
pg_catalog.RI_FKey_check_upd() - Schema: pg_catalog.RI_FKey_check_upd (Function)
48-
pg_catalog.RI_FKey_noaction_del() - Schema: pg_catalog.RI_FKey_noaction_del (Function)
44+
id - public.audio_books.id (Column)
45+
name - public.users.name (Column)
46+
narrator - public.audio_books.narrator (Column)
47+
id - private.audio_books.id (Column)
48+
narrator_id - private.audio_books.narrator_id (Column)
4949

5050
--------------
5151

@@ -56,11 +56,11 @@ join public.users u
5656
on u.id = subquery.id;
5757

5858
Results:
59+
id - public.audio_books.id (Column)
60+
narrator_id - private.audio_books.narrator_id (Column)
5961
iclikejoinsel - Schema: pg_catalog.iclikejoinsel (Function)
6062
iclikesel - Schema: pg_catalog.iclikesel (Function)
6163
icnlikejoinsel - Schema: pg_catalog.icnlikejoinsel (Function)
62-
icnlikesel - Schema: pg_catalog.icnlikesel (Function)
63-
icregexeqjoinsel - Schema: pg_catalog.icregexeqjoinsel (Function)
6464

6565
--------------
6666

@@ -72,11 +72,11 @@ on u.id = subquery.id;
7272
**Should prefer the one from private.audio_audiobooks, since the other tables are out of scope.**
7373

7474
Results:
75+
name - public.users.name (Column)
76+
narrator - public.audio_books.narrator (Column)
77+
narrator_id - private.audio_books.narrator_id (Column)
78+
id - public.audio_books.id (Column)
7579
pg_catalog.RI_FKey_cascade_del() - Schema: pg_catalog.RI_FKey_cascade_del (Function)
76-
pg_catalog.RI_FKey_cascade_upd() - Schema: pg_catalog.RI_FKey_cascade_upd (Function)
77-
pg_catalog.RI_FKey_check_ins() - Schema: pg_catalog.RI_FKey_check_ins (Function)
78-
pg_catalog.RI_FKey_check_upd() - Schema: pg_catalog.RI_FKey_check_upd (Function)
79-
pg_catalog.RI_FKey_noaction_del() - Schema: pg_catalog.RI_FKey_noaction_del (Function)
8080

8181
--------------
8282

@@ -88,11 +88,11 @@ on u.id = subquery.id;
8888
**Should prefer the one from private.audio_audiobooks, since the other tables are out of scope.**
8989

9090
Results:
91+
name - public.users.name (Column)
92+
narrator - public.audio_books.narrator (Column)
93+
narrator_id - private.audio_books.narrator_id (Column)
9194
name - Schema: pg_catalog.name (Function)
9295
nameconcatoid - Schema: pg_catalog.nameconcatoid (Function)
93-
nameeq - Schema: pg_catalog.nameeq (Function)
94-
nameeqtext - Schema: pg_catalog.nameeqtext (Function)
95-
namege - Schema: pg_catalog.namege (Function)
9696

9797
--------------
9898

@@ -113,11 +113,11 @@ join public.users u
113113
on u.id = subquery.id;
114114

115115
Results:
116-
public - public (Schema)
117-
private - private (Schema)
118116
audio_books - public.audio_books (Table)
119117
users - public.users (Table)
118+
private - private (Schema)
120119
private.audio_books - private.audio_books (Table)
120+
information_schema - information_schema (Schema)
121121

122122
--------------
123123

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__ignores_cols_in_from_clause.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ select * from |
2121
**No column suggestions.**
2222

2323
Results:
24-
public - public (Schema)
2524
private - private (Schema)
26-
private.users - private.users (Table)
2725
information_schema - information_schema (Schema)
2826
pg_catalog - pg_catalog (Schema)
27+
pg_toast - pg_toast (Schema)
28+
private.users - private.users (Table)
2929

3030
--------------
3131

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_alter_table_and_drop_table.snap‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ alter table |
2323

2424
Results:
2525
instruments - public.instruments (Table)
26-
public - public (Schema)
27-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
28-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
29-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
26+
_sqlx_migrations - public._sqlx_migrations (Table)
27+
information_schema - information_schema (Schema)
28+
pg_catalog - pg_catalog (Schema)
29+
pg_toast - pg_toast (Schema)
3030

3131
--------------
3232

@@ -101,10 +101,10 @@ alter table |
101101

102102
Results:
103103
instruments - public.instruments (Table)
104-
public - public (Schema)
105-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
106-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
107-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
104+
_sqlx_migrations - public._sqlx_migrations (Table)
105+
information_schema - information_schema (Schema)
106+
pg_catalog - pg_catalog (Schema)
107+
pg_toast - pg_toast (Schema)
108108

109109
--------------
110110

@@ -179,10 +179,10 @@ alter table |
179179

180180
Results:
181181
instruments - public.instruments (Table)
182-
public - public (Schema)
183-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
184-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
185-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
182+
_sqlx_migrations - public._sqlx_migrations (Table)
183+
information_schema - information_schema (Schema)
184+
pg_catalog - pg_catalog (Schema)
185+
pg_toast - pg_toast (Schema)
186186

187187
--------------
188188

@@ -291,10 +291,10 @@ alter table |
291291

292292
Results:
293293
instruments - public.instruments (Table)
294-
public - public (Schema)
295-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
296-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
297-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
294+
_sqlx_migrations - public._sqlx_migrations (Table)
295+
information_schema - information_schema (Schema)
296+
pg_catalog - pg_catalog (Schema)
297+
pg_toast - pg_toast (Schema)
298298

299299
--------------
300300

@@ -366,7 +366,7 @@ created_at - public.instruments.created_at (Column)
366366
id - public.instruments.id (Column)
367367
name - public.instruments.name (Column)
368368
z - public.instruments.z (Column)
369-
abbrev - pg_catalog.pg_timezone_abbrevs.abbrev (Column)
369+
instruments - public.instruments (Table)
370370

371371
--------------
372372

@@ -383,10 +383,10 @@ alter table |
383383

384384
Results:
385385
instruments - public.instruments (Table)
386-
public - public (Schema)
387-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
388-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
389-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
386+
_sqlx_migrations - public._sqlx_migrations (Table)
387+
information_schema - information_schema (Schema)
388+
pg_catalog - pg_catalog (Schema)
389+
pg_toast - pg_toast (Schema)
390390

391391
--------------
392392

@@ -436,7 +436,7 @@ created_at - public.instruments.created_at (Column)
436436
id - public.instruments.id (Column)
437437
name - public.instruments.name (Column)
438438
z - public.instruments.z (Column)
439-
abbrev - pg_catalog.pg_timezone_abbrevs.abbrev (Column)
439+
instruments - public.instruments (Table)
440440

441441
--------------
442442

@@ -453,10 +453,10 @@ alter table |
453453

454454
Results:
455455
instruments - public.instruments (Table)
456-
public - public (Schema)
457-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
458-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
459-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
456+
_sqlx_migrations - public._sqlx_migrations (Table)
457+
information_schema - information_schema (Schema)
458+
pg_catalog - pg_catalog (Schema)
459+
pg_toast - pg_toast (Schema)
460460

461461
--------------
462462

@@ -547,10 +547,10 @@ alter table |
547547

548548
Results:
549549
instruments - public.instruments (Table)
550-
public - public (Schema)
551-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
552-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
553-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
550+
_sqlx_migrations - public._sqlx_migrations (Table)
551+
information_schema - information_schema (Schema)
552+
pg_catalog - pg_catalog (Schema)
553+
pg_toast - pg_toast (Schema)
554554

555555
--------------
556556

@@ -603,10 +603,10 @@ alter table |
603603

604604
Results:
605605
instruments - public.instruments (Table)
606-
public - public (Schema)
607-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
608-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
609-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
606+
_sqlx_migrations - public._sqlx_migrations (Table)
607+
information_schema - information_schema (Schema)
608+
pg_catalog - pg_catalog (Schema)
609+
pg_toast - pg_toast (Schema)
610610

611611
--------------
612612

@@ -663,10 +663,10 @@ alter table |
663663

664664
Results:
665665
instruments - public.instruments (Table)
666-
public - public (Schema)
667-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
668-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
669-
information_schema._pg_foreign_table_columns - information_schema._pg_foreign_table_columns (Table)
666+
_sqlx_migrations - public._sqlx_migrations (Table)
667+
information_schema - information_schema (Schema)
668+
pg_catalog - pg_catalog (Schema)
669+
pg_toast - pg_toast (Schema)
670670

671671
--------------
672672

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_insert_clause.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ insert into |
2929
Results:
3030
instruments - public.instruments (Table)
3131
others - public.others (Table)
32-
public - public (Schema)
33-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
34-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
32+
_sqlx_migrations - public._sqlx_migrations (Table)
33+
information_schema - information_schema (Schema)
34+
pg_catalog - pg_catalog (Schema)
3535

3636
--------------
3737

@@ -135,9 +135,9 @@ insert into |
135135
Results:
136136
instruments - public.instruments (Table)
137137
others - public.others (Table)
138-
public - public (Schema)
139-
information_schema._pg_foreign_data_wrappers - information_schema._pg_foreign_data_wrappers (Table)
140-
information_schema._pg_foreign_servers - information_schema._pg_foreign_servers (Table)
138+
_sqlx_migrations - public._sqlx_migrations (Table)
139+
information_schema - information_schema (Schema)
140+
pg_catalog - pg_catalog (Schema)
141141

142142
--------------
143143

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_columns_in_where_clause.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ select name from instruments i join others o on i.z = o.a where o.a = |
6060
Results:
6161
instruments - public.instruments (Table)
6262
others - public.others (Table)
63-
pg_catalog.RI_FKey_cascade_del() - Schema: pg_catalog.RI_FKey_cascade_del (Function)
64-
pg_catalog.RI_FKey_cascade_upd() - Schema: pg_catalog.RI_FKey_cascade_upd (Function)
65-
pg_catalog.RI_FKey_check_ins() - Schema: pg_catalog.RI_FKey_check_ins (Function)
63+
_sqlx_migrations - public._sqlx_migrations (Table)
64+
information_schema - information_schema (Schema)
65+
pg_catalog - pg_catalog (Schema)
6666

6767
--------------
6868

@@ -71,11 +71,11 @@ select name from instruments i join others o on i.z = o.a where o.a = i.z |
7171
select name from instruments i join others o on i.z = o.a where o.a = i.z a|
7272

7373
Results:
74-
abbrev - Schema: pg_catalog.abbrev (Function)
75-
abs - Schema: pg_catalog.abs (Function)
76-
aclcontains - Schema: pg_catalog.aclcontains (Function)
77-
acldefault - Schema: pg_catalog.acldefault (Function)
78-
aclexplode - Schema: pg_catalog.aclexplode (Function)
74+
information_schema.administrable_role_authorizations - information_schema.administrable_role_authorizations (Table)
75+
information_schema.applicable_roles - information_schema.applicable_roles (Table)
76+
information_schema.attributes - information_schema.attributes (Table)
77+
information_schema.collation_character_set_applicability - information_schema.collation_character_set_applicability (Table)
78+
pg_catalog.pg_aggregate - pg_catalog.pg_aggregate (Table)
7979

8080
--------------
8181

@@ -99,9 +99,9 @@ select name from instruments i join others o on i.z = o.a where o.a = i.z and i.
9999
Results:
100100
instruments - public.instruments (Table)
101101
others - public.others (Table)
102-
pg_catalog.RI_FKey_cascade_del() - Schema: pg_catalog.RI_FKey_cascade_del (Function)
103-
pg_catalog.RI_FKey_cascade_upd() - Schema: pg_catalog.RI_FKey_cascade_upd (Function)
104-
pg_catalog.RI_FKey_check_ins() - Schema: pg_catalog.RI_FKey_check_ins (Function)
102+
_sqlx_migrations - public._sqlx_migrations (Table)
103+
information_schema - information_schema (Schema)
104+
pg_catalog - pg_catalog (Schema)
105105

106106
--------------
107107

‎crates/pgls_completions/src/snapshots/pgls_completions__test_helper__suggests_relevant_columns_without_letters.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ select name f|
4242
select name from |
4343

4444
Results:
45-
public - public (Schema)
4645
users - public.users (Table)
4746
information_schema - information_schema (Schema)
4847
pg_catalog - pg_catalog (Schema)
4948
pg_toast - pg_toast (Schema)
49+
_sqlx_migrations - public._sqlx_migrations (Table)
5050

5151
--------------
5252

0 commit comments

Comments
 (0)