Merge "Extract format_constraint truncation rules to ON CONFLICT"

author mike bayer <mike_mp@zzzcomputing.com>

Tue, 13 Jul 2021 15:09:05 +0000 (15:09 +0000)

committer Gerrit Code Review <gerrit@ci3.zzzcomputing.com>

Tue, 13 Jul 2021 15:09:05 +0000 (15:09 +0000)
author mike bayer <mike_mp@zzzcomputing.com>
Tue, 13 Jul 2021 15:09:05 +0000 (15:09 +0000)
committer Gerrit Code Review <gerrit@ci3.zzzcomputing.com>
Tue, 13 Jul 2021 15:09:05 +0000 (15:09 +0000)
diff --cc lib/sqlalchemy/dialects/postgresql/base.py
Simple merge
diff --cc lib/sqlalchemy/sql/compiler.py
Simple merge
diff --cc test/dialect/postgresql/test_compiler.py
Simple merge
author	mike bayer <mike_mp@zzzcomputing.com>
	Tue, 13 Jul 2021 15:09:05 +0000 (15:09 +0000)
committer	Gerrit Code Review <gerrit@ci3.zzzcomputing.com>
	Tue, 13 Jul 2021 15:09:05 +0000 (15:09 +0000)
		1	2
lib/sqlalchemy/dialects/postgresql/base.py	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sqlalchemy/sql/compiler.py	patch \|	diff1 \|	diff2 \|	blob \| history
test/dialect/postgresql/test_compiler.py	patch \|	diff1 \|	diff2 \|	blob \| history