<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/5af6f86938859b5a56fda1ffdf3692bbb3ae9f76">https://github.com/macports/macports-ports/commit/5af6f86938859b5a56fda1ffdf3692bbb3ae9f76</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5af6f86938859b5a56fda1ffdf3692bbb3ae9f76
</span>Author: Ivan Larionov <xeron.oskom@gmail.com>
AuthorDate: Sun Mar 19 14:12:51 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> mycli: update to 1.9.0.
</span>---
databases/mycli/Portfile | 12 ++----
databases/mycli/files/newer_sqlparse.patch | 61 ------------------------------
2 files changed, 4 insertions(+), 69 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mycli/Portfile b/databases/mycli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cab44cd..4f4b0d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mycli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mycli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dbcli mycli 1.8.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dbcli mycli 1.9.0 v
</span>
categories databases python
maintainers gmail.com:xeron.oskom openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,11 +16,8 @@ long_description ${description}
</span>
homepage http://mycli.net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1b10dc7c4c37a22505bb09c55e841e56a7f689b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6d009ad91d65c4eb2d2afb55332c38b9b5f20d3b7b7c518ace1f2b2b238aed75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append newer_sqlparse.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ff7bce2e775cbe6d400f7f2d805c429a383bbaa8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e584b7ba2d3c21f388ac2cda22e27ef48fe70c3ca92e23cad1ab43319c5ef3e1
</span>
variant python27 conflicts python34 python35 python36 description "Use Python 2.7" {}
variant python34 conflicts python27 python35 python36 description "Use Python 3.4" {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +37,7 @@ if {[variant_isset python34]} {
</span>
depends_build port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-click \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-crypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pycryptodome \
</span> port:py${python.version}-pygments \
port:py${python.version}-prompt_toolkit \
port:py${python.version}-pymysql \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mycli/files/newer_sqlparse.patch b/databases/mycli/files/newer_sqlparse.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9cea1c9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mycli/files/newer_sqlparse.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 71f503afb699b2a8365f9e8fddcdddb1960a1e79 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Darik Gamble <darik.gamble.spam@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 4 Nov 2016 19:54:34 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] Bump sqlparse version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mycli/packages/parseutils.py | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setup.py | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mycli/packages/parseutils.py b/mycli/packages/parseutils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3cbf4a0..7f848ad 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/mycli/packages/parseutils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/mycli/packages/parseutils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +64,7 @@ def last_word(text, include='alphanum_underscore'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This code is borrowed from sqlparse example script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # <url>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def is_subselect(parsed):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not parsed.is_group():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not parsed.is_group:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for item in parsed.tokens:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if item.ttype is DML and item.value.upper() in ('SELECT', 'INSERT',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3d80c96..c369357 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'Pygments >= 2.0', # Pygments has to be Capitalcased. WTF?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'prompt_toolkit>=1.0.0,<1.1.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'PyMySQL >= 0.6.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'sqlparse>=0.2.0,<0.2.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'sqlparse>=0.2.2,<0.3.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'configobj >= 5.0.6',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 54a8206c5187347a6a6f6ae4db994e0d7864cbcc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Darik Gamble <darik.gamble.spam@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 5 Nov 2016 08:06:15 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Dangling `as` doesn't get grouped into identifiers in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this version of sqlparse, so we need to handle them explicitly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mycli/packages/completion_engine.py | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 31ef874..6e2165d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/mycli/packages/completion_engine.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/mycli/packages/completion_engine.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,6 +197,9 @@ def suggest_based_on_last_token(token, text_before_cursor, full_text, identifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [{'type': 'column', 'tables': extract_tables(full_text)}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif token_v in ('set', 'by', 'distinct'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [{'type': 'column', 'tables': extract_tables(full_text)}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif token_v == 'as':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Don't suggest anything for an alias
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif token_v in ('show'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [{'type': 'show'}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif token_v in ('to',):
</span></pre><pre style='margin:0'>
</pre>