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 145b0f7ba25..9e07f3932b0 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>