@@ -151,7 +151,7 @@ type_definition_types
151151 */
152152datatype_custom "Custom Datatype Name"
153153 = t :( name ) r :( datatype_word_tail )* {
154- const variant = foldString ([ t, r ]);
154+ const variant = foldStringKey ([ t, r ]);
155155 let affinity = ' numeric' ;
156156 if (/ int/ i .test (variant)) {
157157 affinity = ' integer' ;
@@ -415,7 +415,7 @@ expression_exists "EXISTS Expression"
415415 }
416416expression_exists_ne "EXISTS Keyword"
417417 = n :( expression_is_not )? x :( EXISTS ) o
418- { return foldString ([ n, x ]); }
418+ { return foldStringKey ([ n, x ]); }
419419
420420expression_raise "RAISE Expression"
421421 = s :( RAISE ) o sym_popen o a :( expression_raise_args ) o sym_pclose
@@ -672,7 +672,7 @@ expression_between_tail
672672 { return composeBinary (f, [ rest ]); }
673673expression_is_not
674674 = n :( NOT ) o
675- { return textNode (n); }
675+ { return keyNode (n); }
676676
677677expression_in "IN Expression"
678678 = n :( expression_is_not )? i :( IN ) o e :( expression_in_target )
@@ -776,7 +776,7 @@ stmt_modifier "QUERY PLAN"
776776
777777modifier_query "QUERY PLAN Keyword"
778778 = q :( QUERY ) o p :( PLAN ) o
779- { return foldString ([ q, p ]); }
779+ { return foldStringKey ([ q, p ]); }
780780
781781stmt_nodes
782782 = stmt_crud
@@ -886,7 +886,7 @@ stmt_alter "ALTER TABLE Statement"
886886
887887alter_start "ALTER TABLE Keyword"
888888 = a :( ALTER ) o t :( TABLE ) o
889- { return foldString ([ a, t ]); }
889+ { return foldStringKey ([ a, t ]); }
890890
891891alter_action
892892 = alter_action_rename
@@ -1437,11 +1437,11 @@ alias "Alias"
14371437
14381438join_operator "JOIN Operator"
14391439 = n :( join_operator_natural )? o t :( join_operator_types )? j :( JOIN )
1440- { return foldString ([ n, t, j ]); }
1440+ { return foldStringKey ([ n, t, j ]); }
14411441
14421442join_operator_natural
14431443 = n :( NATURAL ) o
1444- { return textNode (n); }
1444+ { return keyNode (n); }
14451445
14461446join_operator_types
14471447 = operator_types_hand
@@ -1455,15 +1455,15 @@ join_operator_types
14551455 */
14561456operator_types_hand
14571457 = t :( LEFT / RIGHT / FULL ) o o :( types_hand_outer )?
1458- { return foldString ([ t, o ]); }
1458+ { return foldStringKey ([ t, o ]); }
14591459
14601460types_hand_outer
14611461 = t :( OUTER ) o
1462- { return textNode (t); }
1462+ { return keyNode (t); }
14631463
14641464operator_types_misc
14651465 = t :( INNER / CROSS ) o
1466- { return textNode (t); }
1466+ { return keyNode (t); }
14671467
14681468join_condition "JOIN Constraint"
14691469 = c :( join_condition_on / join_condition_using ) o
@@ -1665,7 +1665,7 @@ operator_compound "Compound Operator"
16651665
16661666compound_union "UNION Operator"
16671667 = s :( UNION ) o a :( compound_union_all )?
1668- { return foldString ([ s, a ]); }
1668+ { return foldStringKey ([ s, a ]); }
16691669
16701670compound_union_all
16711671 = a :( ALL ) o
@@ -1819,7 +1819,7 @@ create_core_ine "IF NOT EXISTS Modifier"
18191819 ' condition' : {
18201820 ' type' : ' expression' ,
18211821 ' variant' : keyNode (e),
1822- ' operator' : foldString ([ n, e ])
1822+ ' operator' : foldStringKey ([ n, e ])
18231823 }
18241824 })
18251825 };
@@ -1988,7 +1988,7 @@ constraint_null_types "UNIQUE Column Constraint"
19881988
19891989constraint_null_value "NULL Column Constraint"
19901990 = n :( expression_is_not )? l :( NULL )
1991- { return foldString ([ n, l ]); }
1991+ { return foldStringKey ([ n, l ]); }
19921992
19931993column_constraint_check "CHECK Column Constraint"
19941994 = constraint_check
@@ -2066,11 +2066,11 @@ primary_start
20662066
20672067primary_start_normal "PRIMARY KEY Keyword"
20682068 = p :( PRIMARY ) o k :( KEY )
2069- { return foldString ([ p, k ]); }
2069+ { return foldStringKey ([ p, k ]); }
20702070
20712071primary_start_unique "UNIQUE Keyword"
20722072 = u :( UNIQUE )
2073- { return textNode (u); }
2073+ { return keyNode (u); }
20742074
20752075primary_columns
20762076 = sym_popen f :( primary_column ) o b :( primary_column_tail )* sym_pclose {
@@ -2223,15 +2223,15 @@ action_on_action "FOREIGN KEY Action"
22232223
22242224on_action_set
22252225 = s :( SET ) o v :( NULL / DEFAULT ) o
2226- { return foldString ([ s, v ]); }
2226+ { return foldStringKey ([ s, v ]); }
22272227
22282228on_action_cascade
22292229 = c :( CASCADE / RESTRICT ) o
2230- { return textNode (c); }
2230+ { return keyNode (c); }
22312231
22322232on_action_none
22332233 = n :( NO ) o a :( ACTION ) o
2234- { return foldString ([ n, a ]); }
2234+ { return foldStringKey ([ n, a ]); }
22352235
22362236/**
22372237 * @note Not sure what kind of name this should be.
@@ -2255,7 +2255,7 @@ foreign_deferrable "DEFERRABLE Clause"
22552255
22562256deferrable_initially
22572257 = i :( INITIALLY ) o d :( DEFERRED / IMMEDIATE ) o
2258- { return foldString ([ i, d ]); }
2258+ { return foldStringKey ([ i, d ]); }
22592259
22602260table_source_select
22612261 = s :( create_as_select )
@@ -2358,7 +2358,7 @@ trigger_apply_mods
23582358
23592359trigger_apply_instead
23602360 = i :( INSTEAD ) o o :( OF )
2361- { return foldString ([ i, o ]); }
2361+ { return foldStringKey ([ i, o ]); }
23622362
23632363trigger_do "Conditional Action"
23642364 = trigger_do_on
0 commit comments