Skip to content

Tokenizer - TRANSACTION tokens support #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FletcherDares merged 1 commit into from
Sep 10, 2025
Merged

Tokenizer - TRANSACTION tokens support #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions src/interpreter/tokenizer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,4 +336,23 @@ mod tests {
];
assert_eq!(expected, result);
}

#[test]
fn tokenizer_parses_transaction_keywords() {
let result = tokenize("BEGIN DEFERRED IMMEDIATE EXCLUSIVE COMMIT END ROLLBACK SAVEPOINT RELEASE TRANSACTION");
let expected = vec![
token(TokenTypes::Begin, "BEGIN", 0, 1),
token(TokenTypes::Deferred, "DEFERRED", 6, 1),
token(TokenTypes::Immediate, "IMMEDIATE", 15, 1),
token(TokenTypes::Exclusive, "EXCLUSIVE", 25, 1),
token(TokenTypes::Commit, "COMMIT", 35, 1),
token(TokenTypes::End, "END", 42, 1),
token(TokenTypes::Rollback, "ROLLBACK", 46, 1),
token(TokenTypes::Savepoint, "SAVEPOINT", 55, 1),
token(TokenTypes::Release, "RELEASE", 65, 1),
token(TokenTypes::Transaction, "TRANSACTION", 73, 1),
token(TokenTypes::EOF, "", 0, 0),
];
assert_eq!(expected, result);
}
}
11 changes: 10 additions & 1 deletion src/interpreter/tokenizer/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ impl<'a> Scanner<'a> {
slice if slice.eq_ignore_ascii_case("RENAME") => TokenTypes::Rename,
slice if slice.eq_ignore_ascii_case("TO") => TokenTypes::To,
slice if slice.eq_ignore_ascii_case("COLUMN") => TokenTypes::Column,
slice if slice.eq_ignore_ascii_case("BEGIN") => TokenTypes::Begin,
slice if slice.eq_ignore_ascii_case("DEFERRED") => TokenTypes::Deferred,
slice if slice.eq_ignore_ascii_case("IMMEDIATE") => TokenTypes::Immediate,
slice if slice.eq_ignore_ascii_case("EXCLUSIVE") => TokenTypes::Exclusive,
slice if slice.eq_ignore_ascii_case("COMMIT") => TokenTypes::Commit,
slice if slice.eq_ignore_ascii_case("END") => TokenTypes::End,
slice if slice.eq_ignore_ascii_case("ROLLBACK") => TokenTypes::Rollback,
slice if slice.eq_ignore_ascii_case("SAVEPOINT") => TokenTypes::Savepoint,
slice if slice.eq_ignore_ascii_case("RELEASE") => TokenTypes::Release,
slice if slice.eq_ignore_ascii_case("TRANSACTION") => TokenTypes::Transaction,
slice if slice.eq_ignore_ascii_case("INTEGER") => TokenTypes::Integer,
slice if slice.eq_ignore_ascii_case("REAL") => TokenTypes::Real,
slice if slice.eq_ignore_ascii_case("TEXT") => TokenTypes::Text,
Expand Down Expand Up @@ -176,7 +186,6 @@ impl<'a> Scanner<'a> {
slice if slice.eq_ignore_ascii_case("WHEN") => TokenTypes::When,
slice if slice.eq_ignore_ascii_case("THEN") => TokenTypes::Then,
slice if slice.eq_ignore_ascii_case("ELSE") => TokenTypes::Else,
slice if slice.eq_ignore_ascii_case("END") => TokenTypes::End,
slice if slice.eq_ignore_ascii_case("IS") => TokenTypes::Is,
slice if slice.eq_ignore_ascii_case("COUNT") => TokenTypes::Count,
slice if slice.eq_ignore_ascii_case("SUM") => TokenTypes::Sum,
Expand Down
5 changes: 3 additions & 2 deletions src/interpreter/tokenizer/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ pub enum TokenTypes {
// Keywords
Create, Select, Insert, Table, From, Into, Values, Where,
Update, Delete, Add, Drop, Index, Set, Alter, Rename,
To, Column,
To, Column, Begin, Deferred, Immediate, Exclusive,
Commit, End, Rollback, Savepoint, Release, Transaction,
// Data Types
Integer, Real, Text, Blob, Null,
// Constraints
Expand All @@ -14,7 +15,7 @@ pub enum TokenTypes {
Limit, Offset, Union, Intersect, Except,
// Logical Operators
And, Or, In, Exists, If,
Case, When, Then, Else, End, Is,
Case, When, Then, Else, Is,
Equals, NotEquals, LessThan, LessEquals, GreaterThan, GreaterEquals,
// Aggregate Functions
Count, Sum, Avg, Min, Max,
Expand Down
Loading