various improvements, change args of query performing functions

* changed args of psql(), safe_psql(), execute(), poll_query_until()
* introduced positional_args_hack() decorator for API functions
* replaced inline config names with constants in consts.py
* introduced default_dbname(), changed default_username()

Author: funbringer

Diff for: .gitignore

@@ -1,12 +1,17 @@
 *.pyc
-dist
-tags
-*.egg-info/
 *.egg
-Dockerfile
-.coverage
+*.egg-info/
+dist
+
 env/
 venv/
 build/
+
+.coverage
 coverage.xml
+
+Dockerfile
+
+*~
 *.swp
+tags

Diff for: testgres/backup.py

@@ -8,6 +8,7 @@
 
 from .consts import \
     DATA_DIR as _DATA_DIR, \
+    PG_CONF_FILE as _PG_CONF_FILE, \
     BACKUP_LOG_FILE as _BACKUP_LOG_FILE, \
     DEFAULT_XLOG_METHOD as _DEFAULT_XLOG_METHOD
 
@@ -139,8 +140,8 @@ def spawn_primary(self, name=None, destroy=True, use_logging=False):
         # New nodes should always remove dir tree
         node._should_rm_dirs = True
 
-        node.append_conf("postgresql.conf", "\n")
-        node.append_conf("postgresql.conf", "port = {}".format(node.port))
+        node.append_conf(_PG_CONF_FILE, "\n")
+        node.append_conf(_PG_CONF_FILE, "port = {}".format(node.port))
 
         return node
 

Diff for: testgres/connection.py

@@ -12,7 +12,11 @@
 from enum import Enum
 
 from .exceptions import QueryException
-from .utils import default_username as _default_username
+
+from .utils import \
+    default_dbname as _default_dbname, \
+    default_username as _default_username
+
 
 # export these exceptions
 InternalError = pglib.InternalError
@@ -33,25 +37,37 @@ class NodeConnection(object):
     """
 
     def __init__(self,
-                 parent_node,
-                 dbname,
-                 host="127.0.0.1",
+                 node,
+                 dbname=None,
                  username=None,
                  password=None):
 
         # Use default user if not specified
+        dbname = dbname or _default_dbname()
         username = username or _default_username()
 
-        self.parent_node = parent_node
+        self._node = node
 
-        self.connection = pglib.connect(
+        self._connection = pglib.connect(
             database=dbname,
             user=username,
-            port=parent_node.port,
-            host=host,
-            password=password)
+            password=password,
+            host=node.host,
+            port=node.port)
+
+        self._cursor = self.connection.cursor()
+
+    @property
+    def node(self):
+        return self._node
+
+    @property
+    def connection(self):
+        return self._connection
 
-        self.cursor = self.connection.cursor()
+    @property
+    def cursor(self):
+        return self._cursor
 
     def __enter__(self):
         return self
@@ -73,7 +89,7 @@ def begin(self, isolation_level=IsolationLevel.ReadCommitted):
 
             # Get index of isolation level
             level_idx = isolation_level.value
-            assert(level_idx in range(4))
+            assert level_idx in range(4)
 
             # Replace isolation level with its name
             isolation_level = levels[level_idx]

Diff for: testgres/consts.py

@@ -4,6 +4,10 @@
 DATA_DIR = "data"
 LOGS_DIR = "logs"
 
+RECOVERY_CONF_FILE = "recovery.conf"
+PG_CONF_FILE = "postgresql.conf"
+HBA_CONF_FILE = "pg_hba.conf"
+
 # names for log files
 PG_LOG_FILE = "postgresql.log"
 UTILS_LOG_FILE = "utils.log"

Diff for: testgres/logger.py

@@ -8,7 +8,7 @@
 
 class TestgresLogger(threading.Thread):
     """
-    Helper class to implement reading from postgresql.log
+    Helper class to implement reading from log files.
     """
 
     def __init__(self, node_name, log_file_name):