Merge branch 'master' into picky_nodes

funbringer · funbringer · commit f05ea70f6b3c · 2016-07-06T16:15:19.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 os:
   - linux
 
+sudo: required
+dist: trusty
+
 language: c
 
 compiler:
@@ -11,6 +14,7 @@ before_install:
   - sudo sh ./travis/apt.postgresql.org.sh
 
 env:
-  - PGVERSION=9.5
+  - PGVERSION=9.5 CHECK_CODE=true
+  - PGVERSION=9.5 CHECK_CODE=false
 
 script: bash ./travis/pg-travis-test.sh
diff --git a/range.sql b/range.sql
@@ -438,12 +438,6 @@ BEGIN
         EXIT WHEN v_child_relname_exists = 0;
     END LOOP;
 
-    /* Skip existing partitions */
-    IF EXISTS (SELECT * FROM pg_tables WHERE tablename = v_child_relname) THEN
-        RAISE WARNING 'Relation % already exists, skipping...', v_child_relname;
-        RETURN NULL;
-    END IF;
-
     EXECUTE format('CREATE TABLE %s (LIKE %s INCLUDING ALL)'
                    , v_child_relname
                    , p_parent);
diff --git a/travis/pg-travis-test.sh b/travis/pg-travis-test.sh
@@ -4,30 +4,73 @@ set -eux
 
 sudo apt-get update
 
+
+# required packages
 packages="postgresql-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-common"
 
+# exit code
+status=0
+
+# pg_config path
+config_path=/usr/lib/postgresql/$PGVERSION/bin/pg_config
+
+
 # bug: http://www.postgresql.org/message-id/20130508192711.GA9243@msgid.df7cb.de
 sudo update-alternatives --remove-all postmaster.1.gz
 
 # stop all existing instances (because of https://github.com/travis-ci/travis-cookbooks/pull/221)
 sudo service postgresql stop
-# and make sure they don't come back
+# ... and make sure they don't come back
 echo 'exit 0' | sudo tee /etc/init.d/postgresql
 sudo chmod a+x /etc/init.d/postgresql
 
-sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $packages
+# install required packages
+sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y install -qq $packages
 
-status=0
+# create cluster 'test'
 sudo pg_createcluster --start $PGVERSION test -p 55435 -- -A trust
 
-make USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config
-sudo make install USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config
+# perform code analysis if necessary
+if [ $CHECK_CODE = "true" ]; then
+
+	if [ "$CC" = "clang" ]; then
+		sudo apt-get -y install -qq clang-3.5
+
+		scan-build-3.5 --status-bugs make USE_PGXS=1 PG_CONFIG=$config_path || status=$?
+		exit $status
+
+	elif [ "$CC" = "gcc" ]; then
+		sudo apt-get -y install -qq cppcheck
+
+		cppcheck --template "{file} ({line}): {severity} ({id}): {message}" \
+			--enable=warning,portability,performance \
+			--suppress=redundantAssignment \
+			--suppress=uselessAssignmentPtrArg \
+			--std=c89 src/*.c src/*.h 2> cppcheck.log
+
+		if [ -s cppcheck.log ]; then
+			cat cppcheck.log
+			status=1 # error
+		fi
+
+		exit $status
+	fi
+
+	# don't forget to "make clean"
+	make clean USE_PGXS=1 PG_CONFIG=$config_path
+fi
+
+# build pg_pathman
+make USE_PGXS=1 PG_CONFIG=$config_path
+sudo make install USE_PGXS=1 PG_CONFIG=$config_path
 
-# add pg_pathman to shared_preload_libraries
+# add pg_pathman to shared_preload_libraries and restart cluster 'test'
 sudo bash -c "echo \"shared_preload_libraries = 'pg_pathman'\" >> /etc/postgresql/$PGVERSION/test/postgresql.conf"
 sudo pg_ctlcluster $PGVERSION test restart
 
-PGPORT=55435 make installcheck USE_PGXS=1 PGUSER=postgres PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config || status=$?
+# run regression tests
+PGPORT=55435 make installcheck USE_PGXS=1 PGUSER=postgres PG_CONFIG=$config_path || status=$?
 
+# show diff if it exists
 if test -f regression.diffs; then cat regression.diffs; fi
 exit $status
