Skip to content
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

Allow pinot table aliases #97

Merged
merged 2 commits into from
May 2, 2024
Merged

Allow pinot table aliases #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11aa599
allow pinot table aliases
abloom Apr 22, 2024
f81e5c4
Fix types
abloom Apr 22, 2024
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
7 changes: 2 additions & 5 deletions pinotdb/sqlalchemy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ def visit_select(self, select, **kwargs):
return super().visit_select(select, **kwargs)

def visit_column(self, column, result_map=None, **kwargs):
# Pinot does not support table aliases
if column.table is not None:
column.table.named_with_column = False
result_map = result_map or kwargs.pop("add_to_result_map", None)
# This is a hack to modify the original column, but how do I clone it ?
column.is_literal = True
Expand Down Expand Up @@ -61,7 +58,7 @@ def visit_REAL(self, type_, **kwargs):
return "DOUBLE"

def visit_NUMERIC(self, type_, **kwargs):
return "LONG"
return "NUMERIC"

visit_DECIMAL = visit_NUMERIC
visit_INTEGER = visit_NUMERIC
Expand All @@ -72,7 +69,7 @@ def visit_NUMERIC(self, type_, **kwargs):
visit_DATE = visit_NUMERIC

def visit_CHAR(self, type_, **kwargs):
return "STRING"
return "VARCHAR"

visit_NCHAR = visit_CHAR
visit_VARCHAR = visit_CHAR
Expand Down
28 changes: 14 additions & 14 deletions tests/unit/test_sqlalchemy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ def test_can_select_table_directly(self):

self.assertEqual(
str(compiler),
'SELECT some_column \nFROM some_table',
'SELECT some_table.some_column \nFROM some_table',
)


Expand All @@ -357,44 +357,44 @@ def test_compiles_real(self):
self.assertEqual(self.compiler.visit_REAL(None), 'DOUBLE')

def test_compiles_numeric(self):
self.assertEqual(self.compiler.visit_NUMERIC(None), 'LONG')
self.assertEqual(self.compiler.visit_NUMERIC(None), 'NUMERIC')

def test_compiles_decimal(self):
self.assertEqual(self.compiler.visit_DECIMAL(None), 'LONG')
self.assertEqual(self.compiler.visit_DECIMAL(None), 'NUMERIC')

def test_compiles_integer(self):
self.assertEqual(self.compiler.visit_INTEGER(None), 'LONG')
self.assertEqual(self.compiler.visit_INTEGER(None), 'NUMERIC')

def test_compiles_smallint(self):
self.assertEqual(self.compiler.visit_SMALLINT(None), 'LONG')
self.assertEqual(self.compiler.visit_SMALLINT(None), 'NUMERIC')

def test_compiles_bigint(self):
self.assertEqual(self.compiler.visit_BIGINT(None), 'LONG')
self.assertEqual(self.compiler.visit_BIGINT(None), 'NUMERIC')

# TODO: Check if this is correct (seems strange to have boolean as long).
def test_compiles_boolean(self):
self.assertEqual(self.compiler.visit_BOOLEAN(None), 'LONG')
self.assertEqual(self.compiler.visit_BOOLEAN(None), 'NUMERIC')

def test_compiles_timestamp(self):
self.assertEqual(self.compiler.visit_TIMESTAMP(None), 'LONG')
self.assertEqual(self.compiler.visit_TIMESTAMP(None), 'NUMERIC')

def test_compiles_date(self):
self.assertEqual(self.compiler.visit_DATE(None), 'LONG')
self.assertEqual(self.compiler.visit_DATE(None), 'NUMERIC')

def test_compiles_char(self):
self.assertEqual(self.compiler.visit_CHAR(None), 'STRING')
self.assertEqual(self.compiler.visit_CHAR(None), 'VARCHAR')

def test_compiles_nchar(self):
self.assertEqual(self.compiler.visit_NCHAR(None), 'STRING')
self.assertEqual(self.compiler.visit_NCHAR(None), 'VARCHAR')

def test_compiles_varchar(self):
self.assertEqual(self.compiler.visit_VARCHAR(None), 'STRING')
self.assertEqual(self.compiler.visit_VARCHAR(None), 'VARCHAR')

def test_compiles_nvarchar(self):
self.assertEqual(self.compiler.visit_NVARCHAR(None), 'STRING')
self.assertEqual(self.compiler.visit_NVARCHAR(None), 'VARCHAR')

def test_compiles_text(self):
self.assertEqual(self.compiler.visit_TEXT(None), 'STRING')
self.assertEqual(self.compiler.visit_TEXT(None), 'VARCHAR')

def test_compiles_binary(self):
self.assertEqual(self.compiler.visit_BINARY(None), 'BYTES')
Expand Down
Loading