Skip to content

Preserve scientific literals with positive exponent signs #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eric3-jp wants to merge 1 commit into from
+9 −1
Closed

Preserve scientific literals with positive exponent signs #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sqlparse/keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def find_delimited_spans(text):
(r'(?<=\.)[A-ZÀ-Ü]\w*', tokens.Name), # .'Name'
(r'[A-ZÀ-Ü]\w*(?=\()', tokens.Name), # side effect: change kw to func
(r'-?0x[\dA-F]+', tokens.Number.Hexadecimal),
(r'-?\d+(\.\d+)?E-?\d+', tokens.Number.Float),
(r'-?\d+(\.\d+)?E[+-]?\d+', tokens.Number.Float),
(r'(?![_A-ZÀ-Ü])-?(\d+(\.\d*)|\.\d+)(?![_A-ZÀ-Ü])',
tokens.Number.Float),
(r'(?![_A-ZÀ-Ü])-?\d+(?![_A-ZÀ-Ü])', tokens.Number.Integer),
Expand Down
4 changes: 4 additions & 0 deletions tests/test_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ class TestSpacesAroundOperators:
def formatter(sql):
return sqlparse.format(sql, use_space_around_operators=True)

@pytest.mark.parametrize('number', ['1e+3', '1E+3', '1.25e+3', '-1.25E+3'])
def test_preserves_positive_exponents(self, number):
assert self.formatter(f'SELECT {number}*2') == f'SELECT {number} * 2'

def test_basic(self):
sql = ('select a+b as d from table '
'where (c-d)%2= 1 and e> 3.0/4 and z^2 <100')
Expand Down
4 changes: 4 additions & 0 deletions tests/test_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ def test_placeholder(ph):
('6.67428E-8', T.Number.Float),
('1.988e33', T.Number.Float),
('1e-12', T.Number.Float),
('1e+3', T.Number.Float),
('1E+3', T.Number.Float),
('1.25e+3', T.Number.Float),
('-1.25E+3', T.Number.Float),
('e1', None),
])
def test_scientific_numbers(num, expected):
Expand Down