diff --git a/crates/squawk_parser/src/grammar.rs b/crates/squawk_parser/src/grammar.rs
index 1955912e..fa1242dc 100644
--- a/crates/squawk_parser/src/grammar.rs
+++ b/crates/squawk_parser/src/grammar.rs
@@ -2353,7 +2353,7 @@ fn select_stmt(p: &mut Parser, m: Option<Marker>) -> Option<CompletedMarker> {
     // table [only] name [*]
     if p.eat(TABLE_KW) {
         relation_name(p);
-        return Some(m.complete(p, SELECT));
+        return Some(m.complete(p, TABLE_STMT));
     }
     // with aka cte
     // [ WITH [ RECURSIVE ] with_query [, ...] ]
@@ -8252,7 +8252,7 @@ fn create_materialized_view_stmt(p: &mut Parser<'_>) -> CompletedMarker {
         },
     );
     match statement.map(|x| x.kind()) {
-        Some(SELECT) => (),
+        Some(SELECT | TABLE_STMT | VALUES) => (),
         Some(kind) => {
             p.error(format!(
                 "expected SELECT, TABLE, or VALUES statement, got {:?}",
@@ -8584,7 +8584,7 @@ fn select_insert_delete_update_or_notify(p: &mut Parser<'_>) {
     );
     if let Some(statement) = statement {
         match statement.kind() {
-            SELECT | INSERT_STMT | UPDATE_STMT | DELETE_STMT | NOTIFY_STMT => (),
+            SELECT | VALUES | INSERT_STMT | UPDATE_STMT | DELETE_STMT | NOTIFY_STMT => (),
             kind => {
                 p.error(format!(
                     "expected SELECT, INSERT, UPDATE, DELETE, NOTIFY, or VALUES statement, got {:?}",
@@ -9656,6 +9656,7 @@ fn explain_stmt(p: &mut Parser<'_>) -> CompletedMarker {
     if let Some(statement) = statement {
         match statement.kind() {
             SELECT
+            | VALUES
             | INSERT_STMT
             | UPDATE_STMT
             | DELETE_STMT
@@ -10626,7 +10627,7 @@ fn values_clause(p: &mut Parser<'_>, m: Option<Marker>) -> CompletedMarker {
     opt_limit_clause(p);
     opt_offset_clause(p);
     opt_fetch_clause(p);
-    m.complete(p, SELECT)
+    m.complete(p, VALUES)
 }
 
 // REINDEX [ ( option [, ...] ) ] { INDEX | TABLE | SCHEMA } [ CONCURRENTLY ] name
@@ -10796,7 +10797,7 @@ fn prepare_stmt(p: &mut Parser<'_>) -> CompletedMarker {
     );
     if let Some(statement) = statement {
         match statement.kind() {
-            SELECT | INSERT_STMT | UPDATE_STMT | DELETE_STMT | MERGE_STMT => (),
+            SELECT | VALUES | INSERT_STMT | UPDATE_STMT | DELETE_STMT | MERGE_STMT => (),
             kind => {
                 p.error(format!(
                     "expected SELECT, INSERT, UPDATE, DELETE, MERGE, or VALUES statement, got {:?}",
@@ -12985,7 +12986,7 @@ fn alter_table_action(p: &mut Parser<'_>) -> Option<SyntaxKind> {
             p.bump(CLUSTER_KW);
             p.bump(ON_KW);
             name_ref(p);
-            DISABLE_CLUSTER
+            CLUSTER_ON
         }
         // OWNER TO { new_owner | CURRENT_ROLE | CURRENT_USER | SESSION_USER }
         OWNER_KW => {
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_materialized_view_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_materialized_view_ok.snap
index 867336e8..e234887d 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_materialized_view_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_materialized_view_ok.snap
@@ -691,7 +691,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "v"
     WHITESPACE "\n  "
-    DISABLE_CLUSTER
+    CLUSTER_ON
       CLUSTER_KW "cluster"
       WHITESPACE " "
       ON_KW "on"
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_table_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_table_ok.snap
index 176add55..5efe5a73 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_table_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__alter_table_ok.snap
@@ -1656,7 +1656,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "t"
     WHITESPACE " "
-    DISABLE_CLUSTER
+    CLUSTER_ON
       CLUSTER_KW "cluster"
       WHITESPACE " "
       ON_KW "on"
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_materialized_view_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_materialized_view_ok.snap
index d3107d0f..af804468 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_materialized_view_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_materialized_view_ok.snap
@@ -158,7 +158,7 @@ SOURCE_FILE
     WHITESPACE "\n  "
     AS_KW "as"
     WHITESPACE " "
-    SELECT
+    TABLE_STMT
       TABLE_KW "table"
       WHITESPACE " "
       PATH
@@ -183,7 +183,7 @@ SOURCE_FILE
     WHITESPACE "\n  "
     AS_KW "as"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_rule_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_rule_ok.snap
index e5b35006..5d62b493 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_rule_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_rule_ok.snap
@@ -128,7 +128,7 @@ SOURCE_FILE
           NAME_REF
             IDENT "t"
       WHITESPACE " "
-      SELECT
+      VALUES
         VALUES_KW "values"
         WHITESPACE " "
         L_PAREN "("
@@ -152,7 +152,7 @@ SOURCE_FILE
             IDENT "t"
     SEMICOLON ";"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_table_as_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_table_as_ok.snap
index 3bcd7f94..7120f03a 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_table_as_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_table_as_ok.snap
@@ -92,7 +92,7 @@ SOURCE_FILE
     WHITESPACE " "
     AS_KW "as"
     WHITESPACE "\n  "
-    SELECT
+    TABLE_STMT
       TABLE_KW "table"
       WHITESPACE " "
       PATH
@@ -117,7 +117,7 @@ SOURCE_FILE
     WHITESPACE " "
     AS_KW "as"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -140,7 +140,7 @@ SOURCE_FILE
     WHITESPACE " "
     AS_KW "as"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_ok.snap
index 08202a2c..e04f3366 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_ok.snap
@@ -348,7 +348,7 @@ SOURCE_FILE
     AS_KW "AS"
     WHITESPACE "\n    "
     COMPOUND_SELECT
-      SELECT
+      VALUES
         VALUES_KW "VALUES"
         WHITESPACE " "
         L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__explain_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__explain_ok.snap
index fa58637c..c59b0f70 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__explain_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__explain_ok.snap
@@ -604,7 +604,7 @@ SOURCE_FILE
             L_PAREN "("
             PAREN_EXPR
               L_PAREN "("
-              SELECT
+              VALUES
                 VALUES_KW "values"
                 WHITESPACE " "
                 L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_err.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_err.snap
index 14704039..93ca83d3 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_err.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_err.snap
@@ -31,7 +31,7 @@ SOURCE_FILE
           IDENT "c"
       R_PAREN ")"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -83,7 +83,7 @@ SOURCE_FILE
         COMMA ","
       R_PAREN ")"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -137,7 +137,7 @@ SOURCE_FILE
           IDENT "c"
       R_PAREN ")"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_ok.snap
index 48292f0c..2eb91145 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__insert_ok.snap
@@ -15,7 +15,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "products"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -59,7 +59,7 @@ SOURCE_FILE
           IDENT "price"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -103,7 +103,7 @@ SOURCE_FILE
           IDENT "product_no"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -162,7 +162,7 @@ SOURCE_FILE
           IDENT "price"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE "\n    "
       L_PAREN "("
@@ -357,7 +357,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "films"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE "\n    "
       L_PAREN "("
@@ -423,7 +423,7 @@ SOURCE_FILE
           IDENT "kind"
       R_PAREN ")"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -458,7 +458,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "films"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE "\n    "
       L_PAREN "("
@@ -524,7 +524,7 @@ SOURCE_FILE
           IDENT "kind"
       R_PAREN ")"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -601,7 +601,7 @@ SOURCE_FILE
           IDENT "kind"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE "\n    "
       L_PAREN "("
@@ -725,7 +725,7 @@ SOURCE_FILE
           R_BRACK "]"
       R_PAREN ")"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -762,7 +762,7 @@ SOURCE_FILE
           IDENT "board"
       R_PAREN ")"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -797,7 +797,7 @@ SOURCE_FILE
           IDENT "dname"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -947,7 +947,7 @@ SOURCE_FILE
           IDENT "dname"
       R_PAREN ")"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1019,7 +1019,7 @@ SOURCE_FILE
           IDENT "dname"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1075,7 +1075,7 @@ SOURCE_FILE
           IDENT "dname"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1185,7 +1185,7 @@ SOURCE_FILE
           IDENT "dname"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1241,7 +1241,7 @@ SOURCE_FILE
           IDENT "dname"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1297,7 +1297,7 @@ SOURCE_FILE
           IDENT "c"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__merge_pg17_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__merge_pg17_ok.snap
index b1573330..fa5a884c 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__merge_pg17_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__merge_pg17_ok.snap
@@ -544,7 +544,7 @@ SOURCE_FILE
     WHITESPACE " "
     VALUE_KW "value"
     WHITESPACE "\n    "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -980,7 +980,7 @@ SOURCE_FILE
           IDENT "balance"
       R_PAREN ")"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1114,7 +1114,7 @@ SOURCE_FILE
           IDENT "balance"
       R_PAREN ")"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1205,7 +1205,7 @@ SOURCE_FILE
     WHITESPACE "\n  "
     INSERT_KW "INSERT"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       L_PAREN "("
       FIELD_EXPR
@@ -1365,7 +1365,7 @@ SOURCE_FILE
     WHITESPACE "\n  "
     INSERT_KW "INSERT"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       L_PAREN "("
       FIELD_EXPR
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__misc_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__misc_ok.snap
index 02461ef2..5c5ef3d9 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__misc_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__misc_ok.snap
@@ -168,7 +168,7 @@ SOURCE_FILE
           VALUE_KW "value"
       R_PAREN ")"
     WHITESPACE "\n"
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " \n  "
       L_PAREN "("
@@ -1205,7 +1205,7 @@ SOURCE_FILE
           IDENT "col3"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1275,7 +1275,7 @@ SOURCE_FILE
           IDENT "col3"
       R_PAREN ")"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE " "
       L_PAREN "("
@@ -1310,7 +1310,7 @@ SOURCE_FILE
           IDENT "time_taptest_table_default"
   SEMICOLON ";"
   WHITESPACE "\n\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "Table"
     WHITESPACE " "
     PATH
@@ -1319,7 +1319,7 @@ SOURCE_FILE
           IDENT "\"partman_test.time_taptest_table_p20241124\""
   SEMICOLON ";"
   WHITESPACE "\n\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "Table"
     WHITESPACE " "
     PATH
@@ -3549,7 +3549,7 @@ SOURCE_FILE
           IDENT "attrs"
       R_PAREN ")"
     WHITESPACE "\n"
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__prepare_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__prepare_ok.snap
index 30e4dc76..16501ad3 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__prepare_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__prepare_ok.snap
@@ -52,7 +52,7 @@ SOURCE_FILE
           NAME_REF
             IDENT "foo"
       WHITESPACE " "
-      SELECT
+      VALUES
         VALUES_KW "VALUES"
         L_PAREN "("
         LITERAL
@@ -376,7 +376,7 @@ SOURCE_FILE
     WHITESPACE " "
     AS_KW "as"
     WHITESPACE "\n  "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__schemas_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__schemas_ok.snap
index 55ef1614..e33bcadb 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__schemas_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__schemas_ok.snap
@@ -195,7 +195,7 @@ SOURCE_FILE
         R_PAREN ")"
   SEMICOLON ";"
   WHITESPACE "\n\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "table"
     WHITESPACE " "
     PATH
@@ -209,7 +209,7 @@ SOURCE_FILE
           TABLE_KW "table"
   SEMICOLON ";"
   WHITESPACE "\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "table"
     WHITESPACE " "
     PATH
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__select_cte_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__select_cte_ok.snap
index 38bb5d24..6b439b27 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__select_cte_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__select_cte_ok.snap
@@ -78,7 +78,7 @@ SOURCE_FILE
         WHITESPACE " "
         L_PAREN "("
         WHITESPACE "\n  "
-        SELECT
+        VALUES
           VALUES_KW "values"
           WHITESPACE " "
           L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__select_funcs_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__select_funcs_ok.snap
index ca61aa7b..3e4b7a44 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__select_funcs_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__select_funcs_ok.snap
@@ -2492,7 +2492,7 @@ SOURCE_FILE
               EXISTS_KW "exists"
             ARG_LIST
               L_PAREN "("
-              SELECT
+              VALUES
                 VALUES_KW "values"
                 WHITESPACE " "
                 L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__select_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__select_ok.snap
index 8bb81177..0a9811c6 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__select_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__select_ok.snap
@@ -800,7 +800,7 @@ SOURCE_FILE
               NAME_REF
                 ANY_KW "any"
               L_PAREN "("
-              SELECT
+              VALUES
                 VALUES_KW "values"
                 WHITESPACE " "
                 L_PAREN "("
@@ -978,7 +978,7 @@ SOURCE_FILE
               NAME_REF
                 ANY_KW "any"
               L_PAREN "("
-              SELECT
+              VALUES
                 VALUES_KW "values"
                 WHITESPACE " "
                 L_PAREN "("
@@ -4938,7 +4938,7 @@ SOURCE_FILE
   WHITESPACE "\n"
   COMMENT "-- simple"
   WHITESPACE "\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "table"
     WHITESPACE " "
     PATH
@@ -4949,7 +4949,7 @@ SOURCE_FILE
   WHITESPACE "\n\n"
   COMMENT "-- only"
   WHITESPACE "\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "table"
     WHITESPACE " "
     ONLY_KW "only"
@@ -4962,7 +4962,7 @@ SOURCE_FILE
   WHITESPACE "\n\n"
   COMMENT "-- star"
   WHITESPACE "\n"
-  SELECT
+  TABLE_STMT
     TABLE_KW "table"
     WHITESPACE " "
     PATH
@@ -4983,7 +4983,7 @@ SOURCE_FILE
         TARGET
           PAREN_EXPR
             L_PAREN "("
-            SELECT
+            TABLE_STMT
               TABLE_KW "table"
               WHITESPACE " "
               PATH
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__update_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__update_ok.snap
index 85bf43be..e7703872 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__update_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__update_ok.snap
@@ -991,7 +991,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "wines"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       L_PAREN "("
       LITERAL
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__values_err.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__values_err.snap
index b42ed33b..0fa6b28f 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__values_err.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__values_err.snap
@@ -6,7 +6,7 @@ SOURCE_FILE
   WHITESPACE "\n"
   COMMENT "-- trailing comma and missing comma between value lists"
   WHITESPACE "\n"
-  SELECT
+  VALUES
     VALUES_KW "values"
     WHITESPACE " "
     L_PAREN "("
@@ -24,7 +24,7 @@ SOURCE_FILE
   WHITESPACE "\n\n"
   COMMENT "-- extra comma, aka missing tuple"
   WHITESPACE "\n"
-  SELECT
+  VALUES
     VALUES_KW "values"
     WHITESPACE " "
     L_PAREN "("
diff --git a/crates/squawk_parser/src/snapshots/squawk_parser__test__values_ok.snap b/crates/squawk_parser/src/snapshots/squawk_parser__test__values_ok.snap
index a48e589a..7b1128d7 100644
--- a/crates/squawk_parser/src/snapshots/squawk_parser__test__values_ok.snap
+++ b/crates/squawk_parser/src/snapshots/squawk_parser__test__values_ok.snap
@@ -5,7 +5,7 @@ input_file: crates/squawk_parser/test_data/ok/values.sql
 SOURCE_FILE
   COMMENT "-- pg_docs"
   WHITESPACE "\n"
-  SELECT
+  VALUES
     VALUES_KW "VALUES"
     WHITESPACE " "
     L_PAREN "("
@@ -115,7 +115,7 @@ SOURCE_FILE
         NAME_REF
           IDENT "films"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "VALUES"
       WHITESPACE "\n    "
       L_PAREN "("
@@ -197,7 +197,7 @@ SOURCE_FILE
       WHITESPACE " "
       PAREN_EXPR
         L_PAREN "("
-        SELECT
+        VALUES
           VALUES_KW "VALUES"
           L_PAREN "("
           LITERAL
@@ -313,7 +313,7 @@ SOURCE_FILE
       WHITESPACE " "
       PAREN_EXPR
         L_PAREN "("
-        SELECT
+        VALUES
           VALUES_KW "VALUES"
           L_PAREN "("
           LITERAL
@@ -434,7 +434,7 @@ SOURCE_FILE
         WHITESPACE " "
         PAREN_EXPR
           L_PAREN "("
-          SELECT
+          VALUES
             VALUES_KW "VALUES"
             L_PAREN "("
             CAST_EXPR
@@ -465,7 +465,7 @@ SOURCE_FILE
   COMMENT "-- union"
   WHITESPACE "\n"
   COMPOUND_SELECT
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -479,7 +479,7 @@ SOURCE_FILE
     WHITESPACE " "
     UNION_KW "union"
     WHITESPACE " "
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -495,7 +495,7 @@ SOURCE_FILE
   COMMENT "-- union_select_values"
   WHITESPACE "\n"
   COMPOUND_SELECT
-    SELECT
+    VALUES
       VALUES_KW "values"
       WHITESPACE " "
       L_PAREN "("
@@ -506,7 +506,7 @@ SOURCE_FILE
     UNION_KW "union"
     WHITESPACE " "
     COMPOUND_SELECT
-      SELECT
+      VALUES
         VALUES_KW "values"
         WHITESPACE " "
         L_PAREN "("
@@ -542,7 +542,7 @@ SOURCE_FILE
             UNION_KW "union"
             WHITESPACE " "
             COMPOUND_SELECT
-              SELECT
+              VALUES
                 VALUES_KW "values"
                 WHITESPACE " "
                 L_PAREN "("
diff --git a/crates/squawk_parser/src/syntax_kind.rs b/crates/squawk_parser/src/syntax_kind.rs
index 7cbec73e..fdcf4243 100644
--- a/crates/squawk_parser/src/syntax_kind.rs
+++ b/crates/squawk_parser/src/syntax_kind.rs
@@ -1348,6 +1348,8 @@ pub enum SyntaxKind {
     INSERT_STMT,
     CREATE_SCHEMA_STMT,
     SELECT,
+    TABLE_STMT,
+    VALUES,
     SELECT_INTO_STMT,
     SECURITY_LABEL_STMT,
     REVOKE_STMT,
@@ -1422,7 +1424,7 @@ pub enum SyntaxKind {
     DISABLE_TRIGGER,
     DISABLE_RLS,
     DISABLE_RULE,
-    DISABLE_CLUSTER,
+    CLUSTER_ON,
     OWNER_TO,
     DETACH_PARTITION,
     DROP_CONSTRAINT,
diff --git a/crates/squawk_syntax/src/ast/nodes.rs b/crates/squawk_syntax/src/ast/nodes.rs
index 789cd438..ddc28eb0 100644
--- a/crates/squawk_syntax/src/ast/nodes.rs
+++ b/crates/squawk_syntax/src/ast/nodes.rs
@@ -1074,13 +1074,13 @@ impl AstNode for DisableRule {
     }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct DisableCluster {
+pub struct ClusterOn {
     pub(crate) syntax: SyntaxNode,
 }
-impl AstNode for DisableCluster {
+impl AstNode for ClusterOn {
     #[inline]
     fn can_cast(kind: SyntaxKind) -> bool {
-        kind == SyntaxKind::DISABLE_CLUSTER
+        kind == SyntaxKind::CLUSTER_ON
     }
     #[inline]
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2166,7 +2166,7 @@ pub enum AlterTableAction {
     DisableTrigger(DisableTrigger),
     DisableRls(DisableRls),
     DisableRule(DisableRule),
-    DisableCluster(DisableCluster),
+    ClusterOn(ClusterOn),
     OwnerTo(OwnerTo),
     DetachPartition(DetachPartition),
     DropConstraint(DropConstraint),
@@ -2211,7 +2211,7 @@ impl AstNode for AlterTableAction {
                 | SyntaxKind::DISABLE_TRIGGER
                 | SyntaxKind::DISABLE_RLS
                 | SyntaxKind::DISABLE_RULE
-                | SyntaxKind::DISABLE_CLUSTER
+                | SyntaxKind::CLUSTER_ON
                 | SyntaxKind::OWNER_TO
                 | SyntaxKind::DETACH_PARTITION
                 | SyntaxKind::DROP_CONSTRAINT
@@ -2270,9 +2270,7 @@ impl AstNode for AlterTableAction {
             }
             SyntaxKind::DISABLE_RLS => AlterTableAction::DisableRls(DisableRls { syntax }),
             SyntaxKind::DISABLE_RULE => AlterTableAction::DisableRule(DisableRule { syntax }),
-            SyntaxKind::DISABLE_CLUSTER => {
-                AlterTableAction::DisableCluster(DisableCluster { syntax })
-            }
+            SyntaxKind::CLUSTER_ON => AlterTableAction::ClusterOn(ClusterOn { syntax }),
             SyntaxKind::OWNER_TO => AlterTableAction::OwnerTo(OwnerTo { syntax }),
             SyntaxKind::DETACH_PARTITION => {
                 AlterTableAction::DetachPartition(DetachPartition { syntax })
@@ -2336,7 +2334,7 @@ impl AstNode for AlterTableAction {
             AlterTableAction::DisableTrigger(it) => &it.syntax,
             AlterTableAction::DisableRls(it) => &it.syntax,
             AlterTableAction::DisableRule(it) => &it.syntax,
-            AlterTableAction::DisableCluster(it) => &it.syntax,
+            AlterTableAction::ClusterOn(it) => &it.syntax,
             AlterTableAction::OwnerTo(it) => &it.syntax,
             AlterTableAction::DetachPartition(it) => &it.syntax,
             AlterTableAction::DropConstraint(it) => &it.syntax,