Merge branch 'master' into master

Author: gfrlv

.travis.yml

@@ -12,7 +12,7 @@ matrix:
 
 install:
   - pip install -r requirements-dev.txt
-  - pip install -e .
+  - pip install --no-cache-dir -e .
   - sudo rm -f /etc/mysql/conf.d/performance-schema.cnf
   - sudo service mysql restart
 

changelog.md

@@ -7,6 +7,11 @@ Features:
 * Add an option `--init-command` to execute SQL after connecting (Thanks: [KITAGAWA Yasutaka]).
 * Use InputMode.REPLACE_SINGLE
 
+Bug Fixes:
+----------
+* Fixed compatibility with sqlparse 0.4 (Thanks: [mtorromeo]).
+*  Fixed iPython magic (Thanks: [mwcm]).
+
 1.22.2
 ======
 
@@ -786,3 +791,5 @@ Bug Fixes:
 [Georgy Frolov]: https://github.com/pasenor
 [Zach DeCook]: https://zachdecook.com
 [laixintao]: https://github.com/laixintao
+[mtorromeo]: https://github.com/mtorromeo
+[mwcm]: https://github.com/mwcm

mycli/AUTHORS

@@ -76,6 +76,8 @@ Contributors:
   * kevinhwang91
   * KITAGAWA Yasutaka
   * bitkeen
+  * Morgan Mitchell
+  * Massimiliano Torromeo
 
 Creator:
 --------

mycli/magic.py

@@ -19,7 +19,7 @@ def load_ipython_extension(ipython):
 def mycli_line_magic(line):
     _logger.debug('mycli magic called: %r', line)
     parsed = sql.parse.parse(line, {})
-    conn = sql.connection.Connection.get(parsed['connection'])
+    conn = sql.connection.Connection(parsed['connection'])
 
     try:
         # A corresponding mycli object already exists

mycli/main.py

@@ -152,7 +152,7 @@ def __init__(self, sqlexecute=None, prompt=None,
                                 c['main'].as_bool('auto_vertical_output')
 
         # Write user config if system config wasn't the last config loaded.
-        if c.filename not in self.system_config_files:
+        if c.filename not in self.system_config_files and not os.path.exists(myclirc):
             write_default_config(self.default_config_file, myclirc)
 
         # audit log

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 @@ def suggest_type(full_text, text_before_cursor):
         stmt_start, stmt_end = 0, 0
 
         for statement in parsed:
-            stmt_len = len(text_type(statement))
+            stmt_len = len(str(statement))
             stmt_start, stmt_end = stmt_end, stmt_end + stmt_len
 
             if stmt_end >= current_pos:

requirements-dev.txt

@@ -3,8 +3,8 @@ pytest!=3.3.0
 pytest-cov==2.4.0
 tox
 twine==1.12.1
-behave
-pexpect
+behave>=1.2.4
+pexpect==3.3
 coverage==5.0.4
 codecov==2.0.9
 autopep8==1.3.3

setup.py

@@ -65,7 +65,7 @@ class test(TestCommand):
     def initialize_options(self):
         TestCommand.initialize_options(self)
         self.pytest_args = ''
-        self.behave_args = ''
+        self.behave_args = '--no-capture'
 
     def run_tests(self):
         unit_test_errno = subprocess.call(

test/features/environment.py

@@ -16,7 +16,7 @@ def before_all(context):
     os.environ['LINES'] = "100"
     os.environ['COLUMNS'] = "100"
     os.environ['EDITOR'] = 'ex'
-    os.environ['LC_ALL'] = 'en_US.utf8'
+    os.environ['LC_ALL'] = 'en_US.UTF-8'
     os.environ['PROMPT_TOOLKIT_NO_CPR'] = '1'
 
     test_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -118,11 +118,12 @@ def after_scenario(context, _):
             host = context.conf['host']
             dbname = context.currentdb
             context.cli.expect_exact(
-                '{0}@{1}:{2}> '.format(
+                '{0}@{1}:{2}>'.format(
                     user, host, dbname
                 ),
                 timeout=5
             )
+        context.cli.sendcontrol('c')
         context.cli.sendcontrol('d')
         context.cli.expect_exact(pexpect.EOF, timeout=5)
 

test/features/steps/crud_database.py

@@ -64,15 +64,13 @@ def step_see_prompt(context):
     user = context.conf['user']
     host = context.conf['host']
     dbname = context.currentdb
-    wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
-        user, host, dbname), timeout=5)
-    context.atprompt = True
+    wrappers.wait_prompt(context, '{0}@{1}:{2}> '.format(user, host, dbname))
 
 
 @then('we see help output')
 def step_see_help(context):
     for expected_line in context.fixture_data['help_commands.txt']:
-        wrappers.expect_exact(context, expected_line + '\r\n', timeout=1)
+        wrappers.expect_exact(context, expected_line, timeout=1)
 
 
 @then('we see database created')
@@ -96,10 +94,7 @@ def step_see_db_dropped_no_default(context):
     context.currentdb = None
 
     wrappers.expect_exact(context, 'Query OK, 0 rows affected', timeout=2)
-    wrappers.expect_exact(context, '{0}@{1}:{2}> '.format(
-        user, host, database), timeout=5)
-
-    context.atprompt = True
+    wrappers.wait_prompt(context, '{0}@{1}:{2}>'.format(user, host, database))
 
 
 @then('we see database connected')

test/features/steps/wrappers.py

@@ -88,7 +88,7 @@ def wait_prompt(context, prompt=None):
         user = context.conf['user']
         host = context.conf['host']
         dbname = context.currentdb
-        prompt = '{0}@{1}:{2}> '.format(
+        prompt = '{0}@{1}:{2}>'.format(
             user, host, dbname),
     expect_exact(context, prompt, timeout=5)
     context.atprompt = True