Skip to content

Commit 46aae59

Browse files
peterepetere
committed
Fix sequence test in cs_CZ locale
Rename some objects so that sorted output becomes less locale-dependent.
1 parent d711532 commit 46aae59

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ DROP TABLE sequence_test_table;
3131
---
3232
--- test creation of SERIAL column
3333
---
34-
CREATE TABLE serialTest (f1 text, f2 serial);
35-
INSERT INTO serialTest VALUES ('foo');
36-
INSERT INTO serialTest VALUES ('bar');
37-
INSERT INTO serialTest VALUES ('force', 100);
38-
INSERT INTO serialTest VALUES ('wrong', NULL);
34+
CREATE TABLE serialTest1 (f1 text, f2 serial);
35+
INSERT INTO serialTest1 VALUES ('foo');
36+
INSERT INTO serialTest1 VALUES ('bar');
37+
INSERT INTO serialTest1 VALUES ('force', 100);
38+
INSERT INTO serialTest1 VALUES ('wrong', NULL);
3939
ERROR: null value in column "f2" violates not-null constraint
4040
DETAIL: Failing row contains (wrong, null).
41-
SELECT * FROM serialTest;
41+
SELECT * FROM serialTest1;
4242
f1 | f2
4343
-------+-----
4444
foo | 1
@@ -230,9 +230,9 @@ SELECT last_value, log_cnt IN (31, 32) AS log_cnt_ok, is_called FROM foo_seq_new
230230

231231
DROP SEQUENCE foo_seq_new;
232232
-- renaming serial sequences
233-
ALTER TABLE serialtest_f2_seq RENAME TO serialtest_f2_foo;
234-
INSERT INTO serialTest VALUES ('more');
235-
SELECT * FROM serialTest;
233+
ALTER TABLE serialtest1_f2_seq RENAME TO serialtest1_f2_foo;
234+
INSERT INTO serialTest1 VALUES ('more');
235+
SELECT * FROM serialTest1;
236236
f1 | f2
237237
-------+-----
238238
foo | 1
@@ -445,12 +445,12 @@ SELECT * FROM information_schema.sequences
445445
regression | public | sequence_test2 | bigint | 64 | 2 | 0 | 32 | 5 | 36 | 4 | YES
446446
regression | public | sequence_test3 | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
447447
regression | public | sequence_test4 | bigint | 64 | 2 | 0 | -1 | -9223372036854775808 | -1 | -1 | NO
448+
regression | public | serialtest1_f2_foo | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
448449
regression | public | serialtest2_f2_seq | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
449450
regression | public | serialtest2_f3_seq | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
450451
regression | public | serialtest2_f4_seq | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
451452
regression | public | serialtest2_f5_seq | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
452453
regression | public | serialtest2_f6_seq | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
453-
regression | public | serialtest_f2_foo | bigint | 64 | 2 | 0 | 1 | 1 | 9223372036854775807 | 1 | NO
454454
(9 rows)
455455

456456
SELECT schemaname, sequencename, start_value, min_value, max_value, increment_by, cycle, cache_size, last_value
@@ -462,12 +462,12 @@ WHERE sequencename ~ ANY(ARRAY['sequence_test', 'serialtest'])
462462
public | sequence_test2 | 32 | 5 | 36 | 4 | t | 1 | 5
463463
public | sequence_test3 | 1 | 1 | 9223372036854775807 | 1 | f | 1 |
464464
public | sequence_test4 | -1 | -9223372036854775808 | -1 | -1 | f | 1 | -1
465+
public | serialtest1_f2_foo | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 3
465466
public | serialtest2_f2_seq | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 2
466467
public | serialtest2_f3_seq | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 2
467468
public | serialtest2_f4_seq | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 2
468469
public | serialtest2_f5_seq | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 2
469470
public | serialtest2_f6_seq | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 2
470-
public | serialtest_f2_foo | 1 | 1 | 9223372036854775807 | 1 | f | 1 | 3
471471
(9 rows)
472472

473473
SELECT * FROM pg_sequence_parameters('sequence_test4'::regclass);
@@ -716,7 +716,7 @@ ALTER SEQUENCE sequence_test2 START WITH 1;
716716
ERROR: must be owner of relation sequence_test2
717717
ROLLBACK;
718718
-- Sequences should get wiped out as well:
719-
DROP TABLE serialTest, serialTest2;
719+
DROP TABLE serialTest1, serialTest2;
720720
-- Make sure sequences are gone:
721721
SELECT * FROM information_schema.sequences WHERE sequence_name IN
722722
('sequence_test2', 'serialtest2_f2_seq', 'serialtest2_f3_seq',

‎src/test/regress/sql/sequence.sql‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ DROP TABLE sequence_test_table;
2323
--- test creation of SERIAL column
2424
---
2525

26-
CREATE TABLE serialTest (f1 text, f2 serial);
26+
CREATE TABLE serialTest1 (f1 text, f2 serial);
2727

28-
INSERT INTO serialTest VALUES ('foo');
29-
INSERT INTO serialTest VALUES ('bar');
30-
INSERT INTO serialTest VALUES ('force', 100);
31-
INSERT INTO serialTest VALUES ('wrong', NULL);
28+
INSERT INTO serialTest1 VALUES ('foo');
29+
INSERT INTO serialTest1 VALUES ('bar');
30+
INSERT INTO serialTest1 VALUES ('force', 100);
31+
INSERT INTO serialTest1 VALUES ('wrong', NULL);
3232

33-
SELECT * FROM serialTest;
33+
SELECT * FROM serialTest1;
3434

3535
-- test smallserial / bigserial
3636
CREATE TABLE serialTest2 (f1 text, f2 serial, f3 smallserial, f4 serial2,
@@ -111,9 +111,9 @@ SELECT last_value, log_cnt IN (31, 32) AS log_cnt_ok, is_called FROM foo_seq_new
111111
DROP SEQUENCE foo_seq_new;
112112

113113
-- renaming serial sequences
114-
ALTER TABLE serialtest_f2_seq RENAME TO serialtest_f2_foo;
115-
INSERT INTO serialTest VALUES ('more');
116-
SELECT * FROM serialTest;
114+
ALTER TABLE serialtest1_f2_seq RENAME TO serialtest1_f2_foo;
115+
INSERT INTO serialTest1 VALUES ('more');
116+
SELECT * FROM serialTest1;
117117

118118
--
119119
-- Check dependencies of serial and ordinary sequences
@@ -353,7 +353,7 @@ ALTER SEQUENCE sequence_test2 START WITH 1;
353353
ROLLBACK;
354354

355355
-- Sequences should get wiped out as well:
356-
DROP TABLE serialTest, serialTest2;
356+
DROP TABLE serialTest1, serialTest2;
357357

358358
-- Make sure sequences are gone:
359359
SELECT * FROM information_schema.sequences WHERE sequence_name IN

0 commit comments

Comments
 (0)