<pre style='margin:0'>
Aljaž Srebrnič (g5pw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9dc73df320574c1b386b116e9de7ca2538eb49b1">https://github.com/macports/macports-ports/commit/9dc73df320574c1b386b116e9de7ca2538eb49b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9dc73df320574c1b386b116e9de7ca2538eb49b1
</span>Author: Ivan Larionov <xeron.oskom@gmail.com>
AuthorDate: Sat Oct 26 12:18:11 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> pgcli: port updates
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add postgresql 12 support
</span><span style='display:block; white-space:pre;color:#404040;'> * add python 3.8 support
</span><span style='display:block; white-space:pre;color:#404040;'> * drop python 3.4 and 3.5 support
</span>---
databases/pgcli/Portfile | 41 ++++++++++++-------------
databases/pgcli/files/postgresql12_support.diff | 39 +++++++++++++++++++++++
2 files changed, 59 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgcli/Portfile b/databases/pgcli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c9acec..3a77b9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/pgcli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/pgcli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
github.setup dbcli pgcli 2.1.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories databases python
maintainers {g5pw @g5pw} {@xeron gmail.com:xeron.oskom} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,35 +19,34 @@ homepage https://pgcli.com
</span>
checksums rmd160 50bee637da3cef3d993d353c6349dbe1def3eebc \
sha256 14ee789ae2f8b6e7173dca42362213361da88a46b1853507c4bcde58b02feb5e \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 435790
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 435790
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 python35 python36 python37 description "Use Python 2.7" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 python36 python37 description "Use Python 3.4" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 python36 python37 description "Use Python 3.5" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python34 python35 python37 description "Use Python 3.6" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python34 python35 python36 description "Use Python 3.7" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles postgresql12_support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python36 python37 python38 description "Use Python 2.7" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python37 python38 description "Use Python 3.6" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python36 python38 description "Use Python 3.7" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python36 python37 description "Use Python 3.8" {}
</span>
if {[variant_isset python27]} {
python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 35
</span> } elseif {[variant_isset python36]} {
python.default_version 36
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[variant_isset python37]} {
</span> python.default_version 37
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 38
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27] || [variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python27]} {
</span> github.setup dbcli pgcli 1.11.0 v
revision 0
checksums rmd160 d7631dd973be421e664db9b6089106297ebce6c6 \
sha256 2c30dd068afdc8a0b15460d49b27962c55642154bb4cb4279e86b36d607c9590 \
size 430226
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles setup-1.11.0.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append setup-1.11.0.py.diff
</span> }
depends_lib-append port:py${python.version}-cli-helpers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +62,9 @@ depends_lib-append port:py${python.version}-cli-helpers \
</span> port:py${python.version}-setproctitle \
port:py${python.version}-sqlparse
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} changelog.rst README.rst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LICENSE.txt DEVELOP.rst AUTHORS ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} changelog.rst README.rst \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LICENSE.txt DEVELOP.rst AUTHORS ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgcli/files/postgresql12_support.diff b/databases/pgcli/files/postgresql12_support.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6d7cc34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/pgcli/files/postgresql12_support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 10cc4ce2b9e1d745f3be91373f48ef6ea9ca7f88 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Irina Truong <i.chernyavska@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 9 Jun 2019 08:05:28 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Partial fix for #1058. (#1068)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ changelog.rst | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgcli/pgexecute.py | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 6 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/changelog.rst b/changelog.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 323627a2..467afe73 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- changelog.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ changelog.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,11 @@ Features:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Add `\\G` as a terminator to sql statements that will show the results in expanded mode. This feature is copied from mycli. (Thanks: `Amjith Ramanujam`_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Bug fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Error connecting to PostgreSQL 12beta1 (#1058). (Thanks: `Irina Truong`_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =====
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e3c16ffb..b3ebb5c0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pgcli/pgexecute.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pgcli/pgexecute.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,7 +559,7 @@ def _columns(self, kinds=("r", "v", "m")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ att.attname column_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ att.atttypid::regtype::text type_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ att.atthasdef AS has_default,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def.adsrc as default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pg_catalog.pg_get_expr(def.adbin, def.adrelid, true) as default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FROM pg_catalog.pg_attribute att
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INNER JOIN pg_catalog.pg_class cls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ON att.attrelid = cls.oid
</span></pre><pre style='margin:0'>
</pre>