Merge pull request #89 from cvng/create-tablespace

Author: psteinroe

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

@@ -668,6 +668,17 @@ fn custom_handlers(node: &Node) -> TokenStream {
                 _ => panic!("Unknown IndexElem {:#?}", n.nulls_ordering()),
             }
         },
+        "CreateTableSpaceStmt" => quote! {
+            tokens.push(TokenProperty::from(Token::Create));
+            tokens.push(TokenProperty::from(Token::Tablespace));
+            tokens.push(TokenProperty::from(Token::Location));
+            if n.owner.is_some() {
+                tokens.push(TokenProperty::from(Token::Owner));
+            }
+            if n.options.len() > 0 {
+                tokens.push(TokenProperty::from(Token::With));
+            }
+        },
         _ => quote! {},
     }
 }

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

@@ -239,4 +239,21 @@ mod tests {
             ],
         )
     }
+
+    #[test]
+    fn test_create_tablespace() {
+        test_get_node_properties(
+            "create tablespace x owner a location 'b' with (seq_page_cost=3);",
+            SyntaxKind::CreateTableSpaceStmt,
+            vec![
+                TokenProperty::from(SyntaxKind::Create),
+                TokenProperty::from(SyntaxKind::Tablespace),
+                TokenProperty::from(SyntaxKind::Location),
+                TokenProperty::from(SyntaxKind::Owner),
+                TokenProperty::from(SyntaxKind::With),
+                TokenProperty::from("x".to_string()),
+                TokenProperty::from("b".to_string()),
+            ],
+        )
+    }
 }

Diff for: crates/parser/tests/data/statements/valid/0048.sql

@@ -0,0 +1,2 @@
+CREATE TABLESPACE x LOCATION 'a';
+CREATE TABLESPACE x OWNER a LOCATION 'b' WITH (random_page_cost=42, seq_page_cost=3);

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

@@ -0,0 +1,33 @@
+---
+source: crates/parser/tests/statement_parser_test.rs
+description: "CREATE TABLESPACE x LOCATION 'a';"
+---
+Parse {
+    cst: SourceFile@0..33
+      CreateTableSpaceStmt@0..33
+        Create@0..6 "CREATE"
+        Whitespace@6..7 " "
+        Tablespace@7..17 "TABLESPACE"
+        Whitespace@17..18 " "
+        Ident@18..19 "x"
+        Whitespace@19..20 " "
+        Location@20..28 "LOCATION"
+        Whitespace@28..29 " "
+        Sconst@29..32 "'a'"
+        Ascii59@32..33 ";"
+    ,
+    errors: [],
+    stmts: [
+        RawStmt {
+            stmt: CreateTableSpaceStmt(
+                CreateTableSpaceStmt {
+                    tablespacename: "x",
+                    owner: None,
+                    location: "a",
+                    options: [],
+                },
+            ),
+            range: 0..32,
+        },
+    ],
+}

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

@@ -0,0 +1,107 @@
+---
+source: crates/parser/tests/statement_parser_test.rs
+description: "\nCREATE TABLESPACE x OWNER a LOCATION 'b' WITH (random_page_cost=42, seq_page_cost=3);"
+---
+Parse {
+    cst: SourceFile@0..86
+      Newline@0..1 "\n"
+      CreateTableSpaceStmt@1..86
+        Create@1..7 "CREATE"
+        Whitespace@7..8 " "
+        Tablespace@8..18 "TABLESPACE"
+        Whitespace@18..19 " "
+        Ident@19..20 "x"
+        Whitespace@20..21 " "
+        Owner@21..26 "OWNER"
+        Whitespace@26..27 " "
+        RoleSpec@27..28
+          Ident@27..28 "a"
+        Whitespace@28..29 " "
+        Location@29..37 "LOCATION"
+        Whitespace@37..38 " "
+        Sconst@38..41 "'b'"
+        Whitespace@41..42 " "
+        With@42..46 "WITH"
+        Whitespace@46..47 " "
+        Ascii40@47..48 "("
+        DefElem@48..67
+          Ident@48..64 "random_page_cost"
+          Ascii61@64..65 "="
+          Iconst@65..67 "42"
+        Ascii44@67..68 ","
+        Whitespace@68..69 " "
+        DefElem@69..84
+          Ident@69..82 "seq_page_cost"
+          Ascii61@82..83 "="
+          Iconst@83..84 "3"
+        Ascii41@84..85 ")"
+        Ascii59@85..86 ";"
+    ,
+    errors: [],
+    stmts: [
+        RawStmt {
+            stmt: CreateTableSpaceStmt(
+                CreateTableSpaceStmt {
+                    tablespacename: "x",
+                    owner: Some(
+                        RoleSpec {
+                            roletype: RolespecCstring,
+                            rolename: "a",
+                            location: 26,
+                        },
+                    ),
+                    location: "b",
+                    options: [
+                        Node {
+                            node: Some(
+                                DefElem(
+                                    DefElem {
+                                        defnamespace: "",
+                                        defname: "random_page_cost",
+                                        arg: Some(
+                                            Node {
+                                                node: Some(
+                                                    Integer(
+                                                        Integer {
+                                                            ival: 42,
+                                                        },
+                                                    ),
+                                                ),
+                                            },
+                                        ),
+                                        defaction: DefelemUnspec,
+                                        location: 47,
+                                    },
+                                ),
+                            ),
+                        },
+                        Node {
+                            node: Some(
+                                DefElem(
+                                    DefElem {
+                                        defnamespace: "",
+                                        defname: "seq_page_cost",
+                                        arg: Some(
+                                            Node {
+                                                node: Some(
+                                                    Integer(
+                                                        Integer {
+                                                            ival: 3,
+                                                        },
+                                                    ),
+                                                ),
+                                            },
+                                        ),
+                                        defaction: DefelemUnspec,
+                                        location: 68,
+                                    },
+                                ),
+                            ),
+                        },
+                    ],
+                },
+            ),
+            range: 0..85,
+        },
+    ],
+}

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

@@ -0,0 +1,34 @@
+---
+source: crates/parser/tests/statement_parser_test.rs
+description: "CREATE PROCEDURE insert_data(a integer, b integer) LANGUAGE SQL AS $$INSERT INTO tbl VALUES (a); INSERT INTO tbl VALUES (b);$$;"
+---
+Parse {
+    cst: SourceFile@0..127
+      Create@0..6 "CREATE"
+      Whitespace@6..7 " "
+      Procedure@7..16 "PROCEDURE"
+      Whitespace@16..17 " "
+      Ident@17..28 "insert_data"
+      Ascii40@28..29 "("
+      Ident@29..30 "a"
+      Whitespace@30..31 " "
+      Integer@31..38 "integer"
+      Ascii44@38..39 ","
+      Whitespace@39..40 " "
+      Ident@40..41 "b"
+      Whitespace@41..42 " "
+      Integer@42..49 "integer"
+      Ascii41@49..50 ")"
+      Whitespace@50..51 " "
+      Language@51..59 "LANGUAGE"
+      Whitespace@59..60 " "
+      SqlP@60..63 "SQL"
+      Whitespace@63..64 " "
+      As@64..66 "AS"
+      Whitespace@66..67 " "
+      Sconst@67..126 "$$INSERT INTO tbl VAL ..."
+      Ascii59@126..127 ";"
+    ,
+    errors: [],
+    stmts: [],
+}