sql/parser: fix merge skew on NamedArgTypes rename
sql/parser: fix merge skew on NamedArgTypes rename

paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach,paperstreet/cockroach