From c0add0e9048cc1cd334f5606e4003752e77b0a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pave=C5=82=20Ty=C5=9Blacki?= <pavel.tyslyatsky@pandadoc.com>
Date: Fri, 27 Apr 2018 10:49:38 +0300
Subject: [PATCH 1/2] add gitlab package building

---
 .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..49c794b2b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,30 @@
+image: $ARTIFACTORY_DOCKER_REGISTRY/infrastructure/docker-libpy-test:0.10
+
+stages:
+  - build
+  - publish
+
+build-package:
+  stage: build
+  script:
+    - pip3.6 install wheel
+    - python3.6 setup.py sdist bdist_wheel
+  artifacts:
+    paths:
+      - dist
+  tags:
+    - docker
+  only:
+    - branches
+    - tags
+
+publish-package:
+  stage: publish
+  script: twine upload --repository-url=$ARTIFACTORY_PYPI_REPOSITORY --username=$ARTIFACTORY_USERNAME --password=$ARTIFACTORY_PASSWORD dist/*
+  dependencies:
+    - build-package
+  tags:
+    - docker
+  only:
+    - master
+    - tags

From 36eaec768120a767c4fa75fd3f08fe1099974ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pave=C5=82=20Ty=C5=9Blacki?= <pavel.tyslacki@gmail.com>
Date: Sat, 21 Apr 2018 10:46:13 +0300
Subject: [PATCH 2/2] 114: add ability to print pgspecial's table definition
 (\d tablename)

---
 setup.py       |  2 +-
 src/sql/run.py | 55 ++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 8a8bed535..ed58d488f 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 NEWS = open(os.path.join(here, 'NEWS.txt'), encoding='utf-8').read()
 
 
-version = '0.3.9'
+version = '0.3.9-r1'
 
 install_requires = [
     'prettytable',
diff --git a/src/sql/run.py b/src/sql/run.py
index 7bbca8dd7..0494b8790 100644
--- a/src/sql/run.py
+++ b/src/sql/run.py
@@ -105,6 +105,7 @@ class ResultSet(list, ColumnGuesserMixin):
 
     def __init__(self, sqlaproxy, sql, config):
         self.keys = sqlaproxy.keys()
+        self.status = getattr(sqlaproxy, 'statusmessage', None)
         self.sql = sql
         self.config = config
         self.limit = config.autolimit
@@ -128,6 +129,20 @@ def _repr_html_(self):
             self.pretty.add_rows(self)
             result = self.pretty.get_html_string()
             result = _cell_with_spaces_pattern.sub(_nonbreaking_spaces, result)
+            if self.status:
+                status_tables = []
+                status_table = None
+                for line in self.status.splitlines():
+                    if not line.startswith(' '):
+                        if status_table:
+                            status_tables.append(status_table)
+                        status_table = PrettyTable([line])
+                    else:
+                        status_table.add_row([line.strip()])
+                status_tables.append(status_table)
+                result = '\n'.join(
+                    [result] +
+                    [st.get_html_string() for st in status_tables])
             if self.config.displaylimit and len(
                     self) > self.config.displaylimit:
                 result = '%s\n<span style="font-style:italic;text-align:center;">%d rows, truncated to displaylimit of %d</span>' % (
@@ -296,13 +311,41 @@ class FakeResultProxy(object):
     SqlAlchemy.
     """
 
-    def __init__(self, cursor, headers):
-        self.fetchall = cursor.fetchall
-        self.fetchmany = cursor.fetchmany
-        self.rowcount = cursor.rowcount
+    def __init__(self, cur, headers, status):
+        self._cursor = cur
+        self._cursor_index = 0
+        self._status = status
         self.keys = lambda: headers
         self.returns_rows = True
 
+    def fetchall(self):
+        if isinstance(self._cursor, list):
+            self._cursor_index = self.rowcount
+            return self._cursor
+        return self._cursor.fetchall()
+
+
+    def fetchmany(self, size):
+        if isinstance(self._cursor, list):
+            prev = self._cursor_index
+            next = prev + size
+            self._cursor_index = next
+            return self._cursor[prev:next]
+        return self._cursor.fetchmany(size)
+
+    @property
+    def rowcount(self):
+        if isinstance(self._cursor, list):
+            return len(self._cursor)
+        return self._cursor.rowcount
+
+    @property
+    def statusmessage(self):
+        if isinstance(self._cursor, list):
+            return self._status
+        return self._cursor.statusmessage
+
+
 # some dialects have autocommit
 # specific dialects break when commit is used:
 _COMMIT_BLACKLIST_DIALECTS = ('mssql', 'clickhouse', 'teradata')
@@ -332,9 +375,9 @@ def run(conn, sql, config, user_namespace):
                 if not PGSpecial:
                     raise ImportError('pgspecial not installed')
                 pgspecial = PGSpecial()
-                _, cur, headers, _ = pgspecial.execute(
+                _, cur, headers, status = pgspecial.execute(
                     conn.session.connection.cursor(), statement)[0]
-                result = FakeResultProxy(cur, headers)
+                result = FakeResultProxy(cur, headers, status)
             else:
                 txt = sqlalchemy.sql.text(statement)
                 result = conn.session.execute(txt, user_namespace)