Skip to content

Commit 064a9bc

Browse files
committed
sql_parser: transaction tests refactoring
1 parent ca85654 commit 064a9bc

File tree

5 files changed

+90
-115
lines changed

5 files changed

+90
-115
lines changed

src/parser/trx/begin.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mod begin_statements_tests {
5050
use crate::{BeginTransactionStatement, Parser, Statement, TransactionType};
5151

5252
#[test]
53-
fn test_begin_transaction_basic() {
53+
fn begin_transaction() {
5454
run_sunny_day_test(
5555
"BEGIN;",
5656
Statement::BeginTransaction(BeginTransactionStatement {
@@ -60,7 +60,7 @@ mod begin_statements_tests {
6060
}
6161

6262
#[test]
63-
fn test_begin_transaction_with_transaction_keyword() {
63+
fn begin_with_transaction_keyword() {
6464
run_sunny_day_test(
6565
"BEGIN TRANSACTION;",
6666
Statement::BeginTransaction(BeginTransactionStatement {
@@ -70,7 +70,7 @@ mod begin_statements_tests {
7070
}
7171

7272
#[test]
73-
fn test_begin_transaction_deferred() {
73+
fn begin_transaction_deferred() {
7474
run_sunny_day_test(
7575
"BEGIN DEFERRED;",
7676
Statement::BeginTransaction(BeginTransactionStatement {
@@ -80,7 +80,7 @@ mod begin_statements_tests {
8080
}
8181

8282
#[test]
83-
fn test_begin_transaction_immediate() {
83+
fn begin_transaction_immediate() {
8484
run_sunny_day_test(
8585
"BEGIN IMMEDIATE;",
8686
Statement::BeginTransaction(BeginTransactionStatement {
@@ -90,7 +90,7 @@ mod begin_statements_tests {
9090
}
9191

9292
#[test]
93-
fn test_begin_transaction_exclusive() {
93+
fn begin_transaction_exclusive() {
9494
run_sunny_day_test(
9595
"BEGIN EXCLUSIVE;",
9696
Statement::BeginTransaction(BeginTransactionStatement {
@@ -100,7 +100,7 @@ mod begin_statements_tests {
100100
}
101101

102102
#[test]
103-
fn test_begin_transaction_deferred_with_transaction_keyword() {
103+
fn begin_transaction_deferred_with_transaction_keyword() {
104104
run_sunny_day_test(
105105
"BEGIN DEFERRED TRANSACTION;",
106106
Statement::BeginTransaction(BeginTransactionStatement {
@@ -110,7 +110,7 @@ mod begin_statements_tests {
110110
}
111111

112112
#[test]
113-
fn test_begin_transaction_immediate_with_transaction_keyword() {
113+
fn begin_transaction_immediate_with_transaction_keyword() {
114114
run_sunny_day_test(
115115
"BEGIN IMMEDIATE TRANSACTION;",
116116
Statement::BeginTransaction(BeginTransactionStatement {
@@ -120,7 +120,7 @@ mod begin_statements_tests {
120120
}
121121

122122
#[test]
123-
fn test_begin_transaction_exclusive_with_transaction_keyword() {
123+
fn begin_transaction_exclusive_with_transaction_keyword() {
124124
run_sunny_day_test(
125125
"BEGIN EXCLUSIVE TRANSACTION;",
126126
Statement::BeginTransaction(BeginTransactionStatement {
@@ -130,7 +130,7 @@ mod begin_statements_tests {
130130
}
131131

132132
#[test]
133-
fn test_begin_transaction_missing_semicolon() {
133+
fn begin_transaction_missing_semicolon() {
134134
run_sunny_day_test(
135135
"BEGIN",
136136
Statement::BeginTransaction(BeginTransactionStatement {
@@ -140,25 +140,25 @@ mod begin_statements_tests {
140140
}
141141

142142
#[test]
143-
fn test_begin_transaction_with_unexpected_token() {
143+
fn begin_transaction_with_unexpected_token() {
144144
let sql = "BEGIN UNKNOWN;";
145145
run_rainy_day_test(sql, ParsingError::UnexpectedToken("UNKNOWN".into()));
146146
}
147147

148148
#[test]
149-
fn test_begin_transaction_with_invalid_transaction_type() {
149+
fn begin_transaction_with_invalid_transaction_type() {
150150
let sql = "BEGIN INVALID TRANSACTION;";
151151
run_rainy_day_test(sql, ParsingError::UnexpectedToken("INVALID".into()));
152152
}
153153

154154
#[test]
155-
fn test_begin_transaction_with_extra_tokens() {
155+
fn begin_transaction_with_extra_tokens() {
156156
let sql = "BEGIN TRANSACTION EXTRA;";
157157
run_rainy_day_test(sql, ParsingError::UnexpectedToken("EXTRA".into()));
158158
}
159159

160160
#[test]
161-
fn test_begin_transaction_case_insensitive() {
161+
fn begin_transaction_case_insensitive() {
162162
run_sunny_day_test(
163163
"begin transaction;",
164164
Statement::BeginTransaction(BeginTransactionStatement {
@@ -168,7 +168,7 @@ mod begin_statements_tests {
168168
}
169169

170170
#[test]
171-
fn test_begin_transaction_with_comment() {
171+
fn begin_transaction_with_comment() {
172172
run_sunny_day_test(
173173
"BEGIN -- Start transaction\n;",
174174
Statement::BeginTransaction(BeginTransactionStatement {
@@ -178,21 +178,21 @@ mod begin_statements_tests {
178178
}
179179

180180
#[test]
181-
fn test_begin_transaction_with_multiple_transaction_types() {
181+
fn begin_transaction_with_multiple_transaction_types() {
182182
let sql = "BEGIN DEFERRED IMMEDIATE;";
183183
run_rainy_day_test(sql, ParsingError::UnexpectedToken("Immediate".into()));
184184
}
185185

186186
#[test]
187-
fn test_begin_transaction_with_transaction_name() {
187+
fn begin_transaction_with_transaction_name() {
188188
run_rainy_day_test(
189189
"BEGIN TRANSACTION transaction_name;",
190190
ParsingError::UnexpectedToken("transaction_name".into()),
191191
);
192192
}
193193

194194
#[test]
195-
fn test_begin_transaction_with_keyword() {
195+
fn begin_transaction_with_keyword() {
196196
run_rainy_day_test(
197197
"BEGIN COMMIT;",
198198
ParsingError::UnexpectedToken("Commit".into()),
@@ -205,7 +205,7 @@ mod begin_statements_tests {
205205
}
206206

207207
#[test]
208-
fn test_multiple_begin_transaction_commands() {
208+
fn multiple_begin_transaction_commands() {
209209
let sql = "BEGIN; BEGIN IMMEDIATE TRANSACTION;";
210210
let mut parser = Parser::from(sql);
211211

src/parser/trx/commit.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -39,47 +39,47 @@ mod commit_statements_tests {
3939
use crate::{CommitTransactionStatement, Parser, Statement};
4040

4141
#[test]
42-
fn test_commit_transaction_basic() {
42+
fn commit_transaction() {
4343
run_sunny_day_test(
4444
"COMMIT;",
4545
Statement::CommitTransaction(CommitTransactionStatement {}),
4646
);
4747
}
4848

4949
#[test]
50-
fn test_commit_transaction_with_transaction_keyword() {
50+
fn commit_transaction_with_transaction_keyword() {
5151
run_sunny_day_test(
5252
"COMMIT TRANSACTION;",
5353
Statement::CommitTransaction(CommitTransactionStatement {}),
5454
);
5555
}
5656

5757
#[test]
58-
fn test_commit_transaction_end_keyword() {
58+
fn commit_transaction_end_keyword() {
5959
run_sunny_day_test(
6060
"END;",
6161
Statement::CommitTransaction(CommitTransactionStatement {}),
6262
);
6363
}
6464

6565
#[test]
66-
fn test_commit_transaction_end_with_transaction_keyword() {
66+
fn commit_transaction_end_with_transaction_keyword() {
6767
run_sunny_day_test(
6868
"END TRANSACTION;",
6969
Statement::CommitTransaction(CommitTransactionStatement {}),
7070
);
7171
}
7272

7373
#[test]
74-
fn test_commit_transaction_missing_semicolon() {
74+
fn commit_transaction_missing_semicolon() {
7575
run_sunny_day_test(
7676
"COMMIT",
7777
Statement::CommitTransaction(CommitTransactionStatement {}),
7878
);
7979
}
8080

8181
#[test]
82-
fn test_commit_transaction_with_comment() {
82+
fn commit_transaction_with_comment() {
8383
let sql = "COMMIT -- end transaction\n;";
8484
run_sunny_day_test(
8585
sql,
@@ -88,29 +88,29 @@ mod commit_statements_tests {
8888
}
8989

9090
#[test]
91-
fn test_commit_transaction_with_unexpected_token() {
91+
fn commit_transaction_with_unexpected_token() {
9292
run_rainy_day_test(
9393
"COMMIT EXTRA;",
9494
ParsingError::UnexpectedToken("EXTRA".into()),
9595
);
9696
}
9797

9898
#[test]
99-
fn test_commit_transaction_with_invalid_syntax() {
99+
fn commit_transaction_with_invalid_syntax() {
100100
let sql = "COMMIT TRANSACT;";
101101
run_rainy_day_test(sql, ParsingError::UnexpectedToken("TRANSACT".into()));
102102
}
103103

104104
#[test]
105-
fn test_commit_transaction_with_transaction_name() {
105+
fn commit_transaction_with_transaction_name() {
106106
run_rainy_day_test(
107107
"COMMIT TRANSACTION transaction_name;",
108108
ParsingError::UnexpectedToken("transaction_name".into()),
109109
);
110110
}
111111

112112
#[test]
113-
fn test_multiple_commit_transaction_commands() {
113+
fn multiple_commit_transaction_commands() {
114114
let sql = "COMMIT; END TRANSACTION;";
115115
let mut parser = Parser::from(sql);
116116

0 commit comments

Comments
 (0)