Merge branch 'master' into gh-pages

Author: funbringer

docs/source/testgres.rst

@@ -59,4 +59,19 @@ testgres.node
    .. automethod:: __init__
 
 .. autoclass:: testgres.node.ProcessProxy
-   :members:
+   :members:
+
+testgres.pubsub
+---------------
+
+.. automodule:: testgres.pubsub
+
+.. autoclass:: testgres.node.Publication
+   :members:
+
+   .. automethod:: __init__
+
+.. autoclass:: testgres.node.Subscription
+   :members:
+
+   .. automethod:: __init__

hooks/pre-commit

@@ -1,13 +1,23 @@
 #!/bin/bash
 
+set -e
+
 # capture the changed files that have been staged
 changed_files=$(git diff --staged --name-only)
 
 for file in ${changed_files}
 do
 	if [[ "${file##*.}" == "py" ]]; then
-		echo "Yapfing ${file}"
-		yapf ${file} -i
-		git add ${file}
+		if command -v yapf > /dev/null; then
+			echo "Run yapf on ${file}"
+			yapf ${file} -i
+			git add ${file}
+		fi
+
+		if command -v flake8 > /dev/null; then
+			echo "Run flake8 on ${file}"
+			flake8 ${file}
+		fi
 	fi
 done
+

setup.py

@@ -16,12 +16,18 @@
 if sys.version_info < (3, 3):
     install_requires.append("ipaddress")
 
+# Get contents of README file
+with open('README.md', 'r') as f:
+    readme = f.read()
+
 setup(
-    version='1.6.0',
+    version='1.8.0',
     name='testgres',
     packages=['testgres'],
     description='Testing utility for PostgreSQL and its extensions',
     url='https://github.com/postgrespro/testgres',
+    long_description=readme,
+    long_description_content_type='text/markdown',
     license='PostgreSQL',
     author='Ildar Musin',
     author_email='zildermann@gmail.com',

testgres/__init__.py

@@ -10,8 +10,10 @@
 
 from .connection import \
     NodeConnection, \
+    DatabaseError, \
     InternalError, \
-    ProgrammingError
+    ProgrammingError, \
+    OperationalError
 
 from .exceptions import *
 from .enums import *

testgres/backup.py

@@ -149,8 +149,9 @@ def spawn_primary(self, name=None, destroy=True):
             # New nodes should always remove dir tree
             node._should_rm_dirs = True
 
-            node.append_conf(PG_CONF_FILE, "\n")
-            node.append_conf(PG_CONF_FILE, "port = {}".format(node.port))
+            # Set a new port
+            node.append_conf(filename=PG_CONF_FILE, line='\n')
+            node.append_conf(filename=PG_CONF_FILE, port=node.port)
 
             return node
 

testgres/connection.py

@@ -17,17 +17,24 @@
 
 from .exceptions import QueryException
 
-# export these exceptions
+# export some exceptions
+DatabaseError = pglib.DatabaseError
 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError
+OperationalError = pglib.OperationalError
 
 
 class NodeConnection(object):
     """
     Transaction wrapper returned by Node
     """
 
-    def __init__(self, node, dbname=None, username=None, password=None):
+    def __init__(self,
+                 node,
+                 dbname=None,
+                 username=None,
+                 password=None,
+                 autocommit=False):
 
         # Set default arguments
         dbname = dbname or default_dbname()
@@ -42,6 +49,7 @@ def __init__(self, node, dbname=None, username=None, password=None):
             host=node.host,
             port=node.port)
 
+        self._connection.autocommit = autocommit
         self._cursor = self.connection.cursor()
 
     @property

testgres/consts.py

@@ -26,6 +26,11 @@
 BACKUP_LOG_FILE = "backup.log"
 
 # defaults for node settings
+MAX_LOGICAL_REPLICATION_WORKERS = 5
 MAX_REPLICATION_SLOTS = 10
-MAX_WAL_SENDERS = 10
+MAX_WORKER_PROCESSES = 10
 WAL_KEEP_SEGMENTS = 20
+MAX_WAL_SENDERS = 10
+
+# logical replication settings
+LOGICAL_REPL_MAX_CATCHUP_ATTEMPTS = 60

testgres/enums.py

@@ -85,3 +85,14 @@ def from_process(process):
 
         # default
         return ProcessType.Unknown
+
+
+class DumpFormat(Enum):
+    """
+    Available dump formats
+    """
+
+    Plain = 'plain'
+    Custom = 'custom'
+    Directory = 'directory'
+    Tar = 'tar'