sql_parser: replace statement parser

Author: Almaz-KG

README.md

@@ -80,14 +80,14 @@ The items were taken from the official SQLite documentation
 1. [update-stmt](https://www.sqlite.org/syntax/update-stmt.html) ✅
 1. [update-stmt-limited](https://www.sqlite.org/syntax/update-stmt-limited.html) ✅
 
-#### INSERT Statement ![progress](https://progress-bar.xyz/0/?scale=7&suffix=%%%20(0%20of%207)&width=140)
-1. [insert-with-values](https://www.sqlite.org/lang_insert.html)
-1. [insert-as-select](https://www.sqlite.org/lang_insert.html)
-1. [insert-with-upsert](https://www.sqlite.org/lang_insert.html)
-1. [insert-as-default](https://www.sqlite.org/lang_insert.html)
-1. [insert-with-returning](https://www.sqlite.org/lang_insert.html)
-1. [insert-with-cte](https://www.sqlite.org/lang_insert.html)
-1. [replace-stmt](https://www.sqlite.org/lang_replace.html)
+#### INSERT Statement ![progress](https://progress-bar.xyz/7/?scale=7&suffix=%%%20(7%20of%207)&width=140)
+1. [insert-with-values](https://www.sqlite.org/lang_insert.html) ✅
+1. [insert-as-select](https://www.sqlite.org/lang_insert.html) ✅
+1. [insert-with-upsert](https://www.sqlite.org/lang_insert.html) ✅
+1. [insert-as-default](https://www.sqlite.org/lang_insert.html) ✅
+1. [insert-with-returning](https://www.sqlite.org/lang_insert.html) ✅
+1. [insert-with-cte](https://www.sqlite.org/lang_insert.html) ✅
+1. [replace-stmt](https://www.sqlite.org/lang_replace.html) ✅
 
 #### CREATE Statements ![progress](https://progress-bar.xyz/0/?scale=45&suffix=%%%20(0%20of%205)&width=140)
 1. create-virtual-table-stmt

src/parser/insert/mod.rs

@@ -1,6 +1,7 @@
 use crate::{
-    parser::select::SelectStatementParser, Identifier, InsertStatement, InsertValues, Keyword,
-    QualifiedTableName, TokenType, UpsertAction, UpsertClause, UpsertConflictTarget, UpsertUpdate,
+    parser::select::SelectStatementParser, ConflictClause, Identifier, InsertStatement,
+    InsertValues, Keyword, QualifiedTableName, TokenType, UpsertAction, UpsertClause,
+    UpsertConflictTarget, UpsertUpdate,
 };
 
 use super::{
@@ -32,6 +33,17 @@ pub trait InsertStatementParser {
 
 impl<'a> InsertStatementParser for Parser<'a> {
     fn parse_insert_statement(&mut self) -> Result<InsertStatement, ParsingError> {
+        if self.consume_as_keyword(Keyword::Replace).is_ok() {
+            return Ok(InsertStatement {
+                conflict_clause: ConflictClause::None,
+                table_name: self.parse_table_name()?,
+                columns: self.parse_insert_columns()?,
+                values: self.parse_insert_values()?,
+                upsert_clause: self.parse_upsert_clauses()?,
+                returning_clause: self.parse_returning_clause()?,
+            });
+        }
+
         self.consume_as_keyword(Keyword::Insert)?;
 
         Ok(InsertStatement {
@@ -45,13 +57,11 @@ impl<'a> InsertStatementParser for Parser<'a> {
     }
 
     fn parse_table_name(&mut self) -> Result<QualifiedTableName, ParsingError> {
-        dbg!("parse_table_name");
         self.consume_as_keyword(Keyword::Into)?;
         self.parse_qualified_table_name()
     }
 
     fn parse_insert_columns(&mut self) -> Result<Vec<Identifier>, ParsingError> {
-        dbg!("parse_insert_columns");
         let mut columns = vec![];
 
         if self.consume_as(TokenType::LeftParen).is_ok() {
@@ -69,7 +79,6 @@ impl<'a> InsertStatementParser for Parser<'a> {
     }
 
     fn parse_insert_values(&mut self) -> Result<InsertValues, ParsingError> {
-        dbg!("parse_insert_values");
         if self.consume_as_keyword(Keyword::Values).is_ok() {
             let mut values = vec![];
 
@@ -131,12 +140,7 @@ impl<'a> InsertStatementParser for Parser<'a> {
         self.consume_as_keyword(Keyword::Conflict)?;
 
         let conflict_target = self.parse_upsert_conflict_target()?;
-        dbg!("conflict_target", &conflict_target);
-
-        dbg!("parse_upsert_action");
-        dbg!("self.peek_token()", self.peek_token()?);
         let action = self.parse_upsert_action()?;
-        dbg!("action", &action);
 
         Ok(UpsertClause {
             conflict_target,
@@ -176,10 +180,6 @@ impl<'a> InsertStatementParser for Parser<'a> {
         }
 
         if self.consume_as_keyword(Keyword::Update).is_ok() {
-            dbg!("parse_upsert_action update");
-            dbg!("self.peek_token()", self.peek_token()?);
-            // self.consume_as_keyword(Keyword::Set)?;
-
             let set_clauses = self.parse_set_clauses()?;
 
             let where_clause = self.parse_where_clause()?;
@@ -509,4 +509,14 @@ mod tests_insert_statement {
             Statement::WithCte(expected_statement),
         );
     }
+
+    #[test]
+    fn test_parse_insert_statement_with_replace() {
+        let mut expected_statement = insert_statement();
+        expected_statement.conflict_clause = ConflictClause::None;
+        run_sunny_day_test(
+            "REPLACE INTO table1 DEFAULT VALUES",
+            Statement::Insert(expected_statement),
+        );
+    }
 }

src/parser/mod.rs

@@ -323,7 +323,7 @@ impl<'a> Parser<'a> {
             Keyword::Update => {
                 UpdateStatementParser::parse_update_statement(self).map(Statement::Update)
             }
-            Keyword::Insert => {
+            Keyword::Insert | Keyword::Replace => {
                 InsertStatementParser::parse_insert_statement(self).map(Statement::Insert)
             }
             Keyword::Alter => AlterTableStatementParser::parse_alter_table_statement(self)

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 70.95% of the tests that are passing.
+In the current implementation, there is 74.94% 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
 

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 40.95%
+Current test pass rate is 42.41%