Merge branch 'master' into dmius-pg-restore

Author: NikolayS

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2018, Nikolay Samokhvalov
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docker/postgresql_10_tweak.conf

@@ -1,5 +1,6 @@
 # Assume we have machine with 2CPU/4096MB/SSD (CircleCI default)
 # IMPORTANT: on faster systems, you need to use your own memory-related settings!
+statement_timeout = 300s
 work_mem = 32MB # warning: tune it if you expect *many* concurrent connections
 shared_buffers = 3GB
 effective_cache_size = 1GB

docker/postgresql_9.6_tweak.conf

@@ -1,5 +1,6 @@
 # Assume we have machine with 2CPU/4096MB/SSD (CircleCI default)
 # IMPORTANT: on faster systems, you need to use your own memory-related settings!
+statement_timeout = 300s
 work_mem = 32MB # warning: tune it if you expect *many* concurrent connections
 shared_buffers = 3GB
 effective_cache_size = 1GB