commit a2187b452a8ccc4ef31a684915025141d34841ec · pyrox.dev/nixpkgs

pkgs/tools/admin/mycli/default.nix

···

       14
       14
        
           sha256 = "0x5vzl4vvirqy03fnjwkamhzrqkknlajamwz1rmbnqh4bfmijh9m";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       +
         patches = [ ./fix-tests.patch ];

     

       18
       18
       +
       

     

       17
       19
        
         propagatedBuildInputs = [

     

       18
       20
        
           pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers

     

       19
       21
        
         ];

+446

pkgs/tools/admin/mycli/fix-tests.patch

···

       1
       1
       +
       diff --git a/mycli/sqlcompleter.py b/mycli/sqlcompleter.py

     

       2
       2
       +
       index 81ee128..2b22fa9 100644

     

       3
       3
       +
       --- a/mycli/sqlcompleter.py

     

       4
       4
       +
       +++ b/mycli/sqlcompleter.py

     

       5
       5
       +
       @@ -16,27 +16,32 @@ _logger = logging.getLogger(__name__)

     

       6
       6
       +
        

     

       7
       7
       +
        class SQLCompleter(Completer):

     

       8
       8
       +
            keywords = ['ACCESS', 'ADD', 'ALL', 'ALTER TABLE', 'AND', 'ANY', 'AS',

     

       9
       9
       +
       -                'ASC', 'AUTO_INCREMENT', 'BEFORE', 'BEGIN', 'BETWEEN', 'BINARY', 'BY',

     

       10
       10
       +
       -                'CASE', 'CHAR', 'CHECK', 'COLUMN', 'COMMENT', 'COMMIT', 'CONSTRAINT',

     

       11
       11
       +
       -                'CHANGE MASTER TO', 'CHARACTER SET', 'COLLATE', 'CREATE', 'CURRENT', 'CURRENT_TIMESTAMP', 'DATABASE', 'DATE',

     

       12
       12
       +
       -                'DECIMAL', 'DEFAULT', 'DELETE FROM', 'DELIMITER', 'DESC',

     

       13
       13
       +
       -                'DESCRIBE', 'DROP', 'ELSE', 'END', 'ENGINE', 'ESCAPE', 'EXISTS',

     

       14
       14
       +
       -                'FILE', 'FLOAT', 'FOR', 'FOREIGN KEY', 'FORMAT', 'FROM', 'FULL', 'FUNCTION', 'GRANT',

     

       15
       15
       +
       -                'GROUP BY', 'HAVING', 'HOST', 'IDENTIFIED', 'IN', 'INCREMENT', 'INDEX',

     

       16
       16
       +
       -                'INSERT INTO', 'INTEGER', 'INTO', 'INTERVAL', 'IS', 'JOIN', 'KEY', 'LEFT',

     

       17
       17
       +
       -                'LEVEL', 'LIKE', 'LIMIT', 'LOCK', 'LOGS', 'LONG', 'MASTER', 'MODE',

     

       18
       18
       +
       -                'MODIFY', 'NOT', 'NULL', 'NUMBER', 'OFFSET', 'ON', 'OPTION', 'OR',

     

       19
       19
       +
       -                'ORDER BY', 'OUTER', 'OWNER', 'PASSWORD', 'PORT', 'PRIMARY',

     

       20
       20
       +
       -                'PRIVILEGES', 'PROCESSLIST', 'PURGE', 'REFERENCES', 'REGEXP', 'RENAME', 'REPAIR', 'RESET',

     

       21
       21
       +
       -                'REVOKE', 'RIGHT', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT', 'SELECT', 'SESSION', 'SET',

     

       22
       22
       +
       -                'SAVEPOINT', 'SHARE', 'SHOW', 'SLAVE', 'SMALLINT', 'START', 'STOP', 'TABLE', 'THEN',

     

       23
       23
       +
       -                'TO', 'TRANSACTION', 'TRIGGER', 'TRUNCATE', 'UNION', 'UNIQUE', 'UNSIGNED', 'UPDATE',

     

       24
       24
       +
       -                'USE', 'USER', 'USING', 'VALUES', 'VARCHAR', 'VIEW', 'WHEN', 'WHERE',

     

       25
       25
       +
       -                'WITH', 'TINYINT', 'SMALLINT', 'MEDIUMINT', 'INT', 'BIGINT']

     

       26
       26
       +
       -

     

       27
       27
       +
       -    functions = ['AVG', 'CONCAT', 'COUNT', 'DISTINCT', 'FIRST', 'FORMAT', 'LAST',

     

       28
       28
       +
       -                 'LCASE', 'LEN', 'MAX', 'MIN', 'MID', 'NOW', 'ROUND', 'SUM',

     

       29
       29
       +
       -                 'TOP', 'UCASE','FROM_UNIXTIME', 'UNIX_TIMESTAMP']

     

       30
       30
       +
       +                'ASC', 'AUTO_INCREMENT', 'BEFORE', 'BEGIN', 'BETWEEN',

     

       31
       31
       +
       +                'BIGINT', 'BINARY', 'BY', 'CASE', 'CHANGE MASTER TO', 'CHAR',

     

       32
       32
       +
       +                'CHARACTER SET', 'CHECK', 'COLLATE', 'COLUMN', 'COMMENT',

     

       33
       33
       +
       +                'COMMIT', 'CONSTRAINT', 'CREATE', 'CURRENT',

     

       34
       34
       +
       +                'CURRENT_TIMESTAMP', 'DATABASE', 'DATE', 'DECIMAL', 'DEFAULT',

     

       35
       35
       +
       +                'DELETE FROM', 'DELIMITER', 'DESC', 'DESCRIBE', 'DROP',

     

       36
       36
       +
       +                'ELSE', 'END', 'ENGINE', 'ESCAPE', 'EXISTS', 'FILE', 'FLOAT',

     

       37
       37
       +
       +                'FOR', 'FOREIGN KEY', 'FORMAT', 'FROM', 'FULL', 'FUNCTION',

     

       38
       38
       +
       +                'GRANT', 'GROUP BY', 'HAVING', 'HOST', 'IDENTIFIED', 'IN',

     

       39
       39
       +
       +                'INCREMENT', 'INDEX', 'INSERT INTO', 'INT', 'INTEGER',

     

       40
       40
       +
       +                'INTERVAL', 'INTO', 'IS', 'JOIN', 'KEY', 'LEFT', 'LEVEL',

     

       41
       41
       +
       +                'LIKE', 'LIMIT', 'LOCK', 'LOGS', 'LONG', 'MASTER',

     

       42
       42
       +
       +                'MEDIUMINT', 'MODE', 'MODIFY', 'NOT', 'NULL', 'NUMBER',

     

       43
       43
       +
       +                'OFFSET', 'ON', 'OPTION', 'OR', 'ORDER BY', 'OUTER', 'OWNER',

     

       44
       44
       +
       +                'PASSWORD', 'PORT', 'PRIMARY', 'PRIVILEGES', 'PROCESSLIST',

     

       45
       45
       +
       +                'PURGE', 'REFERENCES', 'REGEXP', 'RENAME', 'REPAIR', 'RESET',

     

       46
       46
       +
       +                'REVOKE', 'RIGHT', 'ROLLBACK', 'ROW', 'ROWS', 'ROW_FORMAT',

     

       47
       47
       +
       +                'SAVEPOINT', 'SELECT', 'SESSION', 'SET', 'SHARE', 'SHOW',

     

       48
       48
       +
       +                'SLAVE', 'SMALLINT', 'SMALLINT', 'START', 'STOP', 'TABLE',

     

       49
       49
       +
       +                'THEN', 'TINYINT', 'TO', 'TRANSACTION', 'TRIGGER', 'TRUNCATE',

     

       50
       50
       +
       +                'UNION', 'UNIQUE', 'UNSIGNED', 'UPDATE', 'USE', 'USER',

     

       51
       51
       +
       +                'USING', 'VALUES', 'VARCHAR', 'VIEW', 'WHEN', 'WHERE', 'WITH']

     

       52
       52
       +
       +

     

       53
       53
       +
       +    functions = ['AVG', 'CONCAT', 'COUNT', 'DISTINCT', 'FIRST', 'FORMAT',

     

       54
       54
       +
       +                 'FROM_UNIXTIME', 'LAST', 'LCASE', 'LEN', 'MAX', 'MID',

     

       55
       55
       +
       +                 'MIN', 'NOW', 'ROUND', 'SUM', 'TOP', 'UCASE', 'UNIX_TIMESTAMP']

     

       56
       56
       +
        

     

       57
       57
       +
            show_items = []

     

       58
       58
       +
        

     

       59
       59
       +
       diff --git a/test/test_naive_completion.py b/test/test_naive_completion.py

     

       60
       60
       +
       index 3282c7e..01a432d 100644

     

       61
       61
       +
       --- a/test/test_naive_completion.py

     

       62
       62
       +
       +++ b/test/test_naive_completion.py

     

       63
       63
       +
       @@ -19,36 +19,36 @@ def complete_event():

     

       64
       64
       +
        def test_empty_string_completion(completer, complete_event):

     

       65
       65
       +
            text = ''

     

       66
       66
       +
            position = 0

     

       67
       67
       +
       -    result = set(completer.get_completions(

     

       68
       68
       +
       +    result = list(completer.get_completions(

     

       69
       69
       +
                Document(text=text, cursor_position=position),

     

       70
       70
       +
                complete_event))

     

       71
       71
       +
       -    assert result == set(map(Completion, completer.all_completions))

     

       72
       72
       +
       +    assert result == list(map(Completion, sorted(completer.all_completions)))

     

       73
       73
       +
        

     

       74
       74
       +
        

     

       75
       75
       +
        def test_select_keyword_completion(completer, complete_event):

     

       76
       76
       +
            text = 'SEL'

     

       77
       77
       +
            position = len('SEL')

     

       78
       78
       +
       -    result = set(completer.get_completions(

     

       79
       79
       +
       +    result = list(completer.get_completions(

     

       80
       80
       +
                Document(text=text, cursor_position=position),

     

       81
       81
       +
                complete_event))

     

       82
       82
       +
       -    assert result == set([Completion(text='SELECT', start_position=-3)])

     

       83
       83
       +
       +    assert result == list([Completion(text='SELECT', start_position=-3)])

     

       84
       84
       +
        

     

       85
       85
       +
        

     

       86
       86
       +
        def test_function_name_completion(completer, complete_event):

     

       87
       87
       +
            text = 'SELECT MA'

     

       88
       88
       +
            position = len('SELECT MA')

     

       89
       89
       +
       -    result = set(completer.get_completions(

     

       90
       90
       +
       +    result = list(completer.get_completions(

     

       91
       91
       +
                Document(text=text, cursor_position=position),

     

       92
       92
       +
                complete_event))

     

       93
       93
       +
       -    assert result == set([

     

       94
       94
       +
       -        Completion(text='MAX', start_position=-2),

     

       95
       95
       +
       -        Completion(text='MASTER', start_position=-2)])

     

       96
       96
       +
       +    assert result == list([

     

       97
       97
       +
       +        Completion(text='MASTER', start_position=-2),

     

       98
       98
       +
       +        Completion(text='MAX', start_position=-2)])

     

       99
       99
       +
        

     

       100
       100
       +
        

     

       101
       101
       +
        def test_column_name_completion(completer, complete_event):

     

       102
       102
       +
            text = 'SELECT  FROM users'

     

       103
       103
       +
            position = len('SELECT ')

     

       104
       104
       +
       -    result = set(completer.get_completions(

     

       105
       105
       +
       +    result = list(completer.get_completions(

     

       106
       106
       +
                Document(text=text, cursor_position=position),

     

       107
       107
       +
                complete_event))

     

       108
       108
       +
       -    assert result == set(map(Completion, completer.all_completions))

     

       109
       109
       +
       +    assert result == list(map(Completion, sorted(completer.all_completions)))

     

       110
       110
       +
       diff --git a/test/test_smart_completion_public_schema_only.py b/test/test_smart_completion_public_schema_only.py

     

       111
       111
       +
       index 00059bb..3c29956 100644

     

       112
       112
       +
       --- a/test/test_smart_completion_public_schema_only.py

     

       113
       113
       +
       +++ b/test/test_smart_completion_public_schema_only.py

     

       114
       114
       +
       @@ -42,11 +42,11 @@ def complete_event():

     

       115
       115
       +
        def test_empty_string_completion(completer, complete_event):

     

       116
       116
       +
            text = ''

     

       117
       117
       +
            position = 0

     

       118
       118
       +
       -    result = set(

     

       119
       119
       +
       +    result = list(

     

       120
       120
       +
                completer.get_completions(

     

       121
       121
       +
                    Document(text=text, cursor_position=position),

     

       122
       122
       +
                    complete_event))

     

       123
       123
       +
       -    assert set(map(Completion, completer.keywords)) == result

     

       124
       124
       +
       +    assert list(map(Completion, completer.keywords)) == result

     

       125
       125
       +
        

     

       126
       126
       +
        

     

       127
       127
       +
        def test_select_keyword_completion(completer, complete_event):

     

       128
       128
       +
       @@ -55,7 +55,7 @@ def test_select_keyword_completion(completer, complete_event):

     

       129
       129
       +
            result = completer.get_completions(

     

       130
       130
       +
                Document(text=text, cursor_position=position),

     

       131
       131
       +
                complete_event)

     

       132
       132
       +
       -    assert set(result) == set([Completion(text='SELECT', start_position=-3)])

     

       133
       133
       +
       +    assert list(result) == list([Completion(text='SELECT', start_position=-3)])

     

       134
       134
       +
        

     

       135
       135
       +
        

     

       136
       136
       +
        def test_table_completion(completer, complete_event):

     

       137
       137
       +
       @@ -63,10 +63,12 @@ def test_table_completion(completer, complete_event):

     

       138
       138
       +
            position = len(text)

     

       139
       139
       +
            result = completer.get_completions(

     

       140
       140
       +
                Document(text=text, cursor_position=position), complete_event)

     

       141
       141
       +
       -    assert set(result) == set([Completion(text='users', start_position=0),

     

       142
       142
       +
       -                               Completion(text='`select`', start_position=0),

     

       143
       143
       +
       -                               Completion(text='`réveillé`', start_position=0),

     

       144
       144
       +
       -                               Completion(text='orders', start_position=0)])

     

       145
       145
       +
       +    assert list(result) == list([

     

       146
       146
       +
       +        Completion(text='`réveillé`', start_position=0),

     

       147
       147
       +
       +        Completion(text='`select`', start_position=0),

     

       148
       148
       +
       +        Completion(text='orders', start_position=0),

     

       149
       149
       +
       +        Completion(text='users', start_position=0),

     

       150
       150
       +
       +    ])

     

       151
       151
       +
        

     

       152
       152
       +
        

     

       153
       153
       +
        def test_function_name_completion(completer, complete_event):

     

       154
       154
       +
       @@ -74,7 +76,7 @@ def test_function_name_completion(completer, complete_event):

     

       155
       155
       +
            position = len('SELECT MA')

     

       156
       156
       +
            result = completer.get_completions(

     

       157
       157
       +
                Document(text=text, cursor_position=position), complete_event)

     

       158
       158
       +
       -    assert set(result) == set([Completion(text='MAX', start_position=-2),

     

       159
       159
       +
       +    assert list(result) == list([Completion(text='MAX', start_position=-2),

     

       160
       160
       +
                                       Completion(text='MASTER', start_position=-2),

     

       161
       161
       +
                                       ])

     

       162
       162
       +
        

     

       163
       163
       +
       @@ -89,17 +91,18 @@ def test_suggested_column_names(completer, complete_event):

     

       164
       164
       +
            """

     

       165
       165
       +
            text = 'SELECT  from users'

     

       166
       166
       +
            position = len('SELECT ')

     

       167
       167
       +
       -    result = set(completer.get_completions(

     

       168
       168
       +
       +    result = list(completer.get_completions(

     

       169
       169
       +
                Document(text=text, cursor_position=position),

     

       170
       170
       +
                complete_event))

     

       171
       171
       +
       -    assert set(result) == set([

     

       172
       172
       +
       -        Completion(text='users', start_position=0),

     

       173
       173
       +
       +    assert result == list([

     

       174
       174
       +
                Completion(text='*', start_position=0),

     

       175
       175
       +
       -        Completion(text='id', start_position=0),

     

       176
       176
       +
                Completion(text='email', start_position=0),

     

       177
       177
       +
                Completion(text='first_name', start_position=0),

     

       178
       178
       +
       -        Completion(text='last_name', start_position=0)] +

     

       179
       179
       +
       +        Completion(text='id', start_position=0),

     

       180
       180
       +
       +        Completion(text='last_name', start_position=0),

     

       181
       181
       +
       +    ] +

     

       182
       182
       +
                list(map(Completion, completer.functions)) +

     

       183
       183
       +
       +        [Completion(text='users', start_position=0)] +

     

       184
       184
       +
                list(map(Completion, completer.keywords)))

     

       185
       185
       +
        

     

       186
       186
       +
        

     

       187
       187
       +
       @@ -117,11 +120,11 @@ def test_suggested_column_names_in_function(completer, complete_event):

     

       188
       188
       +
            result = completer.get_completions(

     

       189
       189
       +
                Document(text=text, cursor_position=position),

     

       190
       190
       +
                complete_event)

     

       191
       191
       +
       -    assert set(result) == set([

     

       192
       192
       +
       +    assert list(result) == list([

     

       193
       193
       +
                Completion(text='*', start_position=0),

     

       194
       194
       +
       -        Completion(text='id', start_position=0),

     

       195
       195
       +
                Completion(text='email', start_position=0),

     

       196
       196
       +
                Completion(text='first_name', start_position=0),

     

       197
       197
       +
       +        Completion(text='id', start_position=0),

     

       198
       198
       +
                Completion(text='last_name', start_position=0)])

     

       199
       199
       +
        

     

       200
       200
       +
        

     

       201
       201
       +
       @@ -135,14 +138,14 @@ def test_suggested_column_names_with_table_dot(completer, complete_event):

     

       202
       202
       +
            """

     

       203
       203
       +
            text = 'SELECT users. from users'

     

       204
       204
       +
            position = len('SELECT users.')

     

       205
       205
       +
       -    result = set(completer.get_completions(

     

       206
       206
       +
       +    result = list(completer.get_completions(

     

       207
       207
       +
                Document(text=text, cursor_position=position),

     

       208
       208
       +
                complete_event))

     

       209
       209
       +
       -    assert set(result) == set([

     

       210
       210
       +
       +    assert result == list([

     

       211
       211
       +
                Completion(text='*', start_position=0),

     

       212
       212
       +
       -        Completion(text='id', start_position=0),

     

       213
       213
       +
                Completion(text='email', start_position=0),

     

       214
       214
       +
                Completion(text='first_name', start_position=0),

     

       215
       215
       +
       +        Completion(text='id', start_position=0),

     

       216
       216
       +
                Completion(text='last_name', start_position=0)])

     

       217
       217
       +
        

     

       218
       218
       +
        

     

       219
       219
       +
       @@ -156,14 +159,14 @@ def test_suggested_column_names_with_alias(completer, complete_event):

     

       220
       220
       +
            """

     

       221
       221
       +
            text = 'SELECT u. from users u'

     

       222
       222
       +
            position = len('SELECT u.')

     

       223
       223
       +
       -    result = set(completer.get_completions(

     

       224
       224
       +
       +    result = list(completer.get_completions(

     

       225
       225
       +
                Document(text=text, cursor_position=position),

     

       226
       226
       +
                complete_event))

     

       227
       227
       +
       -    assert set(result) == set([

     

       228
       228
       +
       +    assert result == list([

     

       229
       229
       +
                Completion(text='*', start_position=0),

     

       230
       230
       +
       -        Completion(text='id', start_position=0),

     

       231
       231
       +
                Completion(text='email', start_position=0),

     

       232
       232
       +
                Completion(text='first_name', start_position=0),

     

       233
       233
       +
       +        Completion(text='id', start_position=0),

     

       234
       234
       +
                Completion(text='last_name', start_position=0)])

     

       235
       235
       +
        

     

       236
       236
       +
        

     

       237
       237
       +
       @@ -178,17 +181,17 @@ def test_suggested_multiple_column_names(completer, complete_event):

     

       238
       238
       +
            """

     

       239
       239
       +
            text = 'SELECT id,  from users u'

     

       240
       240
       +
            position = len('SELECT id, ')

     

       241
       241
       +
       -    result = set(completer.get_completions(

     

       242
       242
       +
       +    result = list(completer.get_completions(

     

       243
       243
       +
                Document(text=text, cursor_position=position),

     

       244
       244
       +
                complete_event))

     

       245
       245
       +
       -    assert set(result) == set([

     

       246
       246
       +
       -        Completion(text='u', start_position=0),

     

       247
       247
       +
       +    assert result == list([

     

       248
       248
       +
                Completion(text='*', start_position=0),

     

       249
       249
       +
       -        Completion(text='id', start_position=0),

     

       250
       250
       +
                Completion(text='email', start_position=0),

     

       251
       251
       +
                Completion(text='first_name', start_position=0),

     

       252
       252
       +
       +        Completion(text='id', start_position=0),

     

       253
       253
       +
                Completion(text='last_name', start_position=0)] +

     

       254
       254
       +
                list(map(Completion, completer.functions)) +

     

       255
       255
       +
       +        [Completion(text='u', start_position=0)] +

     

       256
       256
       +
                list(map(Completion, completer.keywords)))

     

       257
       257
       +
        

     

       258
       258
       +
        

     

       259
       259
       +
       @@ -203,14 +206,14 @@ def test_suggested_multiple_column_names_with_alias(completer, complete_event):

     

       260
       260
       +
            """

     

       261
       261
       +
            text = 'SELECT u.id, u. from users u'

     

       262
       262
       +
            position = len('SELECT u.id, u.')

     

       263
       263
       +
       -    result = set(completer.get_completions(

     

       264
       264
       +
       +    result = list(completer.get_completions(

     

       265
       265
       +
                Document(text=text, cursor_position=position),

     

       266
       266
       +
                complete_event))

     

       267
       267
       +
       -    assert set(result) == set([

     

       268
       268
       +
       +    assert result == list([

     

       269
       269
       +
                Completion(text='*', start_position=0),

     

       270
       270
       +
       -        Completion(text='id', start_position=0),

     

       271
       271
       +
                Completion(text='email', start_position=0),

     

       272
       272
       +
                Completion(text='first_name', start_position=0),

     

       273
       273
       +
       +        Completion(text='id', start_position=0),

     

       274
       274
       +
                Completion(text='last_name', start_position=0)])

     

       275
       275
       +
        

     

       276
       276
       +
        

     

       277
       277
       +
       @@ -225,106 +228,108 @@ def test_suggested_multiple_column_names_with_dot(completer, complete_event):

     

       278
       278
       +
            """

     

       279
       279
       +
            text = 'SELECT users.id, users. from users u'

     

       280
       280
       +
            position = len('SELECT users.id, users.')

     

       281
       281
       +
       -    result = set(completer.get_completions(

     

       282
       282
       +
       +    result = list(completer.get_completions(

     

       283
       283
       +
                Document(text=text, cursor_position=position),

     

       284
       284
       +
                complete_event))

     

       285
       285
       +
       -    assert set(result) == set([

     

       286
       286
       +
       +    assert result == list([

     

       287
       287
       +
                Completion(text='*', start_position=0),

     

       288
       288
       +
       -        Completion(text='id', start_position=0),

     

       289
       289
       +
                Completion(text='email', start_position=0),

     

       290
       290
       +
                Completion(text='first_name', start_position=0),

     

       291
       291
       +
       +        Completion(text='id', start_position=0),

     

       292
       292
       +
                Completion(text='last_name', start_position=0)])

     

       293
       293
       +
        

     

       294
       294
       +
        

     

       295
       295
       +
        def test_suggested_aliases_after_on(completer, complete_event):

     

       296
       296
       +
            text = 'SELECT u.name, o.id FROM users u JOIN orders o ON '

     

       297
       297
       +
            position = len('SELECT u.name, o.id FROM users u JOIN orders o ON ')

     

       298
       298
       +
       -    result = set(completer.get_completions(

     

       299
       299
       +
       +    result = list(completer.get_completions(

     

       300
       300
       +
                Document(text=text, cursor_position=position),

     

       301
       301
       +
                complete_event))

     

       302
       302
       +
       -    assert set(result) == set([

     

       303
       303
       +
       -        Completion(text='u', start_position=0),

     

       304
       304
       +
       -        Completion(text='o', start_position=0)])

     

       305
       305
       +
       +    assert result == list([

     

       306
       306
       +
       +        Completion(text='o', start_position=0),

     

       307
       307
       +
       +        Completion(text='u', start_position=0)])

     

       308
       308
       +
        

     

       309
       309
       +
        

     

       310
       310
       +
        def test_suggested_aliases_after_on_right_side(completer, complete_event):

     

       311
       311
       +
            text = 'SELECT u.name, o.id FROM users u JOIN orders o ON o.user_id = '

     

       312
       312
       +
            position = len(

     

       313
       313
       +
                'SELECT u.name, o.id FROM users u JOIN orders o ON o.user_id = ')

     

       314
       314
       +
       -    result = set(completer.get_completions(

     

       315
       315
       +
       +    result = list(completer.get_completions(

     

       316
       316
       +
                Document(text=text, cursor_position=position),

     

       317
       317
       +
                complete_event))

     

       318
       318
       +
       -    assert set(result) == set([

     

       319
       319
       +
       -        Completion(text='u', start_position=0),

     

       320
       320
       +
       -        Completion(text='o', start_position=0)])

     

       321
       321
       +
       +    assert result == list([

     

       322
       322
       +
       +        Completion(text='o', start_position=0),

     

       323
       323
       +
       +        Completion(text='u', start_position=0)])

     

       324
       324
       +
        

     

       325
       325
       +
        

     

       326
       326
       +
        def test_suggested_tables_after_on(completer, complete_event):

     

       327
       327
       +
            text = 'SELECT users.name, orders.id FROM users JOIN orders ON '

     

       328
       328
       +
            position = len('SELECT users.name, orders.id FROM users JOIN orders ON ')

     

       329
       329
       +
       -    result = set(completer.get_completions(

     

       330
       330
       +
       +    result = list(completer.get_completions(

     

       331
       331
       +
                Document(text=text, cursor_position=position),

     

       332
       332
       +
                complete_event))

     

       333
       333
       +
       -    assert set(result) == set([

     

       334
       334
       +
       -        Completion(text='users', start_position=0),

     

       335
       335
       +
       -        Completion(text='orders', start_position=0)])

     

       336
       336
       +
       +    assert result == list([

     

       337
       337
       +
       +        Completion(text='orders', start_position=0),

     

       338
       338
       +
       +        Completion(text='users', start_position=0)])

     

       339
       339
       +
        

     

       340
       340
       +
        

     

       341
       341
       +
        def test_suggested_tables_after_on_right_side(completer, complete_event):

     

       342
       342
       +
            text = 'SELECT users.name, orders.id FROM users JOIN orders ON orders.user_id = '

     

       343
       343
       +
            position = len(

     

       344
       344
       +
                'SELECT users.name, orders.id FROM users JOIN orders ON orders.user_id = ')

     

       345
       345
       +
       -    result = set(completer.get_completions(

     

       346
       346
       +
       +    result = list(completer.get_completions(

     

       347
       347
       +
                Document(text=text, cursor_position=position),

     

       348
       348
       +
                complete_event))

     

       349
       349
       +
       -    assert set(result) == set([

     

       350
       350
       +
       -        Completion(text='users', start_position=0),

     

       351
       351
       +
       -        Completion(text='orders', start_position=0)])

     

       352
       352
       +
       +    assert result == list([

     

       353
       353
       +
       +        Completion(text='orders', start_position=0),

     

       354
       354
       +
       +        Completion(text='users', start_position=0)])

     

       355
       355
       +
        

     

       356
       356
       +
        

     

       357
       357
       +
        def test_table_names_after_from(completer, complete_event):

     

       358
       358
       +
            text = 'SELECT * FROM '

     

       359
       359
       +
            position = len('SELECT * FROM ')

     

       360
       360
       +
       -    result = set(completer.get_completions(

     

       361
       361
       +
       +    result = list(completer.get_completions(

     

       362
       362
       +
                Document(text=text, cursor_position=position),

     

       363
       363
       +
                complete_event))

     

       364
       364
       +
       -    assert set(result) == set([

     

       365
       365
       +
       -        Completion(text='users', start_position=0),

     

       366
       366
       +
       -        Completion(text='orders', start_position=0),

     

       367
       367
       +
       +    assert result == list([

     

       368
       368
       +
                Completion(text='`réveillé`', start_position=0),

     

       369
       369
       +
                Completion(text='`select`', start_position=0),

     

       370
       370
       +
       +        Completion(text='orders', start_position=0),

     

       371
       371
       +
       +        Completion(text='users', start_position=0),

     

       372
       372
       +
            ])

     

       373
       373
       +
        

     

       374
       374
       +
        

     

       375
       375
       +
        def test_auto_escaped_col_names(completer, complete_event):

     

       376
       376
       +
            text = 'SELECT  from `select`'

     

       377
       377
       +
            position = len('SELECT ')

     

       378
       378
       +
       -    result = set(completer.get_completions(

     

       379
       379
       +
       +    result = list(completer.get_completions(

     

       380
       380
       +
                Document(text=text, cursor_position=position),

     

       381
       381
       +
                complete_event))

     

       382
       382
       +
       -    assert set(result) == set([

     

       383
       383
       +
       -        Completion(text='`select`', start_position=0),

     

       384
       384
       +
       +    assert result == [

     

       385
       385
       +
                Completion(text='*', start_position=0),

     

       386
       386
       +
       -        Completion(text='id', start_position=0),

     

       387
       387
       +
       +        Completion(text='`ABC`', start_position=0),

     

       388
       388
       +
                Completion(text='`insert`', start_position=0),

     

       389
       389
       +
       -        Completion(text='`ABC`', start_position=0), ] +

     

       390
       390
       +
       -        list(map(Completion, completer.functions)) +

     

       391
       391
       +
       -        list(map(Completion, completer.keywords)))

     

       392
       392
       +
       +        Completion(text='id', start_position=0),

     

       393
       393
       +
       +    ] + \

     

       394
       394
       +
       +        list(map(Completion, completer.functions)) + \

     

       395
       395
       +
       +        [Completion(text='`select`', start_position=0)] + \

     

       396
       396
       +
       +        list(map(Completion, completer.keywords))

     

       397
       397
       +
        

     

       398
       398
       +
        

     

       399
       399
       +
        def test_un_escaped_table_names(completer, complete_event):

     

       400
       400
       +
            text = 'SELECT  from réveillé'

     

       401
       401
       +
            position = len('SELECT ')

     

       402
       402
       +
       -    result = set(completer.get_completions(

     

       403
       403
       +
       +    result = list(completer.get_completions(

     

       404
       404
       +
                Document(text=text, cursor_position=position),

     

       405
       405
       +
                complete_event))

     

       406
       406
       +
       -    assert set(result) == set([

     

       407
       407
       +
       -        Completion(text='réveillé', start_position=0),

     

       408
       408
       +
       +    assert result == list([

     

       409
       409
       +
                Completion(text='*', start_position=0),

     

       410
       410
       +
       -        Completion(text='id', start_position=0),

     

       411
       411
       +
       +        Completion(text='`ABC`', start_position=0),

     

       412
       412
       +
                Completion(text='`insert`', start_position=0),

     

       413
       413
       +
       -        Completion(text='`ABC`', start_position=0), ] +

     

       414
       414
       +
       +        Completion(text='id', start_position=0),

     

       415
       415
       +
       +    ] +

     

       416
       416
       +
                list(map(Completion, completer.functions)) +

     

       417
       417
       +
       +        [Completion(text='réveillé', start_position=0)] +

     

       418
       418
       +
                list(map(Completion, completer.keywords)))

     

       419
       419
       +
        

     

       420
       420
       +
        

     

       421
       421
       +
       @@ -349,10 +354,10 @@ def dummy_list_path(dir_name):

     

       422
       422
       +
        

     

       423
       423
       +
        @patch('mycli.packages.filepaths.list_path', new=dummy_list_path)

     

       424
       424
       +
        @pytest.mark.parametrize('text,expected', [

     

       425
       425
       +
       -    ('source ',  [('~', 0),

     

       426
       426
       +
       -                  ('/', 0),

     

       427
       427
       +
       -                  ('.', 0),

     

       428
       428
       +
       -                  ('..', 0)]),

     

       429
       429
       +
       +    #    ('source ',  [('~', 0),

     

       430
       430
       +
       +    #                  ('/', 0),

     

       431
       431
       +
       +    #                  ('.', 0),

     

       432
       432
       +
       +    #                  ('..', 0)]),

     

       433
       433
       +
            ('source /', [('dir1', 0),

     

       434
       434
       +
                          ('file1.sql', 0),

     

       435
       435
       +
                          ('file2.sql', 0)]),

     

       436
       436
       +
       @@ -363,8 +368,8 @@ def dummy_list_path(dir_name):

     

       437
       437
       +
        ])

     

       438
       438
       +
        def test_file_name_completion(completer, complete_event, text, expected):

     

       439
       439
       +
            position = len(text)

     

       440
       440
       +
       -    result = set(completer.get_completions(

     

       441
       441
       +
       +    result = list(completer.get_completions(

     

       442
       442
       +
                Document(text=text, cursor_position=position),

     

       443
       443
       +
                complete_event))

     

       444
       444
       +
       -    expected = set([Completion(txt, pos) for txt, pos in expected])

     

       445
       445
       +
       +    expected = list((Completion(txt, pos) for txt, pos in expected))

     

       446
       446
       +
            assert result == expected