Merge commit '20d8d0c63de6d5eb280b9c37d9d52548259916c4' into PGPROEE10_pg_shardman

arssher · arssher · commit 914f48c72b5b · 2018-02-02T10:49:56.000+03:00
diff --git a/contrib/pg_shardman/.gitignore b/contrib/pg_shardman/.gitignore
@@ -5,3 +5,6 @@ bin/setup.sh
 
 *.pyc
 __pycache__
+
+env/
+venv/
diff --git a/contrib/pg_shardman/Makefile b/contrib/pg_shardman/Makefile
@@ -56,5 +56,9 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+PYTHON = python3
 python_tests:
-	$(MAKE) -C tests/python
+	$(MAKE) -C tests/python PYTHON=$(PYTHON)
+
+# Special rule for PostgresPro
+testgres_check: python_tests
diff --git a/contrib/pg_shardman/pg_shardman.c b/contrib/pg_shardman/pg_shardman.c
@@ -564,6 +564,7 @@ pq_conninfo_parse(PG_FUNCTION_ARGS)
 	char *conninfo = text_to_cstring(PG_GETARG_TEXT_PP(0));
 	PQconninfoOption *opts = PQconninfoParse(conninfo, &pqerrmsg);
 	PQconninfoOption *opt;
+	HeapTuple res_heap_tuple;
 
 	if (pqerrmsg != NULL)
 	{
@@ -634,7 +635,8 @@ pq_conninfo_parse(PG_FUNCTION_ARGS)
 	BlessTupleDesc(tupdesc); /* Inshallah */
 
 	PQconninfoFree(opts);
-	PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(tupdesc, values, nulls)));
+	res_heap_tuple = heap_form_tuple(tupdesc, values, nulls);
+	PG_RETURN_DATUM(HeapTupleGetDatum(res_heap_tuple));
 }
 
 Datum
diff --git a/contrib/pg_shardman/tests/python/.flake8 b/contrib/pg_shardman/tests/python/.flake8
@@ -0,0 +1,3 @@
+[flake8]
+ignore = E501
+exclude = __pycache__
diff --git a/contrib/pg_shardman/tests/python/.gitignore b/contrib/pg_shardman/tests/python/.gitignore
@@ -0,0 +1 @@
+logs/
diff --git a/contrib/pg_shardman/tests/python/Makefile b/contrib/pg_shardman/tests/python/Makefile
@@ -1,6 +1,5 @@
-# we need to cd into dir with tests.py, otherwise unittest won't find it
-# dir containing this makefile
-mkfile_dir := $(shell dirname $(shell readlink -f $(abspath $(lastword $(MAKEFILE_LIST)))))
+# User should be able to override PYTHON
+PYTHON = python3
 
 all:
-	cd $(mkfile_dir) && python3 tests.py
+	$(PYTHON) tests.py
diff --git a/contrib/pg_shardman/tests/python/make_pretty.sh b/contrib/pg_shardman/tests/python/make_pretty.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR=$(dirname $0)
+
+yapf -i "$DIR"/*.py
+flake8 "$DIR"
diff --git a/contrib/pg_shardman/tests/python/tests.py b/contrib/pg_shardman/tests/python/tests.py

-Original file line number
+Diff line change
 *.pyc
 __pycache__
++
 +env/
 +venv/
Original file line number	Diff line number	Diff line change
`@@ -564,6 +564,7 @@ pq_conninfo_parse(PG_FUNCTION_ARGS)`
`564`	`564`	`char *conninfo = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`565`	`565`	`PQconninfoOption *opts = PQconninfoParse(conninfo, &pqerrmsg);`
`566`	`566`	`PQconninfoOption *opt;`
	`567`	`+ HeapTuple res_heap_tuple;`
`567`	`568`
`568`	`569`	`if (pqerrmsg != NULL)`
`569`	`570`	`{`
`@@ -634,7 +635,8 @@ pq_conninfo_parse(PG_FUNCTION_ARGS)`
`634`	`635`	`BlessTupleDesc(tupdesc); /* Inshallah */`
`635`	`636`
`636`	`637`	`PQconninfoFree(opts);`
`637`		`- PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(tupdesc, values, nulls)));`
	`638`	`+ res_heap_tuple = heap_form_tuple(tupdesc, values, nulls);`
	`639`	`+ PG_RETURN_DATUM(HeapTupleGetDatum(res_heap_tuple));`
`638`	`640`	`}`
`639`	`641`
`640`	`642`	`Datum`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[flake8]`
	`2`	`+ignore = E501`
	`3`	`+exclude = __pycache__`