postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  0230e78ec19bceb2ff5b34ea7a035cc2b0b7321a (commit)
      from  f83cf55da8f200a4f89395737245aaddb37c88e0 (commit)


- Log -----------------------------------------------------------------
commit 0230e78ec19bceb2ff5b34ea7a035cc2b0b7321a
Author: Michael P <mic...@us...>
Date:   Thu Jan 27 15:40:34 2011 +0900

    Fix for bug 3147497 INSERT.. DEFAULT VALUES
    
    This fix is linked to tables having no default values defined.
    When doing an INSERT.. DEFAULT VALUES, XC was returning an error
    at planner level when deparsing the query.
    
    create table aa(a int);
    INSERT INTO aa DEFAULT VALUES ;
    
    XC result:
    ERROR: syntax error at or near ")"
    pg_regress results:
    INSERT 0 1
    
    In this fix, when an INSERT using DEFAULT VALUES is made,
    query is directly returned.
    
    Patch written by sch19831106 with some editorialization by me.

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 507c643..1551b9c 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -55,7 +55,9 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 #include "utils/xml.h"
-
+#ifdef PGXC
+#include "pgxc/pgxc.h"
+#endif
 
 /* ----------
  * Pretty formatting constants
@@ -3223,6 +3225,18 @@ get_insert_query_def(Query *query, deparse_context *context)
 	ListCell   *l;
 	List	   *strippedexprs;
 
+#ifdef PGXC
+	/*
+	 * In the case of "INSERT ... DEFAULT VALUES" analyzed in pgxc planner,
+	 * return the sql statement directly if the table has no default values.
+	 */
+	if (IS_PGXC_COORDINATOR && !IsConnFromCoord() && !query->targetList)
+	{
+		appendStringInfo(buf, "%s", query->sql_statement);
+		return;
+	}
+#endif
+
 	/*
 	 * If it's an INSERT ... SELECT or VALUES (...), (...), ... there will be
 	 * a single RTE for the SELECT or VALUES.

-----------------------------------------------------------------------

Summary of changes:
 src/backend/utils/adt/ruleutils.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, master has been updated
       via  f83cf55da8f200a4f89395737245aaddb37c88e0 (commit)
      from  fe557aa50bcd7401a1f5cf9acec4285904bb4d24 (commit)


- Log -----------------------------------------------------------------
commit f83cf55da8f200a4f89395737245aaddb37c88e0
Author: Michael P <mic...@us...>
Date:   Thu Jan 27 14:50:40 2011 +0900

    Fix for make -j
    
    This fixes dependency problems when invocating j option
    during a make.
    
    Patch written by Wang Diancheng

diff --git a/src/Makefile b/src/Makefile
index 9028d85..7fbbcb3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,11 +18,11 @@ all install installdirs uninstall distprep:
 	$(MAKE) -C timezone $@
 	# GTM should be built before backend because of dependancy
 	$(MAKE) -C gtm $@
+	$(MAKE) -C interfaces $@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
 	$(MAKE) -C backend/snowball $@
 	$(MAKE) -C include $@
-	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
 	$(MAKE) -C makefiles $@
diff --git a/src/include/Makefile b/src/include/Makefile
index ea0cb1b..153166e 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -18,7 +18,7 @@ all: pg_config.h pg_config_os.h
 
 # Subdirectories containing headers for server-side dev
 SUBDIRS = access bootstrap catalog commands executor foreign lib libpq mb \
-	nodes optimizer parser postmaster regex rewrite storage tcop \
+	nodes optimizer parser pgxc postmaster regex rewrite storage tcop \
 	snowball snowball/libstemmer tsearch tsearch/dicts utils \
 	port port/win32 port/win32_msvc port/win32_msvc/sys \
 	port/win32/arpa port/win32/netinet port/win32/sys \

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile         |    2 +-
 src/include/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Postgres-XC