Merge branch 'master' into feature/ssh_config

Author: gfrlv

changelog.md

@@ -7,15 +7,16 @@ Features:
 * Add an option `--list-ssh-config` to list ssh configurations.
 * Add an option `--ssh-config-path` to choose ssh configuration path.
 
-1.20.2
-=======
+
+1.21.1
+======
 
 
 Bug Fixes:
 ----------
 
 * Fix broken auto-completion for favorite queries (Thanks: [Amjith]).
-
+* Fix undefined variable exception when running with --no-warn (Thanks: [Georgy Frolov])
 
 1.21.0
 ======
@@ -26,6 +27,8 @@ Features:
 * Mark `update` without `where`-clause as destructive query (Thanks: [Klaus Wünschel]).
 * Added DELIMITER command (Thanks: [Georgy Frolov])
 * Added clearer error message when failing to connect to the default socket.
+* Extend main.is_dropping_database check with create after delete statement.
+* Search `${XDG_CONFIG_HOME}/mycli/myclirc` after `${HOME}/.myclirc` and before `/etc/myclirc` (Thanks: [Takeshi D. Itoh])
 
 Bug Fixes:
 ----------

mycli/AUTHORS

@@ -69,6 +69,8 @@ Contributors:
   * Georgy Frolov
   * Jonathan Lloyd
   * Nathan Huang
+  * Jakub Boukal
+  * Takeshi D. Itoh
   * laixintao
 
 Creator:

mycli/__init__.py

@@ -1 +1 @@
-__version__ = '1.21.0'
+__version__ = '1.21.1'

mycli/main.py

@@ -87,8 +87,14 @@ class MyCli(object):
         '~/.my.cnf'
     ]
 
+    # check XDG_CONFIG_HOME exists and not an empty string
+    if os.environ.get("XDG_CONFIG_HOME"):
+        xdg_config_home = os.environ.get("XDG_CONFIG_HOME")
+    else:
+        xdg_config_home = "~/.config"
     system_config_files = [
         '/etc/myclirc',
+        os.path.join(xdg_config_home, "mycli", "myclirc")
     ]
 
     default_config_file = os.path.join(PACKAGE_ROOT, 'myclirc')
@@ -162,7 +168,7 @@ def __init__(self, sqlexecute=None, prompt=None,
         prompt_cnf = self.read_my_cnf_files(self.cnf_files, ['prompt'])['prompt']
         self.prompt_format = prompt or prompt_cnf or c['main']['prompt'] or \
                              self.default_prompt
-        self.prompt_continuation_format = c['main']['prompt_continuation']
+        self.multiline_continuation_char = c['main']['prompt_continuation']
         keyword_casing = c['main'].get('keyword_casing', 'auto')
 
         self.query_history = []
@@ -539,8 +545,14 @@ def get_message():
                 prompt = self.get_prompt('\\d> ')
             return [('class:prompt', prompt)]
 
-        def get_continuation(width, line_number, is_soft_wrap):
-            continuation = ' ' * (width - 1) + ' '
+        def get_continuation(width, *_):
+            if self.multiline_continuation_char:
+                left_padding = width - len(self.multiline_continuation_char)
+                continuation = " " * \
+                    max((left_padding - 1), 0) + \
+                    self.multiline_continuation_char + " "
+            else:
+                continuation = " "
             return [('class:continuation', continuation)]
 
         def show_suggestion_tip():
@@ -575,6 +587,8 @@ def one_iteration(text=None):
                 else:
                     self.echo('Wise choice!')
                     return
+            else:
+                destroy = True
 
             # Keep track of whether or not the query is mutating. In case
             # of a multi-statement query, the overall query is considered

mycli/myclirc

@@ -66,7 +66,7 @@ wider_completion_menu = False
 # \A - DSN alias name (from the [alias_dsn] section)
 # \u - Username
 prompt = '\t \u@\h:\d> '
-prompt_continuation = '-> '
+prompt_continuation = '->'
 
 # Skip intro info on startup and outro info on exit
 less_chatty = False

mycli/packages/parseutils.py

@@ -241,6 +241,7 @@ def is_open_quote(sql):
 
 def is_dropping_database(queries, dbname):
     """Determine if the query is dropping a specific database."""
+    result = False
     if dbname is None:
         return False
 
@@ -253,16 +254,14 @@ def normalize_db_name(db):
         keywords = [t for t in query.tokens if t.is_keyword]
         if len(keywords) < 2:
             continue
-        if keywords[0].normalized == "DROP" and keywords[1].value.lower() in (
+        if keywords[0].normalized in ("DROP", "CREATE") and keywords[1].value.lower() in (
             "database",
             "schema",
         ):
             database_token = next(
                 (t for t in query.tokens if isinstance(t, Identifier)), None
             )
-            return (
-                database_token is not None
-                and normalize_db_name(database_token.get_name()) == dbname
-            )
+            if database_token is not None and normalize_db_name(database_token.get_name()) == dbname:
+                result = keywords[0].normalized == "DROP"
     else:
-        return False
+        return result

setup.py

@@ -19,7 +19,7 @@
 install_requirements = [
     'click >= 7.0',
     'Pygments >= 1.6',
-    'prompt_toolkit>=2.0.6,<3.0.0',
+    'prompt_toolkit>=3.0.0,<4.0.0',
     'PyMySQL >= 0.9.2',
     'sqlparse>=0.3.0,<0.4.0',
     'configobj >= 5.0.5',

test/features/crud_table.feature

@@ -28,7 +28,8 @@ Feature: manipulate tables:
       then we see null selected
 
   Scenario: confirm destructive query
-     When we query "delete from foo;"
+     When we query "create table foo(x integer);"
+      and we query "delete from foo;"
       and we answer the destructive warning with "y"
       then we see text "Your call!"
 
@@ -37,6 +38,12 @@ Feature: manipulate tables:
       and we answer the destructive warning with "n"
       then we see text "Wise choice!"
 
+   Scenario: no destructive warning if disabled in config
+     When we run dbcli with --no-warn
+      and we query "create table blabla(x integer);"
+      and we query "delete from blabla;"
+     Then we see text "Query OK"
+
   Scenario: confirm destructive query with invalid response
      When we query "delete from foo;"
       then we answer the destructive warning with invalid "1" and see text "is not a valid boolean"

test/features/environment.py

@@ -8,13 +8,16 @@
 
 from steps.wrappers import run_cli, wait_prompt
 
+test_log_file = os.path.join(os.environ['HOME'], '.mycli.test.log')
+
 
 def before_all(context):
     """Set env parameters."""
     os.environ['LINES'] = "100"
     os.environ['COLUMNS'] = "100"
     os.environ['EDITOR'] = 'ex'
     os.environ['LC_ALL'] = 'en_US.utf8'
+    os.environ['PROMPT_TOOLKIT_NO_CPR'] = '1'
 
     test_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
     login_path_file = os.path.join(test_dir, 'mylogin.cnf')
@@ -95,12 +98,18 @@ def before_step(context, _):
 
 
 def before_scenario(context, _):
+    with open(test_log_file, 'w') as f:
+        f.write('')
     run_cli(context)
     wait_prompt(context)
 
 
 def after_scenario(context, _):
     """Cleans up after each test complete."""
+    with open(test_log_file) as f:
+        for line in f:
+            if 'error' in line.lower():
+                raise RuntimeError(f'Error in log file: {line}')
 
     if hasattr(context, 'cli') and not context.exit_sent:
         # Quit nicely.

test/test_parseutils.py

@@ -175,6 +175,8 @@ def test_query_has_where_clause(sql, has_where_clause):
         ('drop schema foo', 'bar', False),
         ('drop database bar', 'foo', False),
         ('drop database foo', None, False),
+        ('drop database foo; create database foo', 'foo', False),
+        ('drop database foo; create database bar', 'foo', True),
         ('select bar from foo; drop database bazz', 'foo', False),
         ('select bar from foo; drop database bazz', 'bazz', True),
         ('-- dropping database \n '