database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2655 修复gs_dump导出大小写敏感自增列的问题

Browse Source 
Merge pull request !2655 from 李居东/fixbug
This commit is contained in:
opengauss-bot
2022-12-20 08:26:39 +00:00
committed by Gitee
parent dfc46c5916 9b59521509
commit 05a98eccc2
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/pg_dump/pg_dump.cpp
View File

@ -22865,8 +22865,8 @@ static void dumpTableAutoIncrement(Archive* fout, PQExpBuffer sqlbuf, TableInfo*
appendPQExpBuffer(query,
"SELECT CASE WHEN is_called AND last_value < max_value THEN last_value + 1 "
" WHEN is_called AND last_value >= max_value THEN max_value "
" ELSE last_value END AS last_value FROM %s.%s",
PQgetvalue(res, 0, 0), PQgetvalue(res, 0, 1));
" ELSE last_value END AS last_value FROM %s",
fmtQualifiedId(fout, PQgetvalue(res, 0, 0), PQgetvalue(res, 0, 1)));
PQclear(res);
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);

5
src/test/regress/input/dump_auto_increment.source
View File

@ -74,10 +74,15 @@ PARTITION BY RANGE (col_1) SUBPARTITION BY list (col_2)
INSERT INTO test_dump_autoinc_range_list VALUES(0,1,'1');
INSERT INTO test_dump_autoinc_range_list VALUES(0,6,'6');
CREATE TABLE "TEST_DUMP_autoinc_word"("Col1" int auto_increment UNIQUE, col2 int default 1) AUTO_INCREMENT = 10;
\! @abs_bindir@/gs_dump dump_autoinc_db -p @portstring@ -f @abs_bindir@/dump_autoinc_test.tar -F t >/dev/null 2>&1; echo $?
\! @abs_bindir@/gs_restore -d restore_autoinc_db -p @portstring@ @abs_bindir@/dump_autoinc_test.tar >/dev/null 2>&1; echo $?
\c restore_autoinc_db
-- TEST_DUMP_autoinc_word
\d "TEST_DUMP_autoinc_word"
SELECT pg_get_tabledef('"TEST_DUMP_autoinc_word"'::regclass);
-- local temp table was not dumped
\d+ test_dump_autoinc_ltmp
-- check restored tables

25
src/test/regress/output/dump_auto_increment.source
View File

@ -84,11 +84,36 @@ NOTICE: CREATE TABLE will create implicit sequence "test_dump_autoinc_range_lis
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "test_dump_autoinc_range_list_pkey" for table "test_dump_autoinc_range_list"
INSERT INTO test_dump_autoinc_range_list VALUES(0,1,'1');
INSERT INTO test_dump_autoinc_range_list VALUES(0,6,'6');
CREATE TABLE "TEST_DUMP_autoinc_word"("Col1" int auto_increment UNIQUE, col2 int default 1) AUTO_INCREMENT = 10;
NOTICE: CREATE TABLE will create implicit sequence "TEST_DUMP_autoinc_word_Col1_seq" for serial column "TEST_DUMP_autoinc_word.Col1"
NOTICE: CREATE TABLE / UNIQUE will create implicit index "TEST_DUMP_autoinc_word_Col1_key" for table "TEST_DUMP_autoinc_word"
\! @abs_bindir@/gs_dump dump_autoinc_db -p @portstring@ -f @abs_bindir@/dump_autoinc_test.tar -F t >/dev/null 2>&1; echo $?
0
\! @abs_bindir@/gs_restore -d restore_autoinc_db -p @portstring@ @abs_bindir@/dump_autoinc_test.tar >/dev/null 2>&1; echo $?
0
\c restore_autoinc_db
-- TEST_DUMP_autoinc_word
\d "TEST_DUMP_autoinc_word"
Table "public.TEST_DUMP_autoinc_word"
Column | Type | Modifiers
--------+---------+-------------------------
Col1 | integer | not null AUTO_INCREMENT
col2 | integer | default 1
Indexes:
"TEST_DUMP_autoinc_word_Col1_key" UNIQUE CONSTRAINT, btree ("Col1") TABLESPACE pg_default
SELECT pg_get_tabledef('"TEST_DUMP_autoinc_word"'::regclass);
pg_get_tabledef
------------------------------------------------------------------
SET search_path = public; +
CREATE TABLE "TEST_DUMP_autoinc_word" ( +
"Col1" integer AUTO_INCREMENT NOT NULL, +
col2 integer DEFAULT 1, +
CONSTRAINT "TEST_DUMP_autoinc_word_Col1_key" UNIQUE ("Col1")+
) AUTO_INCREMENT = 10 +
WITH (orientation=row, compression=no);
(1 row)
-- local temp table was not dumped
\d+ test_dump_autoinc_ltmp
-- check restored tables