move properties to defelem

Author: cvng

Diff for: crates/codegen/src/get_node_properties.rs

@@ -211,6 +211,19 @@ fn custom_handlers(node: &Node) -> TokenStream {
             tokens.push(TokenProperty::from(n));
         },
         "DefElem" => quote! {
+            match n.defname.as_str() {
+                "location" => {
+                    tokens.push(TokenProperty::from(Token::Default));
+                },
+                "connection_limit" => {
+                    tokens.push(TokenProperty::from(Token::Limit));
+                    tokens.push(TokenProperty::from(Token::Iconst));
+                },
+                "owner" => {
+                    tokens.push(TokenProperty::from(Token::Owner));
+                }
+                _ => {}
+            }
             match n.defaction() {
                 protobuf::DefElemAction::DefelemUnspec => tokens.push(TokenProperty::from(Token::Ascii61)),
                 _ => panic!("Unknown DefElem {:#?}", n.defaction()),
@@ -679,24 +692,13 @@ fn custom_handlers(node: &Node) -> TokenStream {
                 tokens.push(TokenProperty::from(Token::With));
             }
         },
-        "CompositeTypeStmt" =>  quote! {
+        "CompositeTypeStmt" => quote! {
             tokens.push(TokenProperty::from(Token::Create));
             tokens.push(TokenProperty::from(Token::TypeP));
         },
         "CreatedbStmt" => quote! {
             tokens.push(TokenProperty::from(Token::Create));
             tokens.push(TokenProperty::from(Token::Database));
-            for option in &n.options {
-                if let Some(NodeEnum::DefElem(node)) = &option.node {
-                    if node.defname == "location" {
-                        tokens.push(TokenProperty::from(Token::Default));
-                    }
-                    if node.defname == "connection_limit" {
-                        tokens.push(TokenProperty::from(Token::Limit));
-                        tokens.push(TokenProperty::from(Token::Iconst));
-                    }
-                }
-            }
         },
         _ => quote! {},
     }

Diff for: crates/parser/src/codegen.rs

@@ -277,8 +277,6 @@ mod tests {
             vec![
                 TokenProperty::from(SyntaxKind::Create),
                 TokenProperty::from(SyntaxKind::Database),
-                TokenProperty::from(SyntaxKind::Limit),
-                TokenProperty::from(SyntaxKind::Iconst),
                 TokenProperty::from("x".to_string()),
             ],
         )

Diff for: crates/parser/tests/snapshots/statements/valid/[email protected]

@@ -16,12 +16,12 @@ Parse {
           Whitespace@23..24 " "
           Ident@24..27 "abc"
         Whitespace@27..28 " "
-        DefElem@28..38
+        DefElem@28..46
           Connection@28..38 "CONNECTION"
-        Whitespace@38..39 " "
-        Limit@39..44 "LIMIT"
-        Whitespace@44..45 " "
-        Iconst@45..46 "5"
+          Whitespace@38..39 " "
+          Limit@39..44 "LIMIT"
+          Whitespace@44..45 " "
+          Iconst@45..46 "5"
         Ascii59@46..47 ";"
     ,
     errors: [],

Diff for: crates/parser/tests/snapshots/statements/valid/[email protected]

@@ -12,10 +12,10 @@ Parse {
         Whitespace@16..17 " "
         Ident@17..18 "x"
         Whitespace@18..19 " "
-        DefElem@19..27
+        DefElem@19..35
           Location@19..27 "LOCATION"
-        Whitespace@27..28 " "
-        Default@28..35 "DEFAULT"
+          Whitespace@27..28 " "
+          Default@28..35 "DEFAULT"
         Ascii59@35..36 ";"
     ,
     errors: [],