Merge 7beef28 into 2b221d9

citusdata · Aug 19, 2015 · 74a4376 · 74a4376
2 parents 2b221d9 + 7beef28
commit 74a4376
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/include/pg_shard.h b/include/pg_shard.h
@@ -15,13 +15,21 @@
 #include "c.h"
 
 #include "access/tupdesc.h"
+#include "catalog/indexing.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
 #include "lib/stringinfo.h"
 #include "utils/tuplestore.h"
 
 
+/* detect when building against CitusDB */
+#ifdef DistPartitionLogicalRelidIndexId
+#define BUILT_AGAINST_CITUSDB true
+#else
+#define BUILT_AGAINST_CITUSDB false
+#endif
+
 /* prefix used for temporary tables created on the master node */
 #define TEMPORARY_TABLE_PREFIX "pg_shard_temp_table"
 

diff --git a/src/pg_shard.c b/src/pg_shard.c
@@ -197,8 +197,8 @@ _PG_init(void)
 
 	DefineCustomBoolVariable("pg_shard.use_citusdb_select_logic",
 							 "Informs pg_shard to use CitusDB's select logic", NULL,
-							 &UseCitusDBSelectLogic, false, PGC_USERSET, 0, NULL,
-							 NULL, NULL);
+							 &UseCitusDBSelectLogic, BUILT_AGAINST_CITUSDB, PGC_USERSET,
+							 0, NULL, NULL, NULL);
 
 	DefineCustomBoolVariable("pg_shard.log_distributed_statements",
 							 "Logs each statement used in a distributed plan", NULL,

diff --git a/test/expected/00-init.out b/test/expected/00-init.out
@@ -2,6 +2,8 @@
 -- create extension
 -- ===================================================================
 CREATE EXTENSION pg_shard;
+-- ensure the test DB defaults to pg_shard select logic
+ALTER DATABASE :DBNAME SET pg_shard.use_citusdb_select_logic TO false;
 -- create fake fdw for use in tests
 CREATE FUNCTION fake_fdw_handler()
 RETURNS fdw_handler

diff --git a/test/sql/00-init.sql b/test/sql/00-init.sql
@@ -4,6 +4,9 @@
 
 CREATE EXTENSION pg_shard;
 
+-- ensure the test DB defaults to pg_shard select logic
+ALTER DATABASE :DBNAME SET pg_shard.use_citusdb_select_logic TO false;
+
 -- create fake fdw for use in tests
 CREATE FUNCTION fake_fdw_handler()
 RETURNS fdw_handler