diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
index 9208ce37c5..9e07f3932b 100644
--- a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
+++ b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
@@ -70,10 +70,10 @@
 			<value>42000,42001,42101,42102,42111,42112,42121,42122,42132</value>
 		</property>
 		<property name="duplicateKeyCodes">
-			<value>23001</value>
+			<value>23001,23505</value>
 		</property>
 		<property name="dataIntegrityViolationCodes">
-			<value>22003,22012,22025,23000</value>
+			<value>22001,22003,22012,22018,22025,23000,23002,23003,23502,23503,23506,23507,23513</value>
 		</property>
 		<property name="dataAccessResourceFailureCodes">
 			<value>90046,90100,90117,90121,90126</value>
@@ -232,10 +232,10 @@
 			<value>101,102,103,104,105,106,107,108,109,110,111,112,113,116,120,121,123,207,208,213,257,512</value>
 		</property>
 		<property name="duplicateKeyCodes">
-			<value>2601</value>
+			<value>2601,2615,2626</value>
 		</property>
 		<property name="dataIntegrityViolationCodes">
-			<value>233,423,511,515,530,547,2615,2714</value>
+			<value>233,511,515,530,547,2615,2714</value>
 		</property>
 		<property name="transientDataAccessResourceCodes">
 			<value>921,1105</value>