queryparser-python3 0.7.3__py3-none-any.whl → 0.7.4__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
queryparser/__init__.py CHANGED
@@ -1 +1 @@
1
- __version__ = '0.7.3'
1
+ __version__ = '0.7.4'
@@ -0,0 +1,23 @@
1
+ # -*- coding: utf-8 -*-
2
+ """
3
+ ADQL processor. Its task is to check if a query has any syntax errors and
4
+ to extract all accessed columns as well as keywords and functions being
5
+ used in a query.
6
+
7
+ """
8
+
9
+ from __future__ import absolute_import, print_function
10
+
11
+ __all__ = ["ADQLQueryProcessor"]
12
+
13
+ from ..common import SQLQueryProcessor
14
+ from .ADQLLexer import ADQLLexer
15
+ from .ADQLParser import ADQLParser
16
+ from .ADQLParserListener import ADQLParserListener
17
+
18
+
19
+ class ADQLQueryProcessor(SQLQueryProcessor):
20
+ def __init__(self, query=None):
21
+ super().__init__(
22
+ ADQLLexer, ADQLParser, ADQLParserListener, '"', query
23
+ )
@@ -4,6 +4,7 @@ from __future__ import absolute_import
4
4
 
5
5
  import antlr4
6
6
  from antlr4.error.ErrorListener import ErrorListener
7
+ import re
7
8
 
8
9
  from .ADQLLexer import ADQLLexer
9
10
  from .ADQLParser import ADQLParser
@@ -470,15 +471,6 @@ class ADQLFunctionsTranslationVisitor(ADQLParserVisitor):
470
471
  _remove_children(ctx)
471
472
  self.contexts[ctx] = ctx_text
472
473
 
473
- def visitMath_function(self, ctx):
474
- ctx_text = ctx.getText()
475
- if self.output_sql == 'postgresql' and ctx_text[:5].lower() == 'log10':
476
- _remove_children(ctx)
477
- self.contexts[ctx] = 'LOG' + ctx_text[5:]
478
- elif self.output_sql == 'postgresql' and ctx_text[:3].lower() == 'log':
479
- _remove_children(ctx)
480
- self.contexts[ctx] = 'LN' + ctx_text[3:]
481
-
482
474
 
483
475
  class SelectQueryListener(ADQLParserListener):
484
476
  def __init__(self):
@@ -691,4 +683,9 @@ class ADQLQueryTranslator(object):
691
683
  translator_visitor.visit(self.tree)
692
684
 
693
685
  translated_query = self.translate(translator_visitor)
686
+
687
+ # Translate LOG10 to LOG and LOG to LN. It's not the most elegant solution but it works.
688
+ translated_query = re.sub(r'(?<=[\+\-\*/\(\s,])log\(', 'LN(', translated_query, flags=re.IGNORECASE)
689
+ translated_query = re.sub(r'(?<=[\+\-\*/\(\s,])log10\(', 'LOG(', translated_query, flags=re.IGNORECASE)
690
+
694
691
  return translated_query
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: queryparser-python3
3
- Version: 0.7.3
3
+ Version: 0.7.4
4
4
  Summary: Package for parsing PostgreSQL/MySQL and translating ADQL to PostgreSQL/MySQL.
5
5
  Author-email: Gal Matijevic <gmatijevic@aip.de>
6
6
  Maintainer-email: Kirill Makan <kmakan@aip.de>, Simeon Reusch <sreusch@aip.de>
@@ -1,10 +1,11 @@
1
- queryparser/__init__.py,sha256=i5zhgfscuWC8vabp6pP1S6z_O5355x2aIv0so00_cmo,22
1
+ queryparser/__init__.py,sha256=lBlBxbnftiADKPpC3XRA3jUPjRsVclCd3P95aQ33p_g,22
2
2
  queryparser/adql/ADQLLexer.py,sha256=JVQ_TseEuYMaNr3kHBw50oKMuu4Au1vWak8u1dQAavs,89907
3
3
  queryparser/adql/ADQLParser.py,sha256=_kswLJMJIR9EwMhpS17xRC2hcSZo8O1ygkXlHc7Vd0s,370976
4
4
  queryparser/adql/ADQLParserListener.py,sha256=V80PMXEy6hoQMwRqExOFRvJocH2eBIdR3BbxW1t14Dk,39836
5
5
  queryparser/adql/ADQLParserVisitor.py,sha256=YpDeQorBMJG4AWeBQk7Gxdijmf302WuY83iWu5taOZo,23612
6
6
  queryparser/adql/__init__.py,sha256=QjRobun31YF-F8qf66RtwjRgRgRiQjLIao4jaIE5Lv8,108
7
- queryparser/adql/adqltranslator.py,sha256=6NJnSY9AkW-BrQmo97Td84dNqmTOEN5NXOlt0unlAAQ,25592
7
+ queryparser/adql/adqlprocessor.py,sha256=-ORsp0Oyt5ppzcm6N_eYA0wV_wt8hRdvhs2Ex42zhQc,630
8
+ queryparser/adql/adqltranslator.py,sha256=TWIgdWozd5eMSZMgycwJJ48kBi1PX2XCc7UHzgEKTVM,25514
8
9
  queryparser/common/__init__.py,sha256=k1jnIaxY1TYG8dVXokbsT9Q56msjKRfOSTPEhWbo3GE,214
9
10
  queryparser/common/common.py,sha256=DTX0PXHUvbU5YboXcFrvE18qx5-vOdqx9Hji_m5ts7o,38098
10
11
  queryparser/exceptions/__init__.py,sha256=zVJsC5p3_CfpC0wDdVbS0-HLIbRGz6-xMa5K5_qX82A,247
@@ -20,8 +21,8 @@ queryparser/postgresql/PostgreSQLParserListener.py,sha256=s6nN_aiPJnawUZS5yRDg_s
20
21
  queryparser/postgresql/__init__.py,sha256=Y06UttOdTusJH1hHDdmm1XOwNP1K03c7K1iNJrh7Yyw,123
21
22
  queryparser/postgresql/postgresqllisteners.py,sha256=wCyqDsNPQ2Hl0odXy-ZZmI3HB_6CY7LvwkQDogOLONg,72
22
23
  queryparser/postgresql/postgresqlprocessor.py,sha256=x5qG9A93oGx9hnarnFIevJ1WNBhjc8Ao6v_bizmVpIw,702
23
- queryparser_python3-0.7.3.dist-info/licenses/LICENSE,sha256=oRiVx4r69ZT4QO-yy0V8lx8xhGm_OudJKSjd-Q6NL9Q,25853
24
- queryparser_python3-0.7.3.dist-info/METADATA,sha256=k09HdsySGcAEMVH_WJfwWObZQYCjUJ9pd3FmPbDYEFI,5699
25
- queryparser_python3-0.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
26
- queryparser_python3-0.7.3.dist-info/top_level.txt,sha256=SsQ3yI4UEjGsc6tHaZTmHTdvhAk4Itp5BGQ-J-zvx7U,12
27
- queryparser_python3-0.7.3.dist-info/RECORD,,
24
+ queryparser_python3-0.7.4.dist-info/licenses/LICENSE,sha256=oRiVx4r69ZT4QO-yy0V8lx8xhGm_OudJKSjd-Q6NL9Q,25853
25
+ queryparser_python3-0.7.4.dist-info/METADATA,sha256=NAKUR-tyhuO6IvqxvQvUdOFMAr-3eYYQ-3NhoVmB8NA,5699
26
+ queryparser_python3-0.7.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
27
+ queryparser_python3-0.7.4.dist-info/top_level.txt,sha256=SsQ3yI4UEjGsc6tHaZTmHTdvhAk4Itp5BGQ-J-zvx7U,12
28
+ queryparser_python3-0.7.4.dist-info/RECORD,,