git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Error on invalid TOAST compression in CREATE or ALTER TABLE.

author Robert Haas <rhaas@postgresql.org>

2021年3月22日 14:57:08 +0000 (10:57 -0400)

committer Robert Haas <rhaas@postgresql.org>

2021年3月22日 14:57:08 +0000 (10:57 -0400)

The previous coding treated an invalid compression method name as
equivalent to the default, which is certainly not right.

Justin Pryzby

Discussion: http://postgr.es/m/20210321235544.GD4203@telsasoft.com

src/backend/commands/tablecmds.c patch | blob | blame | history

src/test/regress/expected/compression.out patch | blob | blame | history

src/test/regress/expected/compression_1.out patch | blob | blame | history

src/test/regress/sql/compression.sql patch | blob | blame | history

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c

index 22f3c5efc09957d57d92a4136b6f55cd74c92740..54fea31e43fd6700ea639cd7e4683984f6a7ed95 100644 (file)

--- a/src/backend/commands/tablecmds.c

+++ b/src/backend/commands/tablecmds.c

@@ -17863,9 +17863,13 @@ GetAttributeCompression(Form_pg_attribute att, char *compression)

/* fallback to default compression if it's not specified */

if (compression == NULL)

- cmethod = GetDefaultToastCompression();

- else

- cmethod = CompressionNameToMethod(compression);

+ return GetDefaultToastCompression();

+ cmethod = CompressionNameToMethod(compression);

+ if (!CompressionMethodIsValid(cmethod))

+ ereport(ERROR,

+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

+ errmsg("invalid compression method \"%s\"", compression)));

return cmethod;

}

diff --git a/src/test/regress/expected/compression.out b/src/test/regress/expected/compression.out

index 18ac5f05bbddb9f4a5db184fd038e913ba8c7170..c2f2e0e230ba706b5b4008546319d5959d5b8508 100644 (file)

--- a/src/test/regress/expected/compression.out

+++ b/src/test/regress/expected/compression.out

@@ -347,4 +347,10 @@ SELECT length(f1) FROM cmmove3;

10040

(2 rows)

+CREATE TABLE badcompresstbl (a text COMPRESSION I_Do_Not_Exist_Compression); -- fails

+ERROR: invalid compression method "i_do_not_exist_compression"

+CREATE TABLE badcompresstbl (a text);

+ALTER TABLE badcompresstbl ALTER a SET COMPRESSION I_Do_Not_Exist_Compression; -- fails

+ERROR: invalid compression method "i_do_not_exist_compression"

+DROP TABLE badcompresstbl;

\set HIDE_TOAST_COMPRESSION true

diff --git a/src/test/regress/expected/compression_1.out b/src/test/regress/expected/compression_1.out

index c4a2cea4cd8e637a5fc5b8ce4d4c86015075fd3a..6626f8e9272022c07dcdeeeb2c08670b76b053c0 100644 (file)

--- a/src/test/regress/expected/compression_1.out

+++ b/src/test/regress/expected/compression_1.out

@@ -340,4 +340,10 @@ SELECT length(f1) FROM cmmove3;

10000

(1 row)

+CREATE TABLE badcompresstbl (a text COMPRESSION I_Do_Not_Exist_Compression); -- fails

+ERROR: invalid compression method "i_do_not_exist_compression"

+CREATE TABLE badcompresstbl (a text);

+ALTER TABLE badcompresstbl ALTER a SET COMPRESSION I_Do_Not_Exist_Compression; -- fails

+ERROR: invalid compression method "i_do_not_exist_compression"

+DROP TABLE badcompresstbl;

\set HIDE_TOAST_COMPRESSION true

diff --git a/src/test/regress/sql/compression.sql b/src/test/regress/sql/compression.sql

index e23669cc94cd3ccbb91d7b4887b5d64860fc3aa9..5e178be04a2cb0fd5c1a20cd4e3bd4e091a25798 100644 (file)

--- a/src/test/regress/sql/compression.sql

+++ b/src/test/regress/sql/compression.sql

@@ -137,4 +137,9 @@ SELECT length(f1) FROM cmmove1;

SELECT length(f1) FROM cmmove2;

SELECT length(f1) FROM cmmove3;

+CREATE TABLE badcompresstbl (a text COMPRESSION I_Do_Not_Exist_Compression); -- fails

+CREATE TABLE badcompresstbl (a text);

+ALTER TABLE badcompresstbl ALTER a SET COMPRESSION I_Do_Not_Exist_Compression; -- fails

+DROP TABLE badcompresstbl;

\set HIDE_TOAST_COMPRESSION true

This is the main PostgreSQL git repository.

RSS Atom