Update sqlparse library to version 0.2.3

Author: tkopets

SQLToolsAPI/lib/sqlparse/__init__.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 """Parse SQL statements."""
 
@@ -17,7 +17,7 @@
 
 from sqlparse.compat import text_type
 
-__version__ = '0.2.1'
+__version__ = '0.2.3'
 __all__ = ['engine', 'filters', 'formatter', 'sql', 'tokens', 'cli']
 
 
@@ -57,7 +57,7 @@ def format(sql, encoding=None, **options):
     options = formatter.validate_options(options)
     stack = formatter.build_filter_stack(stack, options)
     stack.postprocess.append(filters.SerializerUnicode())
-    return ''.join(stack.run(sql, encoding))
+    return u''.join(stack.run(sql, encoding))
 
 
 def split(sql, encoding=None):

SQLToolsAPI/lib/sqlparse/__main__.py

@@ -4,7 +4,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 """Entrypoint module for `python -m sqlparse`.
 

SQLToolsAPI/lib/sqlparse/cli.py

@@ -4,7 +4,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 """Module that contains the command line app.
 
@@ -21,6 +21,8 @@
 
 import argparse
 import sys
+from io import TextIOWrapper
+from codecs import open, getreader
 
 import sqlparse
 from sqlparse.compat import PY2
@@ -118,12 +120,25 @@ def create_parser():
         type=int,
         help='Column after which lists should be wrapped')
 
+    group.add_argument(
+        '--comma_first',
+        dest='comma_first',
+        default=False,
+        type=bool,
+        help='Insert linebreak before comma (default False)')
+
+    group.add_argument(
+        '--encoding',
+        dest='encoding',
+        default='utf-8',
+        help='Specify the input encoding (default utf-8)')
+
     return parser
 
 
 def _error(msg):
     """Print msg and optionally exit with return code exit_."""
-    sys.stderr.write('[ERROR] {0}\n'.format(msg))
+    sys.stderr.write(u'[ERROR] {0}\n'.format(msg))
     return 1
 
 
@@ -132,31 +147,33 @@ def main(args=None):
     args = parser.parse_args(args)
 
     if args.filename == '-':  # read from stdin
-        data = sys.stdin.read()
+        if PY2:
+            data = getreader(args.encoding)(sys.stdin).read()
+        else:
+            data = TextIOWrapper(
+                sys.stdin.buffer, encoding=args.encoding).read()
     else:
         try:
-            # TODO: Needs to deal with encoding
-            data = ''.join(open(args.filename).readlines())
+            data = ''.join(open(args.filename, 'r', args.encoding).readlines())
         except IOError as e:
-            return _error('Failed to read {0}: {1}'.format(args.filename, e))
+            return _error(
+                u'Failed to read {0}: {1}'.format(args.filename, e))
 
     if args.outfile:
         try:
-            stream = open(args.outfile, 'w')
+            stream = open(args.outfile, 'w', args.encoding)
         except IOError as e:
-            return _error('Failed to open {0}: {1}'.format(args.outfile, e))
+            return _error(u'Failed to open {0}: {1}'.format(args.outfile, e))
     else:
         stream = sys.stdout
 
     formatter_opts = vars(args)
     try:
         formatter_opts = sqlparse.formatter.validate_options(formatter_opts)
     except SQLParseError as e:
-        return _error('Invalid options: {0}'.format(e))
+        return _error(u'Invalid options: {0}'.format(e))
 
     s = sqlparse.format(data, **formatter_opts)
-    if PY2:
-        s = s.encode('utf-8', 'replace')
     stream.write(s)
     stream.flush()
     return 0

SQLToolsAPI/lib/sqlparse/compat.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 """Python 2/3 compatibility.
 
@@ -23,35 +23,23 @@
 
 
 if PY3:
-    def u(s, encoding=None):
-        return str(s)
-
-
     def unicode_compatible(cls):
         return cls
 
-
+    bytes_type = bytes
     text_type = str
     string_types = (str,)
     from io import StringIO
     file_types = (StringIO, TextIOBase)
 
 
 elif PY2:
-    def u(s, encoding=None):
-        encoding = encoding or 'unicode-escape'
-        try:
-            return unicode(s)
-        except UnicodeDecodeError:
-            return unicode(s, encoding)
-
-
     def unicode_compatible(cls):
         cls.__unicode__ = cls.__str__
         cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
         return cls
 
-
+    bytes_type = str
     text_type = unicode
     string_types = (str, unicode,)
     from StringIO import StringIO

SQLToolsAPI/lib/sqlparse/engine/__init__.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 from sqlparse.engine import grouping
 from sqlparse.engine.filter_stack import FilterStack

SQLToolsAPI/lib/sqlparse/engine/filter_stack.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 """filter"""
 

SQLToolsAPI/lib/sqlparse/engine/grouping.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 from sqlparse import sql
 from sqlparse import tokens as T
@@ -21,13 +21,13 @@ def _group_matching(tlist, cls):
     for idx, token in enumerate(list(tlist)):
         tidx = idx - tidx_offset
 
-        if token.is_whitespace():
+        if token.is_whitespace:
             # ~50% of tokens will be whitespace. Will checking early
             # for them avoid 3 comparisons, but then add 1 more comparison
             # for the other ~50% of tokens...
             continue
 
-        if token.is_group() and not isinstance(token, cls):
+        if token.is_group and not isinstance(token, cls):
             # Check inside previously grouped (ie. parenthesis) if group
             # of differnt type is inside (ie, case). though ideally  should
             # should check for all open/close tokens at once to avoid recursion
@@ -121,7 +121,7 @@ def valid_prev(token):
 
     def valid_next(token):
         ttypes = T.DML, T.DDL
-        return not imt(token, t=ttypes)
+        return not imt(token, t=ttypes) and token is not None
 
     def post(tlist, pidx, tidx, nidx):
         return pidx, nidx
@@ -246,7 +246,7 @@ def group_comments(tlist):
     tidx, token = tlist.token_next_by(t=T.Comment)
     while token:
         eidx, end = tlist.token_not_matching(
-            lambda tk: imt(tk, t=T.Comment) or tk.is_whitespace(), idx=tidx)
+            lambda tk: imt(tk, t=T.Comment) or tk.is_whitespace, idx=tidx)
         if end is not None:
             eidx, end = tlist.token_prev(eidx, skip_ws=False)
             tlist.group_tokens(sql.Comment, tidx, eidx)
@@ -343,9 +343,9 @@ def group(stmt):
         group_period,
         group_arrays,
         group_identifier,
-        group_operator,
         group_order,
         group_typecasts,
+        group_operator,
         group_as,
         group_aliased,
         group_assignment,
@@ -372,15 +372,15 @@ def _group(tlist, cls, match,
     for idx, token in enumerate(list(tlist)):
         tidx = idx - tidx_offset
 
-        if token.is_whitespace():
+        if token.is_whitespace:
             continue
 
-        if recurse and token.is_group() and not isinstance(token, cls):
+        if recurse and token.is_group and not isinstance(token, cls):
             _group(token, cls, match, valid_prev, valid_next, post, extend)
 
         if match(token):
             nidx, next_ = tlist.token_next(tidx)
-            if valid_prev(prev_) and valid_next(next_):
+            if prev_ and valid_prev(prev_) and valid_next(next_):
                 from_idx, to_idx = post(tlist, pidx, tidx, nidx)
                 grp = tlist.group_tokens(cls, from_idx, to_idx, extend=extend)
 

SQLToolsAPI/lib/sqlparse/engine/statement_splitter.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 from sqlparse import sql, tokens as T
 
@@ -17,7 +17,6 @@ def __init__(self):
     def _reset(self):
         """Set the filter attributes to its default values"""
         self._in_declare = False
-        self._in_dbldollar = False
         self._is_create = False
         self._begin_depth = 0
 
@@ -27,23 +26,6 @@ def _reset(self):
 
     def _change_splitlevel(self, ttype, value):
         """Get the new split level (increase, decrease or remain equal)"""
-        # PostgreSQL
-        if ttype == T.Name.Builtin and value[0] == '$' and value[-1] == '$':
-
-            # 2nd dbldollar found. $quote$ completed
-            # decrease level
-            if self._in_dbldollar:
-                self._in_dbldollar = False
-                return -1
-            else:
-                self._in_dbldollar = True
-                return 1
-
-        # if inside $$ everything inside is defining function character.
-        # Nothing inside can create a new statement
-        elif self._in_dbldollar:
-            return 0
-
         # ANSI
         # if normal token return
         # wouldn't parenthesis increase/decrease a level?

SQLToolsAPI/lib/sqlparse/exceptions.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 """Exceptions used in this package."""
 

SQLToolsAPI/lib/sqlparse/filters/__init__.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2016 Andi Albrecht, [email protected]
 #
 # This module is part of python-sqlparse and is released under
-# the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# the BSD License: https://opensource.org/licenses/BSD-3-Clause
 
 from sqlparse.filters.others import SerializerUnicode
 from sqlparse.filters.others import StripCommentsFilter