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
22 changes: 22 additions & 0 deletions src/formatter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,19 @@ impl<'a> Formatter<'a> {
}

fn format_type_specifier(&self, token: &Token<'_>, query: &mut String) {
const WHITESPACE_BEFORE: &[TokenKind] = &[
TokenKind::Reserved,
TokenKind::ReservedNewline,
TokenKind::ReservedNewlineAfter,
];
self.trim_all_spaces_end(query);
query.push_str(token.value);
if self
.next_non_whitespace_token(1)
.is_some_and(|t| WHITESPACE_BEFORE.contains(&t.kind))
{
query.push(' ')
}
}
fn format_block_comment(&mut self, token: &Token<'_>, query: &mut String) {
self.add_new_line(query);
Expand Down Expand Up @@ -565,6 +576,17 @@ impl<'a> Formatter<'a> {
}
}

fn next_non_whitespace_token(&self, idx: usize) -> Option<&Token<'_>> {
let index = self.index.checked_add(idx);
if let Some(index) = index {
self.tokens[index..]
.iter()
.find(|t| t.kind != TokenKind::Whitespace)
} else {
None
}
}

fn next_token(&self, idx: usize) -> Option<&Token<'_>> {
let index = self.index.checked_add(idx);
if let Some(index) = index {
Expand Down
6 changes: 4 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -471,15 +471,17 @@ mod tests {

#[test]
fn it_formats_type_specifiers() {
let input = "SELECT id, ARRAY [] :: UUID [] FROM UNNEST($1 :: UUID []);";
let input = "SELECT id, ARRAY [] :: UUID [] FROM UNNEST($1 :: UUID []) WHERE $1::UUID[] IS NOT NULL;";
let options = FormatOptions::default();
let expected = indoc!(
"
SELECT
id,
ARRAY[]::UUID[]
FROM
UNNEST($1::UUID[]);"
UNNEST($1::UUID[])
WHERE
$1::UUID[] IS NOT NULL;"
);

assert_eq!(format(input, &QueryParams::None, &options), expected);
Expand Down