chore: various backports to 7.2#368

rafiss merged 15 commits into7-2-stablecockroachdb/activerecord-cockroachdb-adapter:7-2-stablefrom

backport-364-to-7-2cockroachdb/activerecord-cockroachdb-adapter:backport-364-to-7-2Copy head branch name to clipboard