Fix sqlparse 4.0 compatibility with Arch Linux

3 files changed, 32 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e40d51415e22..d13cd0c925ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mycli
 	pkgdesc = A Terminal Client for MySQL with AutoCompletion and Syntax Highlighting
 	pkgver = 1.22.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/dbcli/mycli
 	arch = any
 	license = BSD
@@ -18,7 +18,9 @@ pkgbase = mycli
 	optdepends = python-paramiko: SSH support
 	options = !emptydirs
 	source = mycli-1.22.2.tar.gz::https://github.com/dbcli/mycli/archive/v1.22.2.tar.gz
+	source = completion_engine.py.patch
 	sha256sums = 4427442cf3e66ebbbb480bc5112bdf7e0432c70645f320313e2e0dbf0ae147fb
+	sha256sums = 5bf23ff1e80b0cab2150f09e1762ab246d7db41ffb20c4ecac15918a8c279c0e
 
 pkgname = mycli
 
diff --git a/PKGBUILD b/PKGBUILD
index caa581c2e0d9..bcace6541d27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mycli
 pkgver=1.22.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A Terminal Client for MySQL with AutoCompletion and Syntax Highlighting'
 arch=('any')
 url='https://github.com/dbcli/mycli'
@@ -24,11 +24,18 @@ makedepends=('python-setuptools')
 optdepends=('python-paramiko: SSH support')
 options=(!emptydirs)
 
-source=("$pkgname-$pkgver.tar.gz::https://github.com/dbcli/mycli/archive/v${pkgver}.tar.gz")
-sha256sums=('4427442cf3e66ebbbb480bc5112bdf7e0432c70645f320313e2e0dbf0ae147fb')
+source=(
+    "$pkgname-$pkgver.tar.gz::https://github.com/dbcli/mycli/archive/v${pkgver}.tar.gz"
+    "completion_engine.py.patch"
+)
+sha256sums=(
+    '4427442cf3e66ebbbb480bc5112bdf7e0432c70645f320313e2e0dbf0ae147fb'
+    '33f3e60abfe68bc7375dacead9676b3cc4920e1d16c7b57dcf5f474c0c3e6aad'
+)
 
 prepare() {
     cd "$srcdir/$pkgname-$pkgver"
+    patch -N -p1 -i "$srcdir/completion_engine.py.patch"
 }
 
 build() {
diff --git a/completion_engine.py.patch b/completion_engine.py.patch
new file mode 100644
index 000000000000..76c118941e01
--- /dev/null
+++ b/completion_engine.py.patch
@@ -0,0 +1,19 @@
+--- a/mycli/packages/completion_engine.py
++++ b/mycli/packages/completion_engine.py
+@@ -2,7 +2,6 @@
+ import sys
+ import sqlparse
+ from sqlparse.sql import Comparison, Identifier, Where
+-from sqlparse.compat import text_type
+ from .parseutils import last_word, extract_tables, find_prev_keyword
+ from .special import parse_special_command
+ 
+@@ -55,7 +54,7 @@
+         stmt_start, stmt_end = 0, 0
+ 
+         for statement in parsed:
+-            stmt_len = len(text_type(statement))
++            stmt_len = len(len(statement))
+             stmt_start, stmt_end = stmt_end, stmt_end + stmt_len
+ 
+             if stmt_end >= current_pos: