Commit e7fc0604 authored by Bruce Momjian's avatar Bruce Momjian

Modify *.po files and regression expected output for new clearer error

message spacing.
parent 37bba02b
# German message translation file for PostgreSQL server # German message translation file for PostgreSQL server
# Peter Eisentraut <peter_e@gmx.net>, 2001. # Peter Eisentraut <peter_e@gmx.net>, 2001.
# #
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.3 2001/08/10 20:56:55 petere Exp $ # $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.4 2001/10/31 05:14:32 momjian Exp $
# #
# Use these quotes: %s # Use these quotes: %s
# #
...@@ -5786,7 +5786,7 @@ msgstr "" ...@@ -5786,7 +5786,7 @@ msgstr ""
#: ../parser/analyze.c:957 #: ../parser/analyze.c:957
#, c-format #, c-format
msgid "" msgid ""
"CREATE TABLE/PRIMARY KEY multiple primary keys for table '%s' are not allowed" "CREATE TABLE / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
msgstr "" msgstr ""
#: ../parser/analyze.c:1013 ../parser/analyze.c:1233 ../parser/analyze.c:1370 #: ../parser/analyze.c:1013 ../parser/analyze.c:1233 ../parser/analyze.c:1370
......
...@@ -5912,7 +5912,7 @@ msgstr "" ...@@ -5912,7 +5912,7 @@ msgstr ""
#: ../parser/analyze.c:984 #: ../parser/analyze.c:984
#, c-format #, c-format
msgid "" msgid ""
"CREATE TABLE/PRIMARY KEY multiple primary keys for table '%s' are not allowed" "CREATE TABLE / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
msgstr "" msgstr ""
#: ../parser/analyze.c:1039 ../parser/analyze.c:1259 ../parser/analyze.c:1396 #: ../parser/analyze.c:1039 ../parser/analyze.c:1259 ../parser/analyze.c:1396
...@@ -5943,7 +5943,7 @@ msgstr "" ...@@ -5943,7 +5943,7 @@ msgstr ""
#: ../parser/analyze.c:1173 #: ../parser/analyze.c:1173
#, c-format #, c-format
msgid "CREATE TABLE/%s will create implicit index '%s' for table '%s'" msgid "CREATE TABLE / %s will create implicit index '%s' for table '%s'"
msgstr "" msgstr ""
#: ../parser/analyze.c:1201 #: ../parser/analyze.c:1201
......
...@@ -271,7 +271,7 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5; ...@@ -271,7 +271,7 @@ SELECT unique1 FROM tenk1 WHERE unique1 < 5;
-- FOREIGN KEY CONSTRAINT adding TEST -- FOREIGN KEY CONSTRAINT adding TEST
CREATE TABLE tmp2 (a int primary key); CREATE TABLE tmp2 (a int primary key);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2' NOTICE: CREATE TABLE / ADD PRIMARY KEY will create implicit index 'tmp2_pkey' for table 'tmp2'
CREATE TABLE tmp3 (a int, b int); CREATE TABLE tmp3 (a int, b int);
CREATE TABLE tmp4 (a int, b int, unique(a,b)); CREATE TABLE tmp4 (a int, b int, unique(a,b));
NOTICE: CREATE TABLE / ADD UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4' NOTICE: CREATE TABLE / ADD UNIQUE will create implicit index 'tmp4_a_key' for table 'tmp4'
...@@ -317,7 +317,7 @@ DROP TABLE tmp2; ...@@ -317,7 +317,7 @@ DROP TABLE tmp2;
-- Note: these tables are TEMP to avoid name conflicts when this test -- Note: these tables are TEMP to avoid name conflicts when this test
-- is run in parallel with foreign_key.sql. -- is run in parallel with foreign_key.sql.
CREATE TEMP TABLE PKTABLE (ptest1 int PRIMARY KEY); CREATE TEMP TABLE PKTABLE (ptest1 int PRIMARY KEY);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' NOTICE: CREATE TABLE / ADD PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
CREATE TEMP TABLE FKTABLE (ftest1 text); CREATE TEMP TABLE FKTABLE (ftest1 text);
-- This next should fail, because text=int does not exist -- This next should fail, because text=int does not exist
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable; ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1) references pktable;
...@@ -345,7 +345,7 @@ NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "f ...@@ -345,7 +345,7 @@ NOTICE: DROP TABLE implicitly drops referential integrity trigger from table "f
DROP TABLE fktable; DROP TABLE fktable;
CREATE TEMP TABLE PKTABLE (ptest1 int, ptest2 text, CREATE TEMP TABLE PKTABLE (ptest1 int, ptest2 text,
PRIMARY KEY(ptest1, ptest2)); PRIMARY KEY(ptest1, ptest2));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable' NOTICE: CREATE TABLE / ADD PRIMARY KEY will create implicit index 'pktable_pkey' for table 'pktable'
-- This should fail, because we just chose really odd types -- This should fail, because we just chose really odd types
CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime); CREATE TEMP TABLE FKTABLE (ftest1 cidr, ftest2 datetime);
ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable; ALTER TABLE FKTABLE ADD FOREIGN KEY(ftest1, ftest2) references pktable;
...@@ -452,7 +452,7 @@ drop table atacc1; ...@@ -452,7 +452,7 @@ drop table atacc1;
create table atacc1 ( test int ); create table atacc1 ( test int );
-- add a unique constraint -- add a unique constraint
alter table atacc1 add constraint atacc_test1 unique (test); alter table atacc1 add constraint atacc_test1 unique (test);
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
-- insert first value -- insert first value
insert into atacc1 (test) values (2); insert into atacc1 (test) values (2);
-- should fail -- should fail
...@@ -462,7 +462,7 @@ ERROR: Cannot insert a duplicate key into unique index atacc_test1 ...@@ -462,7 +462,7 @@ ERROR: Cannot insert a duplicate key into unique index atacc_test1
insert into atacc1 (test) values (4); insert into atacc1 (test) values (4);
-- try adding a unique oid constraint -- try adding a unique oid constraint
alter table atacc1 add constraint atacc_oid1 unique(oid); alter table atacc1 add constraint atacc_oid1 unique(oid);
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1' NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_oid1' for table 'atacc1'
drop table atacc1; drop table atacc1;
-- let's do one where the unique constraint fails when added -- let's do one where the unique constraint fails when added
create table atacc1 ( test int ); create table atacc1 ( test int );
...@@ -471,7 +471,7 @@ insert into atacc1 (test) values (2); ...@@ -471,7 +471,7 @@ insert into atacc1 (test) values (2);
insert into atacc1 (test) values (2); insert into atacc1 (test) values (2);
-- add a unique constraint (fails) -- add a unique constraint (fails)
alter table atacc1 add constraint atacc_test1 unique (test); alter table atacc1 add constraint atacc_test1 unique (test);
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
ERROR: Cannot create unique index. Table contains non-unique values ERROR: Cannot create unique index. Table contains non-unique values
insert into atacc1 (test) values (3); insert into atacc1 (test) values (3);
drop table atacc1; drop table atacc1;
...@@ -486,7 +486,7 @@ drop table atacc1; ...@@ -486,7 +486,7 @@ drop table atacc1;
create table atacc1 ( test int, test2 int); create table atacc1 ( test int, test2 int);
-- add a unique constraint -- add a unique constraint
alter table atacc1 add constraint atacc_test1 unique (test, test2); alter table atacc1 add constraint atacc_test1 unique (test, test2);
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc_test1' for table 'atacc1' NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc_test1' for table 'atacc1'
-- insert initial value -- insert initial value
insert into atacc1 (test,test2) values (4,4); insert into atacc1 (test,test2) values (4,4);
-- should fail -- should fail
...@@ -499,9 +499,9 @@ insert into atacc1 (test,test2) values (5,5); ...@@ -499,9 +499,9 @@ insert into atacc1 (test,test2) values (5,5);
drop table atacc1; drop table atacc1;
-- lets do some naming tests -- lets do some naming tests
create table atacc1 (test int, test2 int, unique(test)); create table atacc1 (test int, test2 int, unique(test));
NOTICE: CREATE TABLE/UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1' NOTICE: CREATE TABLE / ADD UNIQUE will create implicit index 'atacc1_test_key' for table 'atacc1'
alter table atacc1 add unique (test2); alter table atacc1 add unique (test2);
NOTICE: ALTER TABLE/UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1' NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index 'atacc1_test2_key' for table 'atacc1'
-- should fail for @@ second one @@ -- should fail for @@ second one @@
insert into atacc1 (test2, test) values (3, 3); insert into atacc1 (test2, test) values (3, 3);
insert into atacc1 (test2, test) values (2, 3); insert into atacc1 (test2, test) values (2, 3);
......
This diff is collapsed.
...@@ -286,7 +286,7 @@ SELECT * FROM COPY_TBL; ...@@ -286,7 +286,7 @@ SELECT * FROM COPY_TBL;
-- Primary keys -- Primary keys
-- --
CREATE TABLE PRIMARY_TBL (i int PRIMARY KEY, t text); CREATE TABLE PRIMARY_TBL (i int PRIMARY KEY, t text);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl' NOTICE: CREATE TABLE / ADD PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
INSERT INTO PRIMARY_TBL VALUES (1, 'one'); INSERT INTO PRIMARY_TBL VALUES (1, 'one');
INSERT INTO PRIMARY_TBL VALUES (2, 'two'); INSERT INTO PRIMARY_TBL VALUES (2, 'two');
INSERT INTO PRIMARY_TBL VALUES (1, 'three'); INSERT INTO PRIMARY_TBL VALUES (1, 'three');
...@@ -307,7 +307,7 @@ SELECT '' AS four, * FROM PRIMARY_TBL; ...@@ -307,7 +307,7 @@ SELECT '' AS four, * FROM PRIMARY_TBL;
DROP TABLE PRIMARY_TBL; DROP TABLE PRIMARY_TBL;
CREATE TABLE PRIMARY_TBL (i int, t text, CREATE TABLE PRIMARY_TBL (i int, t text,
PRIMARY KEY(i,t)); PRIMARY KEY(i,t));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl' NOTICE: CREATE TABLE / ADD PRIMARY KEY will create implicit index 'primary_tbl_pkey' for table 'primary_tbl'
INSERT INTO PRIMARY_TBL VALUES (1, 'one'); INSERT INTO PRIMARY_TBL VALUES (1, 'one');
INSERT INTO PRIMARY_TBL VALUES (2, 'two'); INSERT INTO PRIMARY_TBL VALUES (2, 'two');
INSERT INTO PRIMARY_TBL VALUES (1, 'three'); INSERT INTO PRIMARY_TBL VALUES (1, 'three');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment