Fixup! support clustered-by key without primary key constraint