pathman: validate relation before attach

zilder · zilder · commit 657ac2ba6638 · 2016-03-16T18:36:36.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -588,6 +588,18 @@ EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel WHERE dt BETWEEN '2014-11-15' A
          Index Cond: (dt <= 'Thu Jan 15 00:00:00 2015'::timestamp without time zone)
 (4 rows)
 
+CREATE TABLE test.range_rel_test1 (
+    id  SERIAL PRIMARY KEY,
+    dt  TIMESTAMP,
+    txt TEXT,
+    abc INTEGER);
+SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_test1', '2013-01-01'::DATE, '2014-01-01'::DATE);
+ERROR:  Partition must have the exact same structure as parent P0001
+CREATE TABLE test.range_rel_test2 (
+    id  SERIAL PRIMARY KEY,
+    dt  TIMESTAMP);
+SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_test2', '2013-01-01'::DATE, '2014-01-01'::DATE);
+ERROR:  Partition must have the exact same structure as parent P0001
 /*
  * Clean up
  */
diff --git a/contrib/pg_pathman/init.sql b/contrib/pg_pathman/init.sql
@@ -233,6 +233,34 @@ END
 $$
 LANGUAGE plpgsql;
 
+/*
+ * Check if two relations have equal structures
+ */
+CREATE OR REPLACE FUNCTION @extschema@.validate_relations_equality(relation1 OID, relation2 OID)
+RETURNS BOOLEAN AS
+$$
+DECLARE
+    rec RECORD;
+BEGIN
+    FOR rec IN (
+        WITH
+            a1 AS (select * from pg_attribute where attrelid = relation1 and attnum > 0),
+            a2 AS (select * from pg_attribute where attrelid = relation2 and attnum > 0)
+        SELECT a1.attname name1, a2.attname name2, a1.atttypid type1, a2.atttypid type2
+        FROM a1
+        FULL JOIN a2 ON a1.attnum = a2.attnum
+    )
+    LOOP
+        IF rec.name1 IS NULL OR rec.name2 IS NULL OR rec.name1 != rec.name2 THEN
+            RETURN False;
+        END IF;
+    END LOOP;
+
+    RETURN True;
+END
+$$
+LANGUAGE plpgsql;
+
 /*
  * Check if regclass if date or timestamp
  */
diff --git a/contrib/pg_pathman/range.sql b/contrib/pg_pathman/range.sql
@@ -886,6 +886,10 @@ BEGIN
 		RAISE EXCEPTION 'Specified range overlaps with existing partitions';
 	END IF;
 
+    IF NOT @extschema@.validate_relations_equality(p_relation::regclass, p_partition::regclass) THEN
+        RAISE EXCEPTION 'Partition must have the exact same structure as parent';
+    END IF;
+
 	/* Set inheritance */
 	EXECUTE format('ALTER TABLE %s INHERIT %s'
 				   , p_partition
diff --git a/contrib/pg_pathman/sql/pg_pathman.sql b/contrib/pg_pathman/sql/pg_pathman.sql
@@ -138,6 +138,16 @@ SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_archive'
 EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel WHERE dt BETWEEN '2014-11-15' AND '2015-01-15';
 SELECT pathman.detach_range_partition('test.range_rel_archive');
 EXPLAIN (COSTS OFF) SELECT * FROM test.range_rel WHERE dt BETWEEN '2014-11-15' AND '2015-01-15';
+CREATE TABLE test.range_rel_test1 (
+    id  SERIAL PRIMARY KEY,
+    dt  TIMESTAMP,
+    txt TEXT,
+    abc INTEGER);
+SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_test1', '2013-01-01'::DATE, '2014-01-01'::DATE);
+CREATE TABLE test.range_rel_test2 (
+    id  SERIAL PRIMARY KEY,
+    dt  TIMESTAMP);
+SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_test2', '2013-01-01'::DATE, '2014-01-01'::DATE);
 
 /*
  * Clean up
