Merge branch '1.3.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java

@@ -58,7 +58,7 @@ class JooqExceptionTranslator extends DefaultExecuteListener {
 	private SQLExceptionTranslator getTranslator(ExecuteContext context) {
 		SQLDialect dialect = context.configuration().dialect();
 		if (dialect != null) {
-			return new SQLErrorCodeSQLExceptionTranslator(dialect.name());
+			return new SQLErrorCodeSQLExceptionTranslator(dialect.thirdParty().springDbName());
 		}
 		return new SQLStateSQLExceptionTranslator();
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.jooq;
+
+import java.sql.SQLException;
+
+import org.jooq.Configuration;
+import org.jooq.ExecuteContext;
+import org.jooq.SQLDialect;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.mockito.ArgumentCaptor;
+
+import org.springframework.jdbc.BadSqlGrammarException;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Tests for {@link JooqExceptionTranslator}
+ *
+ * @author Andy Wilkinson
+ */
+
+@RunWith(Parameterized.class)
+public class JooqExceptionTranslatorTests {
+
+	private final JooqExceptionTranslator exceptionTranslator = new JooqExceptionTranslator();
+
+	private final SQLDialect dialect;
+
+	private final SQLException sqlException;
+
+	@Parameters(name = "{0}")
+	public static Object[] parameters() {
+		return new Object[] { new Object[] { SQLDialect.DERBY, sqlException("42802") },
+				new Object[] { SQLDialect.H2, sqlException(42000) },
+				new Object[] { SQLDialect.HSQLDB, sqlException(-22) },
+				new Object[] { SQLDialect.MARIADB, sqlException(1054) },
+				new Object[] { SQLDialect.MYSQL, sqlException(1054) },
+				new Object[] { SQLDialect.POSTGRES, sqlException("03000") },
+				new Object[] { SQLDialect.POSTGRES_9_3, sqlException("03000") },
+				new Object[] { SQLDialect.POSTGRES_9_4, sqlException("03000") },
+				new Object[] { SQLDialect.POSTGRES_9_5, sqlException("03000") } };
+	}
+
+	private static SQLException sqlException(String sqlState) {
+		return new SQLException(null, sqlState);
+	}
+
+	private static SQLException sqlException(int vendorCode) {
+		return new SQLException(null, null, vendorCode);
+
+	}
+
+	public JooqExceptionTranslatorTests(SQLDialect dialect, SQLException sqlException) {
+		this.dialect = dialect;
+		this.sqlException = sqlException;
+	}
+
+	@Test
+	public void exceptionTranslation() {
+		ExecuteContext context = mock(ExecuteContext.class);
+		Configuration configuration = mock(Configuration.class);
+		given(context.configuration()).willReturn(configuration);
+		given(configuration.dialect()).willReturn(this.dialect);
+		given(context.sqlException()).willReturn(this.sqlException);
+		this.exceptionTranslator.exception(context);
+		ArgumentCaptor<RuntimeException> captor = ArgumentCaptor
+				.forClass(RuntimeException.class);
+		verify(context).exception(captor.capture());
+		assertThat(captor.getValue(), is(instanceOf(BadSqlGrammarException.class)));
+	}
+
+}