From 7fa565d9e37227a397dc95486effd940fe1f8609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Kolbu?= <oyvind.kolbu@usit.uio.no>
Date: Wed, 13 Dec 2017 15:10:50 +0100
Subject: [PATCH] Let the partition column be configurable.

When using XDB on PostgreSQL, "partition" is a reserved name and
breaks replication.
---
 src/modules/usrloc/doc/usrloc_admin.xml | 20 ++++++++++++++++++++
 src/modules/usrloc/usrloc_mod.c         |  1 +
 2 files changed, 21 insertions(+)

diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml
index f7ac066c299..96ff750f977 100644
--- a/src/modules/usrloc/doc/usrloc_admin.xml
+++ b/src/modules/usrloc/doc/usrloc_admin.xml
@@ -516,6 +516,26 @@ modparam("usrloc", "keepalive_column", "kalive")
 		</example>
 	</section>
 
+	<section id="usrloc.p.partition_column">
+		<title><varname>partition_column</varname> (string)</title>
+		<para>
+		Name of database table column containing the value for partition id.
+		</para>
+		<para>
+		<emphasis>
+			Default value is <quote>partition</quote>.
+		</emphasis>
+		</para>
+		<example>
+		<title>Set <varname>partitioncolumn</varname> parameter</title>
+		<programlisting format="linespecific">
+...
+modparam("usrloc", "partition_column", "part")
+...
+</programlisting>
+		</example>
+	</section>
+
 	<section id="usrloc.p.use_domain">
 		<title><varname>use_domain</varname> (integer)</title>
 		<para>
diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c
index 3191e1bb1e6..2eb9037f246 100644
--- a/src/modules/usrloc/usrloc_mod.c
+++ b/src/modules/usrloc/usrloc_mod.c
@@ -218,6 +218,7 @@ static param_export_t params[] = {
 	{"server_id_column",    PARAM_STR, &srv_id_col    },
 	{"connection_id_column",PARAM_STR, &con_id_col    },
 	{"keepalive_column",    PARAM_STR, &keepalive_col },
+	{"partition_column",    PARAM_STR, &partition_col },
 	{"matching_mode",       INT_PARAM, &matching_mode   },
 	{"cseq_delay",          INT_PARAM, &cseq_delay      },
 	{"fetch_rows",          INT_PARAM, &ul_fetch_rows   },