Skip to content

Commit 75e19fc

Browse files
committedDec 24, 2024·
sql_parser: create statement tests refactoring
1 parent 1dd9bea commit 75e19fc

File tree

5 files changed

+41
-45
lines changed

5 files changed

+41
-45
lines changed
 

‎src/parser/create/create_index.rs

+12-16
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,32 @@ pub mod test_utils {
6464
}
6565

6666
#[cfg(test)]
67-
mod test_create_index_statement_parser {
68-
use test_utils::create_index_statement;
69-
67+
mod create_index_tests {
68+
use super::test_utils::create_index_statement;
69+
use crate::expression::test_utils::{
70+
binary_op_expression, identifier_expression, numeric_literal_expression,
71+
};
7072
use crate::{
71-
expression::test_utils::{
72-
binary_op_expression, identifier_expression, numeric_literal_expression,
73-
},
74-
parser::test_utils::run_sunny_day_test,
75-
BinaryOp, Identifier, IndexedColumn, Statement,
73+
parser::test_utils::run_sunny_day_test, BinaryOp, Identifier, IndexedColumn, Statement,
7674
};
7775

78-
use super::*;
79-
8076
#[test]
81-
fn test_parse_create_index_statement() {
77+
fn create_index_test() {
8278
let sql = "CREATE INDEX index_name ON table_name (column1)";
8379
let expected = create_index_statement();
8480
run_sunny_day_test(sql, Statement::CreateIndex(expected));
8581
}
8682

8783
#[test]
88-
fn test_parse_create_unique_index_statement() {
84+
fn create_unique_index() {
8985
let sql = "CREATE UNIQUE INDEX index_name ON table_name (column1)";
9086
let mut expected = create_index_statement();
9187
expected.unique = true;
9288
run_sunny_day_test(sql, Statement::CreateIndex(expected));
9389
}
9490

9591
#[test]
96-
fn test_parse_create_index_statement_with_schema() {
92+
fn create_index_with_schema() {
9793
let sql = "CREATE INDEX schema_name.index_name ON table_name (column1)";
9894
let mut expected = create_index_statement();
9995
expected.index_name =
@@ -102,7 +98,7 @@ mod test_create_index_statement_parser {
10298
}
10399

104100
#[test]
105-
fn test_parse_create_index_statement_with_multiple_columns() {
101+
fn create_index_with_multiple_columns() {
106102
let sql = "CREATE INDEX index_name ON table_name (column1, column2, column3, column4)";
107103
let mut expected = create_index_statement();
108104
expected.columns = vec![
@@ -127,15 +123,15 @@ mod test_create_index_statement_parser {
127123
}
128124

129125
#[test]
130-
fn test_parse_create_index_statement_with_if_not_exists() {
126+
fn create_index_with_if_not_exists() {
131127
let sql = "CREATE INDEX IF NOT EXISTS index_name ON table_name (column1)";
132128
let mut expected = create_index_statement();
133129
expected.if_not_exists = true;
134130
run_sunny_day_test(sql, Statement::CreateIndex(expected));
135131
}
136132

137133
#[test]
138-
fn test_parse_create_index_statement_with_where_clause() {
134+
fn create_index_with_where_clause() {
139135
let sql = "CREATE INDEX index_name ON table_name (column1) WHERE column1 = 1";
140136
let mut expected = create_index_statement();
141137
expected.where_clause = Some(Box::new(binary_op_expression(

‎src/parser/create/create_table.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ pub mod test_utils {
200200
}
201201

202202
#[cfg(test)]
203-
mod test_create_table_statement_parser {
203+
mod create_table_tests {
204204
use crate::{
205205
expression::test_utils::identifier_expression, parser::test_utils::run_sunny_day_test,
206206
ColumnConstraint, ColumnConstraintType, ColumnDefinition, ConflictClause,
@@ -211,7 +211,7 @@ mod test_create_table_statement_parser {
211211
use super::test_utils::create_table_statement;
212212

213213
#[test]
214-
fn test_parse_create_table_statement() {
214+
fn create_table_test() {
215215
let expected_stmt = create_table_statement();
216216
run_sunny_day_test(
217217
"CREATE TABLE table_name AS SELECT * FROM table_name",
@@ -220,7 +220,7 @@ mod test_create_table_statement_parser {
220220
}
221221

222222
#[test]
223-
fn test_parse_create_temporary_table_statement() {
223+
fn create_temporary_table_test() {
224224
let mut expected_stmt = create_table_statement();
225225
expected_stmt.temporary = true;
226226

@@ -236,7 +236,7 @@ mod test_create_table_statement_parser {
236236
}
237237

238238
#[test]
239-
fn test_parse_create_table_statement_with_if_not_exists() {
239+
fn create_table_with_if_not_exists() {
240240
let mut expected_stmt = create_table_statement();
241241
expected_stmt.if_not_exists = true;
242242

@@ -247,7 +247,7 @@ mod test_create_table_statement_parser {
247247
}
248248

249249
#[test]
250-
fn test_parse_create_table_statement_with_schema() {
250+
fn create_table_with_schema() {
251251
let mut expected_stmt = create_table_statement();
252252
expected_stmt.table_name =
253253
Identifier::Compound(vec!["schema_name".to_string(), "table_name".to_string()]);
@@ -258,7 +258,7 @@ mod test_create_table_statement_parser {
258258
}
259259

260260
#[test]
261-
fn test_parse_create_table_statement_with_column_definitions() {
261+
fn create_table_with_column_definitions() {
262262
let mut expected_stmt = create_table_statement();
263263
expected_stmt.create_table_option =
264264
CreateTableOption::ColumnDefinitions(CreateTableColumnDef {
@@ -291,7 +291,7 @@ mod test_create_table_statement_parser {
291291
}
292292

293293
#[test]
294-
fn test_parse_create_table_statement_with_table_constraints() {
294+
fn create_table_with_table_constraints() {
295295
let mut expected_stmt = create_table_statement();
296296
expected_stmt.create_table_option =
297297
CreateTableOption::ColumnDefinitions(CreateTableColumnDef {
@@ -320,7 +320,7 @@ mod test_create_table_statement_parser {
320320
}
321321

322322
#[test]
323-
fn test_parse_create_table_statement_with_table_options() {
323+
fn create_table_with_table_options() {
324324
let table_options = vec![TableOption::WithoutRowId, TableOption::Strict];
325325

326326
for option in table_options {

‎src/parser/create/create_trigger.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ pub mod test_utils {
185185
}
186186

187187
#[cfg(test)]
188-
mod test_create_trigger_statements {
188+
mod create_trigger_tests {
189189
use std::fmt::Display;
190190

191191
use crate::{
@@ -203,7 +203,7 @@ mod test_create_trigger_statements {
203203
};
204204

205205
#[test]
206-
fn test_create_trigger_statement() {
206+
fn create_trigger_test() {
207207
let expected = create_trigger_statement();
208208
run_sunny_day_test(
209209
"CREATE TRIGGER trigger_name DELETE ON table_name BEGIN SELECT * FROM table_name; END;",
@@ -212,7 +212,7 @@ mod test_create_trigger_statements {
212212
}
213213

214214
#[test]
215-
fn test_create_temporary_trigger_statement() {
215+
fn create_temporary_trigger_test() {
216216
let temp_keywords = vec![Keyword::Temporary, Keyword::Temp];
217217
let mut expected = create_trigger_statement();
218218
expected.temporary = true;
@@ -226,7 +226,7 @@ mod test_create_trigger_statements {
226226
}
227227

228228
#[test]
229-
fn test_create_trigger_statement_with_if_not_exists() {
229+
fn create_trigger_with_if_not_exists() {
230230
let mut expected = create_trigger_statement();
231231
expected.if_not_exists = true;
232232

@@ -237,7 +237,7 @@ mod test_create_trigger_statements {
237237
}
238238

239239
#[test]
240-
fn test_create_trigger_statement_with_trigger_schema() {
240+
fn create_trigger_with_trigger_schema() {
241241
let mut expected = create_trigger_statement();
242242
expected.trigger_name =
243243
Identifier::Compound(vec!["schema_name".to_string(), "trigger_name".to_string()]);
@@ -249,7 +249,7 @@ mod test_create_trigger_statements {
249249
}
250250

251251
#[test]
252-
fn test_create_trigger_statement_with_trigger_pre_conditions() {
252+
fn create_trigger_with_trigger_pre_conditions() {
253253
let trigger_pre_conditions = vec![
254254
TriggerPreCondition::Before,
255255
TriggerPreCondition::After,
@@ -271,7 +271,7 @@ mod test_create_trigger_statements {
271271
}
272272

273273
#[test]
274-
fn test_create_trigger_statement_with_trigger_event_types() {
274+
fn create_trigger_with_trigger_event_types() {
275275
let trigger_event_types = vec![
276276
TriggerEventType::Delete,
277277
TriggerEventType::Insert,
@@ -331,7 +331,7 @@ mod test_create_trigger_statements {
331331
}
332332

333333
#[test]
334-
fn test_create_trigger_statement_with_for_each_row() {
334+
fn create_trigger_with_for_each_row() {
335335
let mut expected = create_trigger_statement();
336336
expected.for_each_row = true;
337337

@@ -342,7 +342,7 @@ mod test_create_trigger_statements {
342342
}
343343

344344
#[test]
345-
fn test_create_trigger_statement_with_when_clause() {
345+
fn create_trigger_with_when_clause() {
346346
let mut expected = create_trigger_statement();
347347
expected.when_clause = Some(binary_op_expression(
348348
BinaryOp::Equals,
@@ -357,7 +357,7 @@ mod test_create_trigger_statements {
357357
}
358358

359359
#[test]
360-
fn test_create_trigger_statement_with_multiple_statements() {
360+
fn create_trigger_with_multiple_statements() {
361361
let mut expected = create_trigger_statement();
362362
expected.trigger_statements = vec![
363363
TriggerStatement::Update(update_statement2()),

‎src/parser/create/create_view.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ pub mod test_utils {
5959
}
6060

6161
#[cfg(test)]
62-
mod test_create_view_statement_parser {
62+
mod create_view_tests {
6363
use crate::{parser::test_utils::run_sunny_day_test, Identifier, Statement};
6464

6565
use super::test_utils::create_view_statement;
6666

6767
#[test]
68-
fn test_parse_create_view_statement() {
68+
fn create_view_test() {
6969
let expected_stmt = create_view_statement();
7070
run_sunny_day_test(
7171
"CREATE VIEW view_name AS SELECT * FROM table_name",
@@ -74,7 +74,7 @@ mod test_create_view_statement_parser {
7474
}
7575

7676
#[test]
77-
fn test_parse_create_temporary_view_statement() {
77+
fn create_temporary_view_test() {
7878
let mut expected_stmt = create_view_statement();
7979
expected_stmt.temporary = true;
8080
run_sunny_day_test(
@@ -88,7 +88,7 @@ mod test_create_view_statement_parser {
8888
}
8989

9090
#[test]
91-
fn test_parse_create_view_statement_with_if_not_exists() {
91+
fn create_view_with_if_not_exists() {
9292
let mut expected_stmt = create_view_statement();
9393
expected_stmt.if_not_exists = true;
9494
run_sunny_day_test(
@@ -98,7 +98,7 @@ mod test_create_view_statement_parser {
9898
}
9999

100100
#[test]
101-
fn test_parse_create_view_statement_with_schema_name() {
101+
fn create_view_with_schema_name() {
102102
let mut expected_stmt = create_view_statement();
103103
expected_stmt.view_name =
104104
Identifier::Compound(vec!["schema_name".to_string(), "view_name".to_string()]);
@@ -109,7 +109,7 @@ mod test_create_view_statement_parser {
109109
}
110110

111111
#[test]
112-
fn test_parse_create_view_statement_with_columns() {
112+
fn create_view_with_columns() {
113113
let mut expected_stmt = create_view_statement();
114114
expected_stmt.columns = vec![Identifier::from("column1"), Identifier::from("column2")];
115115
run_sunny_day_test(

‎src/parser/create/create_virtual_table.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub mod test_utils {
6868
}
6969

7070
#[cfg(test)]
71-
mod tests_create_virtual_table_parser {
71+
mod create_virtual_table_tests {
7272
use test_utils::create_virtual_table_statement;
7373

7474
use crate::{
@@ -79,15 +79,15 @@ mod tests_create_virtual_table_parser {
7979
use super::*;
8080

8181
#[test]
82-
fn test_parse_create_virtual_table_statement_default() {
82+
fn create_virtual_table_test() {
8383
run_sunny_day_test(
8484
"CREATE VIRTUAL TABLE test_table USING test_module",
8585
Statement::CreateVirtualTable(create_virtual_table_statement()),
8686
);
8787
}
8888

8989
#[test]
90-
fn test_parse_create_virtual_table_statement_if_not_exists() {
90+
fn create_virtual_table_with_if_not_exists() {
9191
let mut stmt = create_virtual_table_statement();
9292
stmt.if_not_exists = true;
9393

@@ -98,7 +98,7 @@ mod tests_create_virtual_table_parser {
9898
}
9999

100100
#[test]
101-
fn test_parse_create_virtual_table_statement_with_schema() {
101+
fn create_virtual_table_with_schema() {
102102
let mut stmt = create_virtual_table_statement();
103103
stmt.table_name =
104104
Identifier::Compound(vec!["test_schema".to_string(), "test_table".to_string()]);
@@ -110,7 +110,7 @@ mod tests_create_virtual_table_parser {
110110
}
111111

112112
#[test]
113-
fn test_parse_create_virtual_table_statement_with_module_arguments() {
113+
fn create_virtual_table_with_module_arguments() {
114114
let mut stmt = create_virtual_table_statement();
115115
stmt.module_arguments = vec![
116116
string_literal_expression("'arg1'"),

0 commit comments

Comments
 (0)