Merge branch 'master' of github.com:postgrespro/pg_pathman into picky_nodes

funbringer · funbringer · commit d074bc4c3f3c · 2016-06-20T15:35:29.000+03:00
diff --git a/expected/insert_trigger.out b/expected/insert_trigger.out
@@ -7,15 +7,15 @@ create_range_partitions
 step s1b: BEGIN;
 step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
 step s1r: ROLLBACK;
-step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
 ((id >= 101) AND (id < 201))
 step s2b: BEGIN;
 step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
 step s2c: COMMIT;
-step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
@@ -28,15 +28,15 @@ create_range_partitions
 step s1b: BEGIN;
 step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
 step s1r: ROLLBACK;
-step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
 ((id >= 101) AND (id < 201))
 step s2b: BEGIN;
 step s2_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
 step s2c: COMMIT;
-step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
@@ -50,7 +50,7 @@ create_range_partitions
 step s1b: BEGIN;
 step s1_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
 step s1r: ROLLBACK;
-step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
@@ -59,7 +59,7 @@ consrc
 step s2b: BEGIN;
 step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
 step s2c: COMMIT;
-step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
@@ -76,7 +76,7 @@ step s2b: BEGIN;
 step s2_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
 step s1r: ROLLBACK;
 step s2r: ROLLBACK;
-step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc;
+step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
 consrc         
 
 ((id >= 1) AND (id < 101))
diff --git a/specs/insert_trigger.spec b/specs/insert_trigger.spec
@@ -16,15 +16,15 @@ session "s1"
 step "s1b" { BEGIN; }
 step "s1_insert_150" { INSERT INTO range_rel SELECT generate_series(1, 150); }
 step "s1_insert_300" { INSERT INTO range_rel SELECT generate_series(151, 300); }
-step "s1_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc; }
+step "s1_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid; }
 step "s1r" { ROLLBACK; }
 step "s1c" { COMMIT; }
 
 session "s2"
 step "s2b" { BEGIN; }
 step "s2_insert_150" { INSERT INTO range_rel SELECT generate_series(1, 150); }
 step "s2_insert_300" { INSERT INTO range_rel SELECT generate_series(151, 300); }
-step "s2_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.consrc; }
+step "s2_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid  AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid; }
 step "s2r" { ROLLBACK; }
 step "s2c" { COMMIT; }
 
