some refactoring

Author: zilder

Makefile

@@ -41,9 +41,6 @@ REGRESS = pathman_basic \
 		  pathman_calamity \
 		  pathman_ri
 
-# REGRESS = pathman_ri
-# REGRESS = pathman_basic
-
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
 EXTRA_CLEAN = pg_pathman--$(EXTVERSION).sql ./isolation_output

expected/pathman_ri.out

@@ -3,7 +3,7 @@ CREATE EXTENSION pg_pathman;
 CREATE TABLE abc (id SERIAL);
 CREATE TABLE xxx (id SERIAL, abc_id INT);
 /* Cannot create FK if PK table isn't partitioned by pg_pathman */
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 ERROR:  table abc isn't partitioned by pg_pathman
 /* Cannot create FK if there are no unique indexes */
 SELECT create_range_partitions('abc', 'id', 1, 100, 3);
@@ -13,11 +13,11 @@ NOTICE:  sequence "abc_seq" does not exist, skipping
                        3
 (1 row)
 
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 ERROR:  there is no unique constraint matching given keys for referenced table "abc"
 /* Create index on parent but not on partitions. Expect an error */
 CREATE UNIQUE INDEX on abc(id);
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 ERROR:  there is no unique constraint for partition "abc_1"
 /* Recreate partitioning setup with unique indexes */
 SELECT drop_partitions('abc');
@@ -38,13 +38,13 @@ SELECT create_range_partitions('abc', 'id', 1, 100, 3);
 
 /* Existing row should violate FK constraint */
 INSERT INTO xxx (abc_id) VALUES (1);
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 ERROR:  insert or update on table "xxx" violates foreign key constraint "xxx_abc_id_fkey"
 /* Expect successful execution */
 DELETE FROM xxx;
-SELECT create_fk('xxx', 'abc_id', 'abc');
- create_fk 
------------
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
+ create_foreign_key 
+--------------------
 
 (1 row)
 

init.sql

@@ -932,11 +932,11 @@ LANGUAGE C;
 /*
  * Referential integrity funcs and triggers
  */
-CREATE OR REPLACE FUNCTION @extschema@.create_fk(
+CREATE OR REPLACE FUNCTION @extschema@.create_foreign_key(
 	fk_table	REGCLASS,
 	fk_attr		TEXT,
 	pk_table	REGCLASS)
-RETURNS VOID AS 'pg_pathman', 'create_fk_constraint'
+RETURNS VOID AS 'pg_pathman', 'create_foreign_key'
 LANGUAGE C STRICT;
 
 CREATE OR REPLACE FUNCTION @extschema@.prepare_partition_drop(

sql/pathman_ri.sql

@@ -6,15 +6,15 @@ CREATE TABLE abc (id SERIAL);
 CREATE TABLE xxx (id SERIAL, abc_id INT);
 
 /* Cannot create FK if PK table isn't partitioned by pg_pathman */
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 
 /* Cannot create FK if there are no unique indexes */
 SELECT create_range_partitions('abc', 'id', 1, 100, 3);
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 
 /* Create index on parent but not on partitions. Expect an error */
 CREATE UNIQUE INDEX on abc(id);
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 
 /* Recreate partitioning setup with unique indexes */
 SELECT drop_partitions('abc');
@@ -23,11 +23,11 @@ SELECT create_range_partitions('abc', 'id', 1, 100, 3);
 
 /* Existing row should violate FK constraint */
 INSERT INTO xxx (abc_id) VALUES (1);
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 
 /* Expect successful execution */
 DELETE FROM xxx;
-SELECT create_fk('xxx', 'abc_id', 'abc');
+SELECT create_foreign_key('xxx', 'abc_id', 'abc');
 
 /* PK violation */
 INSERT INTO xxx (id, abc_id) VALUES (100, 1);

src/include/ref_integrity.h

@@ -1,20 +1,31 @@
+/* ------------------------------------------------------------------------
+ *
+ * ref_integrity.c
+ *		Referential integrity for partitioned tables
+ *
+ * Copyright (c) 2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
 #include "postgres.h"
 
+
 void pathman_get_fkeys(Oid parent_relid, List **constraints, List **refrelids);
-void createSingleForeignKeyTrigger(Oid relOid, Oid refRelOid, List *funcname,
-								   char *trigname, int16 events, Oid constraintOid,
-								   Oid indexOid, bool is_internal);
 void createPartitionForeignKeyTriggers(Oid partition,
-									   Oid fkrelid,
-									   AttrNumber attnum,
-									   Oid constraintOid,
-									   List *upd_funcname,
-									   List *del_funcname);
+								  Oid fkrelid,
+								  AttrNumber attnum,
+								  Oid constraintOid,
+								  List *upd_funcname,
+								  List *del_funcname);
+void createSingleForeignKeyTrigger(Oid relOid, Oid refRelOid, List *funcname,
+							  char *trigname, int16 events, Oid constraintOid,
+							  Oid indexOid, bool is_internal);
 HeapTuple get_index_for_key(Relation rel, AttrNumber attnum, Oid *index_id);
-List *get_ri_triggers_list(Oid relid, Oid constr);
-void ri_preparePartitionDrop(Oid parent,
-							 Relation partition,
-							 bool check_references);
 void ri_checkReferences(Relation partition, Oid constraintOid);
+List * get_ri_triggers_list(Oid relid, Oid constr);
+void ri_preparePartitionDrop(Oid parent,
+						Relation partition,
+						bool check_references);
 void enable_ri_triggers(void);
 void disable_ri_triggers(void);