Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit26c291a

Browse files
committed
pg_upgrade: check for types removed in pg12
Commitcda6a8d removed a few datatypes, but didn't updatepg_upgrade --check to throw error if these types are used. So the usersfind that pg_upgrade --check tells them that everything is fine, only tofail when the real upgrade is attempted.Reviewed-by: Tristan Partin <tristan@neon.tech>Reviewed-by: Suraj Kharage <suraj.kharage@enterprisedb.com>Discussion:https://postgr.es/m/202309201654.ng4ksea25mti@alvherre.pgsql
1 parentafa504b commit26c291a

File tree

1 file changed

+47
-0
lines changed

1 file changed

+47
-0
lines changed

‎src/bin/pg_upgrade/check.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ static void check_for_incompatible_polymorphics(ClusterInfo *cluster);
2727
staticvoidcheck_for_tables_with_oids(ClusterInfo*cluster);
2828
staticvoidcheck_for_composite_data_type_usage(ClusterInfo*cluster);
2929
staticvoidcheck_for_reg_data_type_usage(ClusterInfo*cluster);
30+
staticvoidcheck_for_removed_data_type_usage(ClusterInfo*cluster,
31+
constchar*version,
32+
constchar*datatype);
3033
staticvoidcheck_for_jsonb_9_4_usage(ClusterInfo*cluster);
3134
staticvoidcheck_for_pg_role_prefix(ClusterInfo*cluster);
3235
staticvoidcheck_for_new_tablespace_dir(ClusterInfo*new_cluster);
@@ -106,6 +109,16 @@ check_and_dump_old_cluster(bool live_check)
106109
check_for_reg_data_type_usage(&old_cluster);
107110
check_for_isn_and_int8_passing_mismatch(&old_cluster);
108111

112+
/*
113+
* PG 12 removed types abstime, reltime, tinterval.
114+
*/
115+
if (GET_MAJOR_VERSION(old_cluster.major_version) <=1100)
116+
{
117+
check_for_removed_data_type_usage(&old_cluster,"12","abstime");
118+
check_for_removed_data_type_usage(&old_cluster,"12","reltime");
119+
check_for_removed_data_type_usage(&old_cluster,"12","tinterval");
120+
}
121+
109122
/*
110123
* PG 14 changed the function signature of encoding conversion functions.
111124
* Conversions from older versions cannot be upgraded automatically
@@ -1300,6 +1313,40 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
13001313
check_ok();
13011314
}
13021315

1316+
/*
1317+
* check_for_removed_data_type_usage
1318+
*
1319+
*Check for in-core data types that have been removed. Callers know
1320+
*the exact list.
1321+
*/
1322+
staticvoid
1323+
check_for_removed_data_type_usage(ClusterInfo*cluster,constchar*version,
1324+
constchar*datatype)
1325+
{
1326+
charoutput_path[MAXPGPATH];
1327+
chartypename[NAMEDATALEN];
1328+
1329+
prep_status("Checking for removed \"%s\" data type in user tables",
1330+
datatype);
1331+
1332+
snprintf(output_path,sizeof(output_path),"tables_using_%s.txt",
1333+
datatype);
1334+
snprintf(typename,sizeof(typename),"pg_catalog.%s",datatype);
1335+
1336+
if (check_for_data_type_usage(cluster,typename,output_path))
1337+
{
1338+
pg_log(PG_REPORT,"fatal");
1339+
pg_fatal("Your installation contains the \"%s\" data type in user tables.\n"
1340+
"The \"%s\" type has been removed in PostgreSQL version %s,\n"
1341+
"so this cluster cannot currently be upgraded. You can drop the\n"
1342+
"problem columns, or change them to another data type, and restart\n"
1343+
"the upgrade. A list of the problem columns is in the file:\n"
1344+
" %s\n\n",datatype,datatype,version,output_path);
1345+
}
1346+
else
1347+
check_ok();
1348+
}
1349+
13031350

13041351
/*
13051352
* check_for_jsonb_9_4_usage()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp