1 files changed, 50 insertions, 13 deletions

diff --git a/src/bin/pg_upgrade/t/006_transfer_modes.pl b/src/bin/pg_upgrade/t/006_transfer_modes.pl
index 550a63fdf7d..348f4021462 100644
--- a/src/bin/pg_upgrade/t/006_transfer_modes.pl
+++ b/src/bin/pg_upgrade/t/006_transfer_modes.pl
@@ -13,7 +13,8 @@ sub test_mode
 {
 	my ($mode) = @_;
 
-	my $old = PostgreSQL::Test::Cluster->new('old', install_path => $ENV{oldinstall});
+	my $old =
+	  PostgreSQL::Test::Cluster->new('old', install_path => $ENV{oldinstall});
 	my $new = PostgreSQL::Test::Cluster->new('new');
 
 	# --swap can't be used to upgrade from versions older than 10, so just skip
@@ -37,24 +38,50 @@ sub test_mode
 	}
 	$new->init();
 
+	# allow_in_place_tablespaces is available as far back as v10.
+	if ($old->pg_version >= 10)
+	{
+		$new->append_conf('postgresql.conf', "allow_in_place_tablespaces = true");
+		$old->append_conf('postgresql.conf', "allow_in_place_tablespaces = true");
+	}
+
 	# Create a small variety of simple test objects on the old cluster.  We'll
 	# check that these reach the new version after upgrading.
 	$old->start;
-	$old->safe_psql('postgres', "CREATE TABLE test1 AS SELECT generate_series(1, 100)");
+	$old->safe_psql('postgres',
+		"CREATE TABLE test1 AS SELECT generate_series(1, 100)");
 	$old->safe_psql('postgres', "CREATE DATABASE testdb1");
-	$old->safe_psql('testdb1', "CREATE TABLE test2 AS SELECT generate_series(200, 300)");
+	$old->safe_psql('testdb1',
+		"CREATE TABLE test2 AS SELECT generate_series(200, 300)");
 	$old->safe_psql('testdb1', "VACUUM FULL test2");
 	$old->safe_psql('testdb1', "CREATE SEQUENCE testseq START 5432");
 
-	# For cross-version tests, we can also check that pg_upgrade handles
-	# tablespaces.
+	# If an old installation is provided, we can test non-in-place tablespaces.
 	if (defined($ENV{oldinstall}))
 	{
 		my $tblspc = PostgreSQL::Test::Utils::tempdir_short();
-		$old->safe_psql('postgres', "CREATE TABLESPACE test_tblspc LOCATION '$tblspc'");
-		$old->safe_psql('postgres', "CREATE DATABASE testdb2 TABLESPACE test_tblspc");
-		$old->safe_psql('postgres', "CREATE TABLE test3 TABLESPACE test_tblspc AS SELECT generate_series(300, 401)");
-		$old->safe_psql('testdb2', "CREATE TABLE test4 AS SELECT generate_series(400, 502)");
+		$old->safe_psql('postgres',
+			"CREATE TABLESPACE test_tblspc LOCATION '$tblspc'");
+		$old->safe_psql('postgres',
+			"CREATE DATABASE testdb2 TABLESPACE test_tblspc");
+		$old->safe_psql('postgres',
+			"CREATE TABLE test3 TABLESPACE test_tblspc AS SELECT generate_series(300, 401)"
+		);
+		$old->safe_psql('testdb2',
+			"CREATE TABLE test4 AS SELECT generate_series(400, 502)");
+	}
+
+	# If the old cluster is >= v10, we can test in-place tablespaces.
+	if ($old->pg_version >= 10)
+	{
+		$old->safe_psql('postgres',
+			"CREATE TABLESPACE inplc_tblspc LOCATION ''");
+		$old->safe_psql('postgres',
+			"CREATE DATABASE testdb3 TABLESPACE inplc_tblspc");
+		$old->safe_psql('postgres',
+			"CREATE TABLE test5 TABLESPACE inplc_tblspc AS SELECT generate_series(503, 606)");
+		$old->safe_psql('testdb3',
+			"CREATE TABLE test6 AS SELECT generate_series(607, 711)");
 	}
 	$old->stop;
 
@@ -86,15 +113,25 @@ sub test_mode
 		$result = $new->safe_psql('testdb1', "SELECT nextval('testseq')");
 		is($result, '5432', "sequence data after pg_upgrade $mode");
 
-		# For cross-version tests, we should have some objects in a non-default
-		# tablespace.
+		# Tests for non-in-place tablespaces.
 		if (defined($ENV{oldinstall}))
 		{
-			$result = $new->safe_psql('postgres', "SELECT COUNT(*) FROM test3");
+			$result =
+			  $new->safe_psql('postgres', "SELECT COUNT(*) FROM test3");
 			is($result, '102', "test3 data after pg_upgrade $mode");
-			$result = $new->safe_psql('testdb2', "SELECT COUNT(*) FROM test4");
+			$result =
+			  $new->safe_psql('testdb2', "SELECT COUNT(*) FROM test4");
 			is($result, '103', "test4 data after pg_upgrade $mode");
 		}
+
+		# Tests for in-place tablespaces.
+		if ($old->pg_version >= 10)
+		{
+			$result = $new->safe_psql('postgres', "SELECT COUNT(*) FROM test5");
+			is($result, '104', "test5 data after pg_upgrade $mode");
+			$result = $new->safe_psql('testdb3', "SELECT COUNT(*) FROM test6");
+			is($result, '105', "test6 data after pg_upgrade $mode");
+		}
 		$new->stop;
 	}