HHH-5538 - Postgres: fix dialect to work in databases with mutiple schema and search_path set

Add a test case to prove that the issue does not replicate

hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/PostgreSQLMultipleSchemaSequenceTest.java

@@ -0,0 +1,171 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.schemaupdate.foreignkeys;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.EnumSet;
+import java.util.List;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.PostgreSQL81Dialect;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+
+import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.test.util.DdlTransactionIsolatorTestingImpl;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * @author Vlad Mihalcea
+ */
+@RequiresDialect(PostgreSQL81Dialect.class)
+public class PostgreSQLMultipleSchemaSequenceTest extends BaseUnitTestCase {
+
+	private File output;
+
+	@Before
+	public void setUp() throws IOException {
+		output = File.createTempFile( "update_script", ".sql" );
+		output.deleteOnExit();
+	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-5538" )
+	public void test() {
+		StandardServiceRegistry ssr1 = new StandardServiceRegistryBuilder()
+			.build();
+
+		final String extraSchemaName = "extra_schema_sequence_validation";
+
+		try {
+			final MetadataImplementor metadata1 = (MetadataImplementor) new MetadataSources( ssr1 )
+					.addAnnotatedClass( Box.class )
+					.buildMetadata();
+			try {
+				new SchemaExport()
+						.setOutputFile( output.getAbsolutePath() )
+						.create( EnumSet.of( TargetType.DATABASE, TargetType.SCRIPT ), metadata1 );
+
+				final ConnectionProvider connectionProvider1 = ssr1.getService( ConnectionProvider.class );
+				DdlTransactionIsolatorTestingImpl ddlTransactionIsolator1 = new DdlTransactionIsolatorTestingImpl(
+						ssr1,
+						new JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess( connectionProvider1 )
+				);
+				try(Statement statement = ddlTransactionIsolator1.getIsolatedConnection().createStatement()) {
+					statement.execute( String.format( "DROP SCHEMA IF EXISTS %s CASCADE", extraSchemaName ) );
+					statement.execute( String.format( "CREATE SCHEMA %s", extraSchemaName ) );
+
+					try(ResultSet resultSet = statement.executeQuery( "SELECT NEXTVAL('SEQ_TEST')" )) {
+						while ( resultSet.next() ) {
+							Long sequenceValue = resultSet.getLong( 1 );
+							assertEquals( Long.valueOf( 1L ), sequenceValue );
+						}
+					}
+				}
+				catch (SQLException e) {
+					fail(e.getMessage());
+				}
+
+				StandardServiceRegistry ssr2 = new StandardServiceRegistryBuilder()
+						.applySetting( AvailableSettings.URL, Environment.getProperties().get(AvailableSettings.URL) + "?currentSchema=" + extraSchemaName )
+						.build();
+
+				try {
+					final MetadataImplementor metadata2 = (MetadataImplementor) new MetadataSources( ssr2 )
+							.addAnnotatedClass( Box.class )
+							.buildMetadata();
+
+					try {
+						new SchemaExport()
+								.setOutputFile( output.getAbsolutePath() )
+								.create( EnumSet.of( TargetType.DATABASE, TargetType.SCRIPT ), metadata2 );
+					}
+					finally {
+						final ConnectionProvider connectionProvider2 = ssr2.getService( ConnectionProvider.class );
+						DdlTransactionIsolatorTestingImpl ddlTransactionIsolator2 = new DdlTransactionIsolatorTestingImpl(
+								ssr2,
+								new JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess( connectionProvider2 )
+						);
+						try(Statement statement = ddlTransactionIsolator2.getIsolatedConnection().createStatement()) {
+							try(ResultSet resultSet = statement.executeQuery( "SELECT NEXTVAL('SEQ_TEST')" )) {
+								while ( resultSet.next() ) {
+									Long sequenceValue = resultSet.getLong( 1 );
+									assertEquals( Long.valueOf( 1L ), sequenceValue );
+								}
+							}
+
+							statement.execute( String.format( "DROP SCHEMA IF EXISTS %s CASCADE", extraSchemaName ) );
+						}
+						catch (SQLException e) {
+							fail(e.getMessage());
+						}
+
+						new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), metadata2 );
+					}
+				}
+				finally {
+					StandardServiceRegistryBuilder.destroy( ssr2 );
+				}
+
+			}
+			finally {
+				// clean up
+				new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), metadata1 );
+			}
+
+			final List<String> sqlLines = Files.readAllLines( output.toPath(), Charset.defaultCharset() );
+			assertEquals( 2 ,
+						  sqlLines
+						  .stream()
+						  .filter( s -> s.equalsIgnoreCase( "create sequence SEQ_TEST start 1 increment 1" ) )
+						  .count()
+			);
+		}
+		catch (IOException e) {
+			fail(e.getMessage());
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy( ssr1 );
+		}
+	}
+
+	@Entity(name = "Box")
+	@Table(name = "Box")
+	public static class Box {
+
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TEST")
+		@SequenceGenerator(name = "TEST", sequenceName = "SEQ_TEST", allocationSize=1)
+		public Integer id;
+
+	}
+}