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

Commite7fc060

Browse files
committed
Modify *.po files and regression expected output for new clearer error
message spacing.
1 parent37bba02 commite7fc060

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎src/backend/po/de.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# German message translation file for PostgreSQL server
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.3 2001/08/10 20:56:55 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.4 2001/10/31 05:14:32 momjian Exp $
55
#
66
# Use these quotes: »%s«
77
#
@@ -5786,7 +5786,7 @@ msgstr ""
57865786
#:../parser/analyze.c:957
57875787
#,c-format
57885788
msgid""
5789-
"CREATE TABLE/PRIMARY KEY multiple primary keys for table '%s' are not allowed"
5789+
"CREATE TABLE /PRIMARY KEY multiple primary keys for table '%s' are not allowed"
57905790
msgstr""
57915791

57925792
#:../parser/analyze.c:1013../parser/analyze.c:1233../parser/analyze.c:1370

‎src/backend/po/ru.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5912,7 +5912,7 @@ msgstr ""
59125912
#:../parser/analyze.c:984
59135913
#,c-format
59145914
msgid""
5915-
"CREATE TABLE/PRIMARY KEY multiple primary keys for table '%s' are not allowed"
5915+
"CREATE TABLE /PRIMARY KEY multiple primary keys for table '%s' are not allowed"
59165916
msgstr""
59175917

59185918
#:../parser/analyze.c:1039../parser/analyze.c:1259../parser/analyze.c:1396
@@ -5943,7 +5943,7 @@ msgstr ""
59435943

59445944
#:../parser/analyze.c:1173
59455945
#,c-format
5946-
msgid"CREATE TABLE/%s will create implicit index '%s' for table '%s'"
5946+
msgid"CREATE TABLE /%s will create implicit index '%s' for table '%s'"
59475947
msgstr""
59485948

59495949
#:../parser/analyze.c:1201

‎src/test/regress/expected/alter_table.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5;
271271

272272
-- FOREIGN KEY CONSTRAINT adding TEST
273273
CREATE TABLE tmp2 (a int primary key);
274-
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2'
274+
NOTICE: CREATE TABLE /ADDPRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2'
275275
CREATE TABLE tmp3 (a int, b int);
276276
CREATE TABLE tmp4 (a int, b int, unique(a,b));
277277
NOTICE: CREATE TABLE / ADD UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4'
@@ -317,7 +317,7 @@ DROP TABLE tmp2;
317317
-- Note: these tables are TEMP to avoid name conflicts when this test
318318
-- is run in parallel with foreign_key.sql.
319319
CREATE TEMP TABLE PKTABLE (ptest1 int PRIMARY KEY);
320-
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
320+
NOTICE: CREATE TABLE /ADDPRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
321321
CREATE TEMP TABLE FKTABLE (ftest1 text);
322322
-- This next should fail, because text=int does not exist
323323
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable;
@@ -345,7 +345,7 @@ NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "f
345345
DROP TABLE fktable;
346346
CREATE TEMP TABLE PKTABLE (ptest1 int, ptest2 text,
347347
PRIMARY KEY(ptest1, ptest2));
348-
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
348+
NOTICE: CREATE TABLE /ADDPRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
349349
-- This should fail, because we just chose really odd types
350350
CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime);
351351
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable;
@@ -452,7 +452,7 @@ drop table atacc1;
452452
create table atacc1 ( test int );
453453
-- add a unique constraint
454454
alter table atacc1 add constraint atacc_test1 unique (test);
455-
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
455+
NOTICE: ALTER TABLE / ADDUNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
456456
-- insert first value
457457
insert into atacc1 (test) values (2);
458458
-- should fail
@@ -462,7 +462,7 @@ ERROR: Cannot insert a duplicate key into unique index atacc_test1
462462
insert into atacc1 (test) values (4);
463463
-- try adding a unique oid constraint
464464
alter table atacc1 add constraint atacc_oid1 unique(oid);
465-
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1'
465+
NOTICE: ALTER TABLE / ADDUNIQUE will create implicit index 'atacc_oid1' for table 'atacc1'
466466
drop table atacc1;
467467
-- let's do one where the unique constraint fails when added
468468
create table atacc1 ( test int );
@@ -471,7 +471,7 @@ insert into atacc1 (test) values (2);
471471
insert into atacc1 (test) values (2);
472472
-- add a unique constraint (fails)
473473
alter table atacc1 add constraint atacc_test1 unique (test);
474-
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
474+
NOTICE: ALTER TABLE / ADDUNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
475475
ERROR: Cannot create unique index. Table contains non-unique values
476476
insert into atacc1 (test) values (3);
477477
drop table atacc1;
@@ -486,7 +486,7 @@ drop table atacc1;
486486
create table atacc1 ( test int, test2 int);
487487
-- add a unique constraint
488488
alter table atacc1 add constraint atacc_test1 unique (test, test2);
489-
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
489+
NOTICE: ALTER TABLE / ADDUNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
490490
-- insert initial value
491491
insert into atacc1 (test,test2) values (4,4);
492492
-- should fail
@@ -499,9 +499,9 @@ insert into atacc1 (test,test2) values (5,5);
499499
drop table atacc1;
500500
-- lets do some naming tests
501501
create table atacc1 (test int, test2 int, unique(test));
502-
NOTICE: CREATE TABLE/UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1'
502+
NOTICE: CREATE TABLE / ADDUNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1'
503503
alter table atacc1 add unique (test2);
504-
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1'
504+
NOTICE: ALTER TABLE / ADDUNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1'
505505
-- should fail for @@ second one @@
506506
insert into atacc1 (test2, test) values (3, 3);
507507
insert into atacc1 (test2, test) values (2, 3);

0 commit comments

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