From 1ba5e435d6b3e3663eed371aef5b95f11212c973 Mon Sep 17 00:00:00 2001 From: Laser Kaplan Date: Wed, 27 Dec 2023 10:11:50 -0500 Subject: [PATCH] Add a generic function compiler to handle IGNORE NULLS in window functions pre-commit fix sqla 1.3 test fix just skip for sqla 1.3 Add test for ignore_nulls=False --- tests/unit/sqlalchemy/test_compiler.py | 40 +++++++++++++++++++++++++- trino/sqlalchemy/compiler.py | 37 ++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/tests/unit/sqlalchemy/test_compiler.py b/tests/unit/sqlalchemy/test_compiler.py index 1051bf3d..872f4a35 100644 --- a/tests/unit/sqlalchemy/test_compiler.py +++ b/tests/unit/sqlalchemy/test_compiler.py @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import pytest -from sqlalchemy import Column, Integer, MetaData, String, Table, insert, select +from sqlalchemy import Column, Integer, MetaData, String, Table, func, insert, select from sqlalchemy.schema import CreateTable from sqlalchemy.sql import column, table @@ -113,3 +113,41 @@ def test_table_clause(dialect): statement = select(table("user", column("id"), column("name"), column("description"))) query = statement.compile(dialect=dialect) assert str(query) == 'SELECT user.id, user.name, user.description \nFROM user' + + +@pytest.mark.skipif( + sqlalchemy_version() < "1.4", + reason="columns argument to select() must be a Python list or other iterable" +) +@pytest.mark.parametrize( + 'function,element', + [ + ('first_value', func.first_value), + ('last_value', func.last_value), + ('nth_value', func.nth_value), + ('lead', func.lead), + ('lag', func.lag), + ] +) +def test_ignore_nulls(dialect, function, element): + statement = select( + element( + table_without_catalog.c.id, + ignore_nulls=True, + ).over(partition_by=table_without_catalog.c.name).label('window') + ) + query = statement.compile(dialect=dialect) + assert str(query) == \ + f'SELECT {function}("table".id) IGNORE NULLS OVER (PARTITION BY "table".name) AS window '\ + f'\nFROM "table"' + + statement = select( + element( + table_without_catalog.c.id, + ignore_nulls=False, + ).over(partition_by=table_without_catalog.c.name).label('window') + ) + query = statement.compile(dialect=dialect) + assert str(query) == \ + f'SELECT {function}("table".id) OVER (PARTITION BY "table".name) AS window ' \ + f'\nFROM "table"' diff --git a/trino/sqlalchemy/compiler.py b/trino/sqlalchemy/compiler.py index fef6beb1..1d94130e 100644 --- a/trino/sqlalchemy/compiler.py +++ b/trino/sqlalchemy/compiler.py @@ -9,8 +9,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from sqlalchemy.ext.compiler import compiles from sqlalchemy.sql import compiler, sqltypes from sqlalchemy.sql.base import DialectKWArgs +from sqlalchemy.sql.functions import GenericFunction # https://trino.io/docs/current/language/reserved.html RESERVED_WORDS = { @@ -137,6 +139,41 @@ def _render_json_extract_from_binary(self, binary, operator, **kw): self.process(binary.left, **kw), self.process(binary.right, **kw), ) + + class GenericIgnoreNulls(GenericFunction): + ignore_nulls = False + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + if kwargs.get('ignore_nulls'): + self.ignore_nulls = True + + class FirstValue(GenericIgnoreNulls): + name = 'first_value' + + class LastValue(GenericIgnoreNulls): + name = 'last_value' + + class NthValue(GenericIgnoreNulls): + name = 'nth_value' + + class Lead(GenericIgnoreNulls): + name = 'lead' + + class Lag(GenericIgnoreNulls): + name = 'lag' + + @staticmethod + @compiles(FirstValue) + @compiles(LastValue) + @compiles(NthValue) + @compiles(Lead) + @compiles(Lag) + def compile_ignore_nulls(element, compiler, **kwargs): + compiled = f'{element.name}({compiler.process(element.clauses)})' + if element.ignore_nulls: + compiled += ' IGNORE NULLS' + return compiled class TrinoDDLCompiler(compiler.DDLCompiler):