From b643f7836c3fc59445eb5a1e6b03d747a8a4229e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 6 Mar 2018 13:31:26 +0100 Subject: [PATCH] Drop version check in isGetGeneratedKeysSimulated (for PostgreSQL 10) Issue: SPR-16556 (cherry picked from commit 4a4f2c2) --- .../metadata/PostgresTableMetaDataProvider.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java index da5cc30f181..2c1b94276be 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -33,18 +33,10 @@ public class PostgresTableMetaDataProvider extends GenericTableMetaDataProvider super(databaseMetaData); } + @Override public boolean isGetGeneratedKeysSimulated() { - if (getDatabaseVersion().compareTo("8.2.0") >= 0) { - return true; - } - else { - if (logger.isWarnEnabled()) { - logger.warn("PostgreSQL does not support getGeneratedKeys or INSERT ... RETURNING in version " + - getDatabaseVersion()); - } - return false; - } + return true; } @Override