Drop redundant/unused values (in tests)

Author: xitep

tests/sqlparser_common.rs

@@ -39,8 +39,8 @@ use sqlparser::dialect::{
 };
 use sqlparser::keywords::{Keyword, ALL_KEYWORDS};
 use sqlparser::parser::{Parser, ParserError, ParserOptions};
-use sqlparser::tokenizer::{Location, Span, TokenWithSpan};
-use sqlparser::tokenizer::{Token, Tokenizer};
+use sqlparser::tokenizer::{Location, Span};
+use sqlparser::tokenizer::Tokenizer;
 use test_utils::{
     all_dialects, all_dialects_where, all_dialects_with_options, alter_table_op, assert_eq_vec,
     call, expr_from_projection, join, number, only, table, table_alias, table_from_name,
@@ -440,10 +440,7 @@ fn parse_update_set_from() {
     assert_eq!(
         stmt,
         Statement::Update(Update {
-            update_token: AttachedToken(TokenWithSpan {
-                token: Token::make_keyword("UPDATE"),
-                span: Span::new((1, 1).into(), (1, 7).into()),
-            }),
+            update_token: AttachedToken::empty(),
             table: TableWithJoins {
                 relation: table_from_name(ObjectName::from(vec![Ident::new("t1")])),
                 joins: vec![],
@@ -539,7 +536,7 @@ fn parse_update_with_table_alias() {
             returning,
             or: None,
             limit: None,
-            update_token,
+            update_token: _,
         }) => {
             assert_eq!(
                 TableWithJoins {
@@ -588,13 +585,6 @@ fn parse_update_with_table_alias() {
                 selection
             );
             assert_eq!(None, returning);
-            assert_eq!(
-                AttachedToken(TokenWithSpan {
-                    token: Token::make_keyword("UPDATE"),
-                    span: Span::new((1, 1).into(), (1, 7).into()),
-                }),
-                update_token
-            );
         }
         _ => unreachable!(),
     }

tests/sqlparser_mysql.rs

@@ -27,7 +27,7 @@ use sqlparser::ast::*;
 use sqlparser::dialect::{GenericDialect, MySqlDialect};
 use sqlparser::parser::{ParserError, ParserOptions};
 use sqlparser::tokenizer::Token;
-use sqlparser::tokenizer::{Span, TokenWithSpan};
+use sqlparser::tokenizer::Span;
 use test_utils::*;
 
 #[macro_use]
@@ -2623,7 +2623,7 @@ fn parse_update_with_joins() {
             returning,
             or: None,
             limit: None,
-            update_token,
+            update_token: _,
         }) => {
             assert_eq!(
                 TableWithJoins {
@@ -2698,13 +2698,6 @@ fn parse_update_with_joins() {
                 selection
             );
             assert_eq!(None, returning);
-            assert_eq!(
-                AttachedToken(TokenWithSpan {
-                    token: Token::make_keyword("UPDATE"),
-                    span: Span::new((1, 1).into(), (1, 7).into()),
-                }),
-                update_token
-            );
         }
         _ => unreachable!(),
     }

tests/sqlparser_postgres.rs

@@ -23,7 +23,7 @@
 mod test_utils;
 
 use helpers::attached_token::AttachedToken;
-use sqlparser::tokenizer::{Span, Token, TokenWithSpan};
+use sqlparser::tokenizer::Span;
 use test_utils::*;
 
 use sqlparser::ast::*;
@@ -5140,10 +5140,7 @@ fn test_simple_postgres_insert_with_alias() {
     assert_eq!(
         statement,
         Statement::Insert(Insert {
-            insert_token: AttachedToken(TokenWithSpan {
-                token: Token::make_keyword("INSERT"),
-                span: Span::new((1, 1).into(), (1, 7).into()),
-            }),
+            insert_token: AttachedToken::empty(),
             or: None,
             ignore: false,
             into: true,
@@ -5213,10 +5210,7 @@ fn test_simple_postgres_insert_with_alias() {
     assert_eq!(
         statement,
         Statement::Insert(Insert {
-            insert_token: AttachedToken(TokenWithSpan {
-                token: Token::make_keyword("INSERT"),
-                span: Span::new((1, 1).into(), (1, 7).into()),
-            }),
+            insert_token: AttachedToken::empty(),
             or: None,
             ignore: false,
             into: true,
@@ -5288,10 +5282,7 @@ fn test_simple_insert_with_quoted_alias() {
     assert_eq!(
         statement,
         Statement::Insert(Insert {
-            insert_token: AttachedToken(TokenWithSpan {
-                token: Token::make_keyword("INSERT"),
-                span: Span::new((1, 1).into(), (1, 7).into()),
-            }),
+            insert_token: AttachedToken::empty(),
             or: None,
             ignore: false,
             into: true,

tests/sqlparser_sqlite.rs

@@ -31,7 +31,7 @@ use sqlparser::ast::Value::Placeholder;
 use sqlparser::ast::*;
 use sqlparser::dialect::{GenericDialect, SQLiteDialect};
 use sqlparser::parser::{ParserError, ParserOptions};
-use sqlparser::tokenizer::{Span, Token, TokenWithSpan};
+use sqlparser::tokenizer::Token;
 
 #[test]
 fn pragma_no_value() {
@@ -496,10 +496,7 @@ fn parse_update_tuple_row_values() {
             from: None,
             returning: None,
             limit: None,
-            update_token: AttachedToken(TokenWithSpan {
-                token: Token::make_keyword("UPDATE"),
-                span: Span::new((1, 1).into(), (1, 7).into())
-            })
+            update_token: AttachedToken::empty()
         })
     );
 }