sql: fix merge skew from NamedArgTypes rename
sql: fix merge skew from NamedArgTypes rename

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