From a0745c0c0a6d3f33c3dec9ff909fb6cd5f615209 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 24 Oct 2012 10:39:11 -0700
Subject: [PATCH] Support SQL exception translation for ORA-06550

Oracle error ORA-06550 will now raise a BadSqlGrammarException.

Issue: SPR-9853
Backport-Commit: ba5a148d8dd096a8e3c7f93d61f9f726cb48d138
---
 .../org/springframework/jdbc/support/sql-error-codes.xml       | 2 +-
 .../jdbc/support/SQLErrorCodesFactoryTests.java                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 a6a0f5c8363..dd3b4b0b55e 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
@@ -166,7 +166,7 @@
 
 	<bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
 		<property name="badSqlGrammarCodes">
-			<value>900,903,904,917,936,942,17006</value>
+			<value>900,903,904,917,936,942,17006,6550</value>
 		</property>
 		<property name="invalidResultSetAccessCodes">
 			<value>17003</value>
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
index bcdbdf65051..f2d5debc4fe 100644
--- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
+++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
@@ -57,8 +57,9 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	private void assertIsOracle(SQLErrorCodes sec) {
 		assertTrue(sec.getBadSqlGrammarCodes().length > 0);
 		assertTrue(sec.getDataIntegrityViolationCodes().length > 0);
-		// This had better be a Bad SQL Grammar code
+		// These had better be a Bad SQL Grammar code
 		assertTrue(Arrays.binarySearch(sec.getBadSqlGrammarCodes(), "942") >= 0);
+		assertTrue(Arrays.binarySearch(sec.getBadSqlGrammarCodes(), "6550") >= 0);
 		// This had better NOT be
 		assertFalse(Arrays.binarySearch(sec.getBadSqlGrammarCodes(), "9xx42") >= 0);
 	}