← Back to branch summary

~ubuntu-branches/debian/sid/sqlalchemy/sid

« back to all changes in this revision

Viewing changes to lib/sqlalchemy/dialects/mysql/base.py

  • Committer: Package Import Robot
  • Author(s): Piotr Ożarowski
  • Date: 2014-06-27 20:17:13 UTC
  • mfrom: (1.4.28)
  • Revision ID: package-import@ubuntu.com-20140627201713-g6p1kq8q1qenztrv
Tags: 0.9.6-1
http://bugs.debian.org/747852
http://bugs.debian.org/752145
* New upstream release
* Remove Python 3.X build tag files, thanks to Matthias Urlichs for the
  patch (closes: #747852)
* python-fdb isn't in the Debian archive yet so default dialect for firebird://
  URLs is changed to obsolete kinterbasdb, thanks to Russell Stuart for the
  patch (closes: #752145)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/sqlalchemy/dialects/mysql/base.py
1725
1725
                # length value can be a (column_name --> integer value) mapping
1726
1726
                # specifying the prefix length for each column of the index
1727
1727
                columns = ', '.join(
1728
 
                    ('%s(%d)' % (col, length[col])
1729
 
                     if col in length else '%s' % col)
1730
 
                    for col in columns
 
1728
                    '%s(%d)' % (expr, length[col.name]) if col.name in length
 
1729
                    else
 
1730
                    (
 
1731
                        '%s(%d)' % (expr, length[expr]) if expr in length
 
1732
                        else '%s' % expr
 
1733
                    )
 
1734
                    for col, expr in zip(index.expressions, columns)
1731
1735
                )
1732
1736
            else:
1733
1737
                # or can be an integer value specifying the same
2951
2955
            r'(?: +USING +(?P<using_pre>\S+))?'
2952
2956
            r' +\((?P<columns>.+?)\)'
2953
2957
            r'(?: +USING +(?P<using_post>\S+))?'
2954
 
            r'(?: +KEY_BLOCK_SIZE +(?P<keyblock>\S+))?'
 
2958
            r'(?: +KEY_BLOCK_SIZE *[ =]? *(?P<keyblock>\S+))?'
2955
2959
            r'(?: +WITH PARSER +(?P<parser>\S+))?'
2956
2960
            r',?$'
2957
2961
            % quotes