added parse_column_def support and propogated span and stmt with leading_comment

Author: RPG-Alex

src/ast/helpers/stmt_create_table.rs

@@ -32,6 +32,7 @@ use crate::ast::{
 };
 
 use crate::parser::ParserError;
+use crate::tokenizer::Comment;
 
 /// Builder for create table statement variant ([1]).
 ///
@@ -115,6 +116,7 @@ pub struct CreateTableBuilder {
     pub refresh_mode: Option<RefreshModeKind>,
     pub initialize: Option<InitializeKind>,
     pub require_user: bool,
+    pub leading_comment: Option<Comment>,
 }
 
 impl CreateTableBuilder {
@@ -171,6 +173,7 @@ impl CreateTableBuilder {
             refresh_mode: None,
             initialize: None,
             require_user: false,
+            leading_comment: None,
         }
     }
     pub fn or_replace(mut self, or_replace: bool) -> Self {
@@ -484,6 +487,7 @@ impl CreateTableBuilder {
             refresh_mode: self.refresh_mode,
             initialize: self.initialize,
             require_user: self.require_user,
+            leading_comment: self.leading_comment,
         }
         .into()
     }
@@ -548,6 +552,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
                 refresh_mode,
                 initialize,
                 require_user,
+                leading_comment,
             }) => Ok(Self {
                 or_replace,
                 temporary,
@@ -600,6 +605,7 @@ impl TryFrom<Statement> for CreateTableBuilder {
                 refresh_mode,
                 initialize,
                 require_user,
+                leading_comment,
             }),
             _ => Err(ParserError::ParserError(format!(
                 "Expected create table statement, but received: {stmt}"

src/ast/spans.rs

@@ -553,6 +553,7 @@ impl Spanned for CreateTable {
             refresh_mode: _,
             initialize: _,
             require_user: _,
+            leading_comment: _,                 // Option<Comment>
         } = self;
 
         union_spans(
@@ -572,6 +573,7 @@ impl Spanned for ColumnDef {
             name,
             data_type: _, // enum
             options,
+            leading_comment: _,
         } = self;
 
         union_spans(core::iter::once(name.span).chain(options.iter().map(|i| i.span())))

src/parser/mod.rs

@@ -7888,7 +7888,7 @@ impl<'a> Parser<'a> {
     }
 
     pub fn parse_columns(&mut self) -> Result<(Vec<ColumnDef>, Vec<TableConstraint>), ParserError> {
-        todo!("Add parsing for the Leading comment of the column, if any.");
+        //todo!("Add parsing for the Leading comment of the column, if any.");
 
         let mut columns = vec![];
         let mut constraints = vec![];
@@ -7952,13 +7952,21 @@ impl<'a> Parser<'a> {
     }
 
     pub fn parse_column_def(&mut self) -> Result<ColumnDef, ParserError> {
+        let leading_comment = match self.peek_token().token {
+            Token::LeadingComment(_) => {
+                let Token::LeadingComment(c) = self.next_token().token else { unreachable!() };
+                Some(c)
+            }
+            _ => None,
+        };
         let col_name = self.parse_identifier()?;
         let data_type = if self.is_column_type_sqlite_unspecified() {
             DataType::Unspecified
         } else {
             self.parse_data_type()?
         };
         let mut options = vec![];
+        
         loop {
             if self.parse_keyword(Keyword::CONSTRAINT) {
                 let name = Some(self.parse_identifier()?);
@@ -7980,6 +7988,7 @@ impl<'a> Parser<'a> {
             name: col_name,
             data_type,
             options,
+            leading_comment,
         })
     }