sql_parser: select parser tests refactoring (8)

Almaz-KG · Almaz-KG · commit 902f6c2fd8c9 · 2024-12-30T18:40:10.000+01:00
diff --git a/src/ast/alter.rs b/src/ast/alter.rs
@@ -30,7 +30,9 @@ pub enum AlterTableStatementType {
 #[derive(Debug, PartialEq, Clone)]
 pub struct ColumnDefinition {
     pub column_name: Identifier,
+
     pub column_type: Option<DataType>,
+
     pub column_constraints: Vec<ColumnConstraint>,
 }
 
diff --git a/src/ast/create.rs b/src/ast/create.rs
@@ -16,7 +16,7 @@ pub struct CreateVirtualTableStatement {
 
     pub module_name: Identifier,
 
-    pub module_arguments: Vec<Expression>,
+    pub module_arguments: Vec<ColumnDefinition>,
 }
 
 /// An AST for [CREATE INDEX](https://www.sqlite.org/lang_createindex.html) SQL statement.
diff --git a/src/parser/create/create_table.rs b/src/parser/create/create_table.rs
@@ -197,7 +197,7 @@ mod create_table_tests {
         expression::test_utils::identifier_expr, parser::test_utils::run_sunny_day_test,
         ColumnConstraint, ColumnConstraintType, ColumnDefinition, ConflictClause,
         CreateTableColumnDef, CreateTableOption, DataType, Identifier, IndexedColumn, Ordering,
-        Statement, TableConstraint, TableConstraintType, TableOption,
+        PrimaryKeyConstraint, Statement, TableConstraint, TableConstraintType, TableOption,
     };
 
     use super::test_utils::create_table_statement;
@@ -308,6 +308,53 @@ mod create_table_tests {
         );
     }
 
+    #[test]
+    fn create_table_with_primary_column() {
+        let mut expected_stmt = create_table_statement();
+
+        expected_stmt.create_table_option =
+            CreateTableOption::ColumnDefinitions(CreateTableColumnDef {
+                columns: vec![
+                    ColumnDefinition {
+                        column_name: Identifier::from("id"),
+                        column_type: Some(DataType::PlainDataType("int".into())),
+                        column_constraints: vec![ColumnConstraint {
+                            constraint_type: ColumnConstraintType::PrimaryKey(
+                                PrimaryKeyConstraint {
+                                    ordering: None,
+                                    conflict_clause: ConflictClause::None,
+                                    auto_increment: false,
+                                },
+                            ),
+                            name: None,
+                        }],
+                    },
+                    ColumnDefinition {
+                        column_name: Identifier::from("name"),
+                        column_type: Some(DataType::SizedDataType("varchar".into(), "50".into())),
+                        column_constraints: vec![],
+                    },
+                    ColumnDefinition {
+                        column_name: Identifier::from("category"),
+                        column_type: Some(DataType::SizedDataType("varchar".into(), "15".into())),
+                        column_constraints: vec![],
+                    },
+                    ColumnDefinition {
+                        column_name: Identifier::from("cost"),
+                        column_type: Some(DataType::PlainDataType("int".into())),
+                        column_constraints: vec![],
+                    },
+                ],
+                table_constraints: vec![],
+                table_options: vec![],
+            });
+
+        run_sunny_day_test(
+            "CREATE TABLE table_name (id int PRIMARY KEY, name varchar(50), category varchar(15), cost int)",
+            Statement::CreateTable(expected_stmt.clone()),
+        );
+    }
+
     #[test]
     fn create_table_with_table_options() {
         let table_options = vec![TableOption::WithoutRowId, TableOption::Strict];
diff --git a/src/parser/create/create_virtual_table.rs b/src/parser/create/create_virtual_table.rs
@@ -1,16 +1,16 @@
+use super::create_table::CreateTableStatementParser;
 use super::CreateStatementParser;
-use crate::expression::ExpressionParser;
 use crate::parser::errors::ParsingError;
 use crate::{
-    CreateVirtualTableStatement, Expression, IdentifierParser, Keyword, Parser, TokenType,
+    ColumnDefinition, CreateVirtualTableStatement, IdentifierParser, Keyword, Parser, TokenType,
 };
 
 pub trait CreateVirtualTableStatementParser {
     fn parse_create_virtual_table_statement(
         &mut self,
     ) -> Result<CreateVirtualTableStatement, ParsingError>;
 
-    fn parse_module_arguments(&mut self) -> Result<Vec<Expression>, ParsingError>;
+    fn parse_module_arguments(&mut self) -> Result<Vec<ColumnDefinition>, ParsingError>;
 }
 
 impl<'a> CreateVirtualTableStatementParser for Parser<'a> {
@@ -26,6 +26,7 @@ impl<'a> CreateVirtualTableStatementParser for Parser<'a> {
         self.consume_as_keyword(Keyword::Using)?;
 
         let module_name = self.parse_identifier()?;
+
         let module_arguments = self.parse_module_arguments()?;
 
         Ok(CreateVirtualTableStatement {
@@ -36,22 +37,16 @@ impl<'a> CreateVirtualTableStatementParser for Parser<'a> {
         })
     }
 
-    fn parse_module_arguments(&mut self) -> Result<Vec<Expression>, ParsingError> {
-        let mut arguments = vec![];
-
+    fn parse_module_arguments(&mut self) -> Result<Vec<ColumnDefinition>, ParsingError> {
         if self.consume_as(TokenType::LeftParen).is_ok() {
-            loop {
-                arguments.push(self.parse_expression()?);
-
-                if self.consume_as(TokenType::Comma).is_err() {
-                    break;
-                }
-            }
+            let args = self.parse_column_definitions()?;
 
             self.consume_as(TokenType::RightParen)?;
-        }
 
-        Ok(arguments)
+            Ok(args)
+        } else {
+            Ok(vec![])
+        }
     }
 }
 
@@ -74,8 +69,8 @@ mod create_virtual_table_tests {
     use test_utils::create_virtual_table_statement;
 
     use crate::{
-        expression::test_utils::string_expr, parser::test_utils::run_sunny_day_test, Identifier,
-        Statement,
+        parser::test_utils::run_sunny_day_test, ColumnConstraint, ColumnConstraintType,
+        ConflictClause, DataType, Identifier, PrimaryKeyConstraint, Statement,
     };
 
     use super::*;
@@ -114,10 +109,44 @@ mod create_virtual_table_tests {
     #[test]
     fn create_virtual_table_with_module_arguments() {
         let mut stmt = create_virtual_table_statement();
-        stmt.module_arguments = vec![string_expr("'arg1'"), string_expr("'arg2'")];
+        stmt.module_arguments = vec![
+            ColumnDefinition {
+                column_name: Identifier::from("id"),
+                column_type: Some(DataType::PlainDataType("int".into())),
+                column_constraints: vec![ColumnConstraint {
+                    name: None,
+                    constraint_type: ColumnConstraintType::PrimaryKey(PrimaryKeyConstraint {
+                        auto_increment: false,
+                        conflict_clause: ConflictClause::None,
+                        ordering: None,
+                    }),
+                }],
+            },
+            ColumnDefinition {
+                column_name: Identifier::from("name"),
+                column_type: Some(DataType::SizedDataType("varchar".into(), "50".into())),
+                column_constraints: vec![],
+            },
+            ColumnDefinition {
+                column_name: Identifier::from("category"),
+                column_type: Some(DataType::SizedDataType("varchar".into(), "15".into())),
+                column_constraints: vec![],
+            },
+            ColumnDefinition {
+                column_name: Identifier::from("cost"),
+                column_type: Some(DataType::PlainDataType("int".into())),
+                column_constraints: vec![],
+            },
+        ];
 
         run_sunny_day_test(
-            "CREATE VIRTUAL TABLE test_table USING test_module('arg1', 'arg2')",
+            "CREATE VIRTUAL TABLE test_table 
+            USING test_module(
+                id int PRIMARY KEY,
+                name varchar(50),
+                category varchar(15),
+                cost int
+            )",
             Statement::CreateVirtualTable(stmt),
         );
     }
diff --git a/tests/bart-riers-sqlite-dataset/README.md b/tests/bart-riers-sqlite-dataset/README.md
@@ -2,7 +2,7 @@
 
 The test dataset is taken from the [Bart Kiers' SQLite ANTLR parser](https://github.com/bkiers/sqlite-parser/tree/master).
 
-In the current implementation, there is 64.27% of the tests that are passing.
+In the current implementation, there is 64.26% of the tests that are passing.
 By passing tests, I mean that the parser successfully parses the SQL query and returns a valid `Expression` AST.
 The structure of the parsed AST is not checked, as there are no expected ASTs list
 
diff --git a/tests/codeschool-sqlite-parser-test-files/README.md b/tests/codeschool-sqlite-parser-test-files/README.md
@@ -3,4 +3,4 @@
 The queries under `sql/` folder are taken from the [Codeschool SQLite Parser](https://github.com/codeschool/sqlite-parser/tree/master) repository.
 
 
-Current test pass rate is 90.85%
+Current test pass rate is 91.24%
diff --git a/tests/codeschool-sqlite-parser-test-files/main.rs b/tests/codeschool-sqlite-parser-test-files/main.rs
@@ -54,108 +54,8 @@ fn run_test(sql_content: &str) -> Result<Statement, ParsingError> {
 
 #[test]
 pub fn test() {
-    /*
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-20.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/vtab1-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts4aa-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/rowid-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-21.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-23.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-22.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-26.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-9.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-8.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts1d-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-25.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-8.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-8.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-9.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-9.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-18.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/triggerD-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-24.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts1c-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/pager1-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/triggerC-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-19.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/alter3-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/pager1-3.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-18.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/schema5-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/vacuum4-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/avtrans-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/pagerfault-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/jrnlmode-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-16.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-13.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts3ac-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/tkt-b1d3a2e531-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/with3-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/shared9-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-15.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-10.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-11.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts2d-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-14.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-10.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-15.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/selectA-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/selectA-3.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-14.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-11.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-13.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-16.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fkey3-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/e_fkey-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-17.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-12.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-15.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-4.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-4.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-6.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-7.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-5.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fkey4-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-5.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-14.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-16.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-7.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts1porter-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-7.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts-9fd058691-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-5.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-4.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/trigger5-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-6.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-6.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-17.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-13.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/without_rowid3-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/tkt2285-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary3-3.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fkey2-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-3.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts2c-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-12.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-10.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-3.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/orderby7-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/boundary1-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/fts3ad-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/official-suite/randexpr1-11.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-unary-1.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-grouping-9.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-grouping-8.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-parenthesis-2.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-grouping-6.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-grouping-7.sql"
-       "tests/codeschool-sqlite-parser-test-files/sql/create-virtual-table/create-virtual-table-alt-syntax.sql"
-    */
-
     let sql_content = fs::read_to_string(
-        "tests/codeschool-sqlite-parser-test-files/sql/expressions/expression-unary-1.sql",
+        "tests/codeschool-sqlite-parser-test-files/sql/create-virtual-table/create-virtual-table-alt-syntax.sql",
     )
     .unwrap();
     let result = run_test(&sql_content);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ pub enum AlterTableStatementType {`
`30`	`30`	`#[derive(Debug, PartialEq, Clone)]`
`31`	`31`	`pub struct ColumnDefinition {`
`32`	`32`	`pub column_name: Identifier,`
	`33`	`+`
`33`	`34`	`pub column_type: Option<DataType>,`
	`35`	`+`
`34`	`36`	`pub column_constraints: Vec<ColumnConstraint>,`
`35`	`37`	`}`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ pub struct CreateVirtualTableStatement {`
`16`	`16`
`17`	`17`	`pub module_name: Identifier,`
`18`	`18`
`19`		`- pub module_arguments: Vec<Expression>,`
	`19`	`+ pub module_arguments: Vec<ColumnDefinition>,`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/// An AST for [CREATE INDEX](https://www.sqlite.org/lang_createindex.html) SQL statement.`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	The queries under `sql/` folder are taken from the [Codeschool SQLite Parser](https://github.com/codeschool/sqlite-parser/tree/master) repository.
`4`	`4`
`5`	`5`
`6`		`-Current test pass rate is 90.85%`
	`6`	`+Current test pass rate is 91.24%`