Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions crates/squawk_ide/src/goto_definition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,74 @@ select current_timestamp$0;
");
}

#[test]
fn goto_current_user() {
assert_snapshot!(goto("
create function pg_catalog.current_user() returns name
language internal;
select current_user$0;
"), @"
╭▸
2 │ create function pg_catalog.current_user() returns name
│ ──────────── 2. destination
3 │ language internal;
4 │ select current_user;
╰╴ ─ 1. source
"
);
}

#[test]
fn goto_user_keyword() {
assert_snapshot!(goto("
create function pg_catalog.current_user() returns name
language internal;
select user$0;
"), @"
╭▸
2 │ create function pg_catalog.current_user() returns name
│ ──────────── 2. destination
3 │ language internal;
4 │ select user;
╰╴ ─ 1. source
"
);
}

#[test]
fn goto_session_user() {
assert_snapshot!(goto("
create function pg_catalog.session_user() returns name
language internal;
select session_user$0;
"), @"
╭▸
2 │ create function pg_catalog.session_user() returns name
│ ──────────── 2. destination
3 │ language internal;
4 │ select session_user;
╰╴ ─ 1. source
"
);
}

#[test]
fn goto_current_schema() {
assert_snapshot!(goto("
create function current_schema() returns name
language internal;
select current_schema$0;
"), @"
╭▸
2 │ create function current_schema() returns name
│ ────────────── 2. destination
3 │ language internal;
4 │ select current_schema;
╰╴ ─ 1. source
"
);
}

#[test]
fn goto_current_timestamp_cte_column() {
assert_snapshot!(goto("
Expand Down
26 changes: 14 additions & 12 deletions crates/squawk_ide/src/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ pub(crate) fn resolve_name_ref_ptrs(
.map(|ptr| smallvec![ptr])
}
}
.or_else(|| resolve_current_timestamp_as_now(binder, name_ref))
.or_else(|| resolve_special_keyword_as_function(binder, name_ref))
}

fn resolve_table_name_ptr(
Expand Down Expand Up @@ -725,22 +725,24 @@ fn resolve_for_kind_with_params(
binder.lookup_with_params(name, kind, position, schema, params)
}

/// `current_timestamp` is equivalent to `now()`
fn resolve_current_timestamp_as_now(
// some keywords behave as functions
fn resolve_special_keyword_as_function(
binder: &Binder,
name_ref: &ast::NameRef,
) -> Option<SmallVec<[SyntaxNodePtr; 1]>> {
if name_ref
let function_name = name_ref
.syntax()
.first_child_or_token()
.is_some_and(|t| t.kind() == SyntaxKind::CURRENT_TIMESTAMP_KW)
{
let now_name = Name::from_string("now");
let position = name_ref.syntax().text_range().start();
return resolve_function(binder, &now_name, &None, None, position)
.map(|ptr| smallvec![ptr]);
}
None
.and_then(|t| match t.kind() {
SyntaxKind::CURRENT_SCHEMA_KW => Some("current_schema"),
SyntaxKind::CURRENT_TIMESTAMP_KW => Some("now"),
SyntaxKind::CURRENT_USER_KW | SyntaxKind::USER_KW => Some("current_user"),
SyntaxKind::SESSION_USER_KW => Some("session_user"),
_ => None,
})?;
let function_name = Name::from_string(function_name);
let position = name_ref.syntax().text_range().start();
resolve_function(binder, &function_name, &None, None, position).map(|ptr| smallvec![ptr])
}

fn resolve_function(
Expand Down
3 changes: 2 additions & 1 deletion s/lint
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ if [ -n "$CI" ]; then
cargo clippy --all-targets --all-features -- -D warnings
cargo check --locked
else
cargo fmt
cargo fmt
./s/oxfmt
cargo clippy --fix --allow-staged --allow-dirty --all-targets --all-features -- -D warnings
fi
Loading