resolve conflicts

Author: funbringer

Diff for: .gitignore

@@ -8,4 +8,4 @@ regression.out
 *.pyc
 *.gcda
 *.gcno
-pg_pathman--1.1.sql
+pg_pathman--1.2.sql

Diff for: Makefile

@@ -9,9 +9,12 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/partition_creation.o $(WIN32RES)
 
 EXTENSION = pg_pathman
-EXTVERSION = 1.1
+EXTVERSION = 1.2
 DATA_built = pg_pathman--$(EXTVERSION).sql
-DATA = pg_pathman--1.0.sql pg_pathman--1.0--1.1.sql
+DATA = pg_pathman--1.0.sql \
+	pg_pathman--1.0--1.1.sql \
+	pg_pathman--1.1.sql \
+	pg_pathman--1.1--1.2.sql
 PGFILEDESC = "pg_pathman - partitioning tool"
 
 REGRESS = pathman_basic \

Diff for: README.md

@@ -84,10 +84,9 @@ Done! Now it's time to setup your partitioning schemes.
 create_hash_partitions(relation         REGCLASS,
                        attribute        TEXT,
                        partitions_count INTEGER,
-                       partition_name   TEXT DEFAULT NULL,
                        partition_data   BOOLEAN DEFAULT TRUE)
 ```
-Performs HASH partitioning for `relation` by integer key `attribute`. The `partitions_count` parameter specifies the number of partitions to create; it cannot be changed afterwards. If `partition_data` is `true` then all the data will be automatically copied from the parent table to partitions. Note that data migration may took a while to finish and the table will be locked until transaction commits. See `partition_table_concurrently()` for a lock-free way to migrate data. Partition creation callback is invoked for each partition if set beforehand (see `set_part_init_callback()`).
+Performs HASH partitioning for `relation` by integer key `attribute`. The `partitions_count` parameter specifies the number of partitions to create; it cannot be changed afterwards. If `partition_data` is `true` then all the data will be automatically copied from the parent table to partitions. Note that data migration may took a while to finish and the table will be locked until transaction commits. See `partition_table_concurrently()` for a lock-free way to migrate data. Partition creation callback is invoked for each partition if set beforehand (see `set_init_callback()`).
 
 ```plpgsql
 create_range_partitions(relation       REGCLASS,
@@ -148,6 +147,14 @@ create_range_update_trigger(parent REGCLASS)
 Same as above, but for a RANGE-partitioned table.
 
 ### Post-creation partition management
+```plpgsql
+replace_hash_partition(old_partition       REGCLASS,
+                       new_partition       REGCLASS,
+                       lock_parent         BOOL DEFAULT TRUE)
+```
+Replaces specified partition of HASH-partitioned table with another table. The `lock_parent` parameter will prevent any INSERT/UPDATE/ALTER TABLE queries to parent table.
+
+
 ```plpgsql
 split_range_partition(partition      REGCLASS,
                       split_value    ANYELEMENT,

Diff for: init.sql

@@ -699,13 +699,13 @@ LANGUAGE C STRICT;
  */
 CREATE OR REPLACE FUNCTION @[email protected]_check_constraint_name(
 	partition_relid	REGCLASS,
-	partitioned_col	INT2)
+	attribute	INT2)
 RETURNS TEXT AS 'pg_pathman', 'build_check_constraint_name_attnum'
 LANGUAGE C STRICT;
 
 CREATE OR REPLACE FUNCTION @[email protected]_check_constraint_name(
 	partition_relid	REGCLASS,
-	partitioned_col	TEXT)
+	attribute	TEXT)
 RETURNS TEXT AS 'pg_pathman', 'build_check_constraint_name_attname'
 LANGUAGE C STRICT;