Merge branch 'master_pgpro_copy' into rel_1_2_beta

funbringer · funbringer · commit b803886bd599 · 2016-10-30T01:02:05.000+03:00
diff --git a/src/copy_stmt_hooking.c b/src/copy_stmt_hooking.c
@@ -35,14 +35,21 @@
 #include "libpq/libpq.h"
 
 
+/*
+ * Determine whether we should enable COPY or not (PostgresPro has a fix).
+ */
+#if defined(WIN32) && !defined(PGPRO_PATHMAN_AWARE_COPY)
+#define DISABLE_PATHMAN_COPY
+#endif
+
 /*
  * While building PostgreSQL on Windows the msvc compiler produces .def file
  * which contains all the symbols that were declared as external except the ones
  * that were declared but not defined. We redefine variables below to prevent
  * 'unresolved symbol' errors on Windows. But we have to disable COPY feature
- * on Windows
+ * on Windows.
  */
-#ifdef WIN32
+#ifdef DISABLE_PATHMAN_COPY
 bool				XactReadOnly = false;
 ProtocolVersion		FrontendProtocol = (ProtocolVersion) 0;
 #endif
@@ -107,10 +114,12 @@ is_pathman_related_copy(Node *parsetree)
 				elog(ERROR, "freeze is not supported for partitioned tables");
 		}
 
-		elog(DEBUG1, "Overriding default behavior for COPY [%u]", partitioned_table);
-
-		#ifdef WIN32
+		/* Emit ERROR if we can't see the necessary symbols */
+		#ifdef DISABLE_PATHMAN_COPY
 			elog(ERROR, "COPY is not supported for partitioned tables on Windows");
+		#else
+			elog(DEBUG1, "Overriding default behavior for COPY [%u]",
+				 partitioned_table);
 		#endif
 
 		return true;
