Skip to content

Commit bc95e8a

Browse files
10/11: fix: helper edge case and typo (#664)
1 parent 06c91cf commit bc95e8a

43 files changed

Lines changed: 1573 additions & 570 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

STACKED_PR_PLAN.md

Lines changed: 0 additions & 186 deletions
This file was deleted.

crates/pgls_completions/src/providers/columns.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ mod tests {
9393
}
9494

9595
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
96-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
9796
async fn shows_multiple_columns_if_no_relation_specified(pool: PgPool) {
9897
let setup = r#"
9998
create schema private;
@@ -125,7 +124,6 @@ mod tests {
125124
}
126125

127126
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
128-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
129127
async fn suggests_relevant_columns_without_letters(pool: PgPool) {
130128
let setup = r#"
131129
create table users (
@@ -213,7 +211,6 @@ mod tests {
213211
}
214212

215213
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
216-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
217214
async fn filters_out_by_aliases_in_join_on(pool: PgPool) {
218215
let setup = r#"
219216
create schema auth;
@@ -281,7 +278,6 @@ mod tests {
281278
}
282279

283280
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
284-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
285281
async fn does_not_complete_cols_in_join_clauses(pool: PgPool) {
286282
let setup = r#"
287283
create schema auth;
@@ -310,7 +306,6 @@ mod tests {
310306
}
311307

312308
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
313-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
314309
async fn completes_in_join_on_clause(pool: PgPool) {
315310
let setup = r#"
316311
create schema auth;
@@ -385,7 +380,6 @@ mod tests {
385380
}
386381

387382
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
388-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
389383
async fn suggests_columns_in_insert_clause(pool: PgPool) {
390384
let setup = r#"
391385
create table instruments (
@@ -423,7 +417,6 @@ mod tests {
423417
}
424418

425419
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
426-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
427420
async fn suggests_columns_in_where_clause(pool: PgPool) {
428421
let setup = r#"
429422
create table instruments (
@@ -447,7 +440,7 @@ mod tests {
447440
"select name from instruments i join others o on i.z = o.a <sql>",
448441
)
449442
.type_sql("where o.<1>a = <2>i.z and <3>i.id > 5;")
450-
.comment("should respect alias speciifcation")
443+
.comment("should respect alias specification")
451444
.comment("should not prioritize suggest columns or schemas (right side of binary expression)")
452445
.comment("should prioritize columns that aren't already mentioned"),
453446
)
@@ -456,7 +449,6 @@ mod tests {
456449
}
457450

458451
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
459-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
460452
async fn suggests_columns_in_alter_table_and_drop_table(pool: PgPool) {
461453
let setup = r#"
462454
create table instruments (
@@ -531,7 +523,6 @@ mod tests {
531523
}
532524

533525
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
534-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
535526
async fn completes_quoted_columns(pool: PgPool) {
536527
let setup = r#"
537528
create schema if not exists private;
@@ -553,7 +544,6 @@ mod tests {
553544
}
554545

555546
#[sqlx::test(migrator = "pgls_test_utils::MIGRATIONS")]
556-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
557547
async fn completes_quoted_columns_with_aliases(pool: PgPool) {
558548
let setup = r#"
559549
create schema if not exists private;

crates/pgls_completions/src/providers/keywords.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ mod tests {
535535
}
536536

537537
#[sqlx::test]
538-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
539538
async fn completes_after_from_clause(pool: PgPool) {
540539
let setup = r#"
541540
create table public.users (
@@ -598,7 +597,6 @@ mod tests {
598597
}
599598

600599
#[sqlx::test]
601-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
602600
async fn completes_from_keyword(pool: PgPool) {
603601
let setup = r#"
604602
create table public.users (
@@ -622,7 +620,6 @@ mod tests {
622620
}
623621

624622
#[sqlx::test]
625-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
626623
async fn completes_from_keyword_after_aliases(pool: PgPool) {
627624
let setup = r#"
628625
create table public.users (
@@ -668,7 +665,6 @@ mod tests {
668665
}
669666

670667
#[sqlx::test]
671-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
672668
async fn completes_keywords_after_column_aliases(pool: PgPool) {
673669
let setup = r#"
674670
create table public.users (
@@ -784,7 +780,6 @@ mod tests {
784780
}
785781

786782
#[sqlx::test]
787-
#[ignore = "will be reintroduced after stacked keyword-completion PRs merge"]
788783
async fn completes_join_after_alias(pool: PgPool) {
789784
let setup = r#"
790785
create table public.users (

0 commit comments

Comments
 (0)