From: Christopher Browne <cbbrowne@ca.afilias.info>
Date: Tue, 16 Dec 2014 20:30:40 +0000 (-0500)
Subject: Bug #349 - case insensitivity with cluster name when processing DDL
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=f50b0d0939d96ac19a66b4513496db632035846b;p=slony1-engine.git

Bug #349 - case insensitivity with cluster name when processing DDL

Cluster name wasn't properly quoted when processing sequence update, this logic only runs when doing DDL.

Added config change to regression tests to have StudlyCase names to ensure this is noticed in future

Conflicts:
	RELEASE
---

diff --git a/RELEASE b/RELEASE
index bf71f869..159de720 100644
--- a/RELEASE
+++ b/RELEASE
@@ -10,3 +10,4 @@
 	the 2.3 branch.
 
    - Bug 352 :: Issues with PostgreSQL "head" (what shall become 9.5 or so).  It is pretty usual for #include files to shift a bit and for functions to change arguments a bit.
+   - Bug 349 :: Issue with quoting of cluster name - only hit when processing DDL
diff --git a/clustertest/conf/disorder.properties.sample b/clustertest/conf/disorder.properties.sample
index 36e0c590..c67e13c6 100644
--- a/clustertest/conf/disorder.properties.sample
+++ b/clustertest/conf/disorder.properties.sample
@@ -74,7 +74,7 @@ database.db6.password.slony=slon
 slonik.path=/usr/local/pgsql8.3/bin/slonik
 slon.path=/usr/local/pgsql8.3/bin/slon
 ### slon.loglevel=4
-clustername=disorder_replica
+clustername=Disorder_Replica
 slony_dump.path=/usr/local/pgsql8.3/bin/slony1_dump.sh
 
 output.directory=results
diff --git a/clustertest/conf/slonyregress.sample.properties b/clustertest/conf/slonyregress.sample.properties
index eeadb539..491678f6 100644
--- a/clustertest/conf/slonyregress.sample.properties
+++ b/clustertest/conf/slonyregress.sample.properties
@@ -49,7 +49,7 @@ slonik.path=/usr/local/pgsql8.3/bin/slonik
 slon.path=/usr/local/pgsql8.3/bin/slon
 #slonik.path=/usr/local/pgsql8.3/bin/slonik
 #slon.path=/usr/local/pgsql8.3/bin/slon
-clustername=slonyregress
+clustername=SlonyRegress
 
 output.directory=results
 log4j.conf=conf/log4j.properties
diff --git a/src/backend/slony1_funcs.c b/src/backend/slony1_funcs.c
index acc902b3..22d55be7 100644
--- a/src/backend/slony1_funcs.c
+++ b/src/backend/slony1_funcs.c
@@ -1102,7 +1102,7 @@ versionFunc(logApply) (PG_FUNCTION_ARGS)
 			argtypes[1] = INT4OID;
 			argtypes[2] = INT8OID;
 
-			snprintf(query, 1023, "select %s.sequenceSetValue($1," \
+			snprintf(query, 1023, "select \"%s\".sequenceSetValue($1," \
 					 "$2,NULL,$3,true); ", tg->tg_trigger->tgargs[0]);
 			plan = SPI_prepare(query, 3, argtypes);
 			if (plan == NULL)
diff --git a/tests/settings.ik b/tests/settings.ik
index 7730faca..a7fa41d5 100644
--- a/tests/settings.ik
+++ b/tests/settings.ik
@@ -2,7 +2,7 @@
 # This file contains the various sets of possible DB
 # configuration defaults/overrides
 
-CLUSTER1=${CLUSTER1:-"slony_regress1"}
+CLUSTER1=${CLUSTER1:-"Slony_Regress1"}
 CLUSTER2=${CLUSTER2:-"slony_regress2"}
 CLUSTER3=${CLUSTER3:-"slony_regress3"}