pytrilogy 0.0.3.73__tar.gz → 0.0.3.75__tar.gz

{pytrilogy-0.0.3.73/pytrilogy.egg-info → pytrilogy-0.0.3.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.73
+Version: 0.0.3.75
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.73
+Version: 0.0.3.75
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/tests/test_functions.py

@@ -8,7 +8,7 @@ from trilogy import Dialects
 from trilogy.constants import logger
 from trilogy.core.enums import Derivation, Purpose
 from trilogy.core.exceptions import InvalidSyntaxException
-from trilogy.core.models.core import DataType, ListType
+from trilogy.core.models.core import ArrayType, DataType
 from trilogy.core.models.environment import Environment
 from trilogy.core.query_processor import process_query
 from trilogy.core.statements.author import SelectStatement
@@ -31,7 +31,7 @@ TEST_DIALECTS = [
 
 
 def test_typing():
-    x = ListType(type=DataType.INTEGER)
+    x = ArrayType(type=DataType.INTEGER)
 
     assert x in set([x])
 
@@ -393,7 +393,7 @@ def test_unnest(test_environment):
         x
     ;"""
     env, parsed = parse(declarations, environment=test_environment)
-    assert env.concepts["int_list"].datatype == ListType(type=DataType.INTEGER)
+    assert env.concepts["int_list"].datatype == ArrayType(type=DataType.INTEGER)
     assert env.concepts["x"].datatype == DataType.INTEGER
 
 

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/tests/test_parsing.py

@@ -524,6 +524,26 @@ address abcdef
 ;
 
 
+select x;
+"""
+    env, parsed = parse_text(text)
+
+    results = Dialects.DUCK_DB.default_executor().generate_sql(text)[0]
+
+    assert '"abcdef" as "test"' in results, results
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x,
+y)
+grain(x)
+address abcdef
+;
+
+
 select x;
 """
     env, parsed = parse_text(text)

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.73"
+__version__ = "0.0.3.75"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/authoring/__init__.py

@@ -37,8 +37,8 @@ from trilogy.core.models.author import (
     WindowType,
 )
 from trilogy.core.models.core import (
+    ArrayType,
     DataType,
-    ListType,
     ListWrapper,
     MapType,
     StructType,
@@ -77,7 +77,7 @@ __all__ = [
     "WindowItemOver",
     "DataType",
     "StructType",
-    "ListType",
+    "ArrayType",
     "Grain",
     "RowsetDerivationStatement",
     "MapType",

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/core/enums.py

@@ -149,6 +149,12 @@ class FunctionType(Enum):
     DATE_LITERAL = "date_literal"
     DATETIME_LITERAL = "datetime_literal"
 
+    # ARRAY
+    ARRAY_DISTINCT = "array_distinct"
+    ARRAY_SUM = "array_sum"
+    ARRAY_SORT = "array_sort"
+    ARRAY_TRANSFORM = "array_transform"
+
     # TEXT AND MAYBE MORE
     SPLIT = "split"
     LENGTH = "len"
@@ -177,6 +183,7 @@ class FunctionType(Enum):
     MAX = "max"
     MIN = "min"
     AVG = "avg"
+    ARRAY_AGG = "array_agg"
 
     # String
     LIKE = "like"
@@ -228,6 +235,7 @@ class FunctionClass(Enum):
         FunctionType.MIN,
         FunctionType.SUM,
         FunctionType.AVG,
+        FunctionType.ARRAY_AGG,
         FunctionType.COUNT,
         FunctionType.COUNT_DISTINCT,
     ]

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/core/functions.py

@@ -25,8 +25,8 @@ from trilogy.core.models.author import (
 )
 from trilogy.core.models.core import (
     CONCRETE_TYPES,
+    ArrayType,
     DataType,
-    ListType,
     MapType,
     NumericType,
     StructType,
@@ -45,14 +45,14 @@ class FunctionConfig:
     valid_inputs: set[DataType] | list[set[DataType]] | None = None
     output_purpose: Purpose | None = None
     output_type: (
-        DataType | ListType | MapType | StructType | NumericType | TraitDataType | None
+        DataType | ArrayType | MapType | StructType | NumericType | TraitDataType | None
     ) = None
     output_type_function: Optional[Callable] = None
 
 
 def get_unnest_output_type(args: list[Any]) -> CONCRETE_TYPES:
     output = arg_to_datatype(args[0])
-    if isinstance(output, (ListType, MapType)):
+    if isinstance(output, (ArrayType, MapType)):
         output = output.value_data_type
     else:
         output = DataType.STRING
@@ -69,12 +69,16 @@ def get_coalesce_output_type(args: list[Any]) -> CONCRETE_TYPES:
     return processed[0]
 
 
+def get_transform_output_type(args: list[Any]) -> CONCRETE_TYPES:
+    return arg_to_datatype(args[2])
+
+
 def get_index_output_type(
     args: list[Any],
 ) -> CONCRETE_TYPES:
     arg = args[0]
     datatype = arg_to_datatype(arg)
-    if isinstance(datatype, ListType):
+    if isinstance(datatype, ArrayType):
         return datatype.value_data_type
     elif isinstance(datatype, MapType):
         return datatype.value_data_type
@@ -184,7 +188,6 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
     FunctionType.UNNEST: FunctionConfig(
         valid_inputs={
             DataType.ARRAY,
-            DataType.LIST,
         },
         output_purpose=Purpose.KEY,
         output_type_function=get_unnest_output_type,
@@ -235,13 +238,12 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
     FunctionType.SPLIT: FunctionConfig(
         valid_inputs={DataType.STRING},
         output_purpose=Purpose.PROPERTY,
-        output_type=ListType(type=DataType.STRING),
+        output_type=ArrayType(type=DataType.STRING),
         arg_count=2,
     ),
     FunctionType.INDEX_ACCESS: FunctionConfig(
         valid_inputs=[
             {
-                DataType.LIST,
                 DataType.ARRAY,
             },
             {
@@ -252,6 +254,43 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=get_index_output_type,
         arg_count=2,
     ),
+    FunctionType.ARRAY_DISTINCT: FunctionConfig(
+        valid_inputs={
+            DataType.ARRAY,
+        },
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=lambda args: get_output_type_at_index(args, 0),
+        arg_count=1,
+    ),
+    FunctionType.ARRAY_SORT: FunctionConfig(
+        valid_inputs=[
+            {DataType.ARRAY},
+            {DataType.STRING},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=lambda args: get_output_type_at_index(args, 0),
+        arg_count=2,
+    ),
+    FunctionType.ARRAY_TRANSFORM: FunctionConfig(
+        valid_inputs=[
+            {
+                DataType.ARRAY,
+            },
+            {*DataType},
+            {*DataType},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=get_transform_output_type,
+        arg_count=3,
+    ),
+    FunctionType.ARRAY_SUM: FunctionConfig(
+        valid_inputs={
+            DataType.ARRAY,
+        },
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=get_index_output_type,
+        arg_count=1,
+    ),
     FunctionType.MAP_ACCESS: FunctionConfig(
         valid_inputs=[
             {
@@ -722,7 +761,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
     FunctionType.ARRAY: FunctionConfig(
         output_purpose=Purpose.PROPERTY,
         arg_count=InfiniteFunctionArgs,
-        output_type=ListType(type=DataType.STRING),
+        output_type=ArrayType(type=DataType.STRING),
     ),
     FunctionType.LENGTH: FunctionConfig(
         valid_inputs={DataType.STRING, DataType.ARRAY, DataType.MAP},
@@ -740,6 +779,14 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_purpose=Purpose.METRIC,
         arg_count=1,
     ),
+    FunctionType.ARRAY_AGG: FunctionConfig(
+        valid_inputs={*DataType},
+        output_purpose=Purpose.METRIC,
+        output_type_function=lambda args: ArrayType(
+            type=merge_datatypes([arg_to_datatype(x) for x in args])
+        ),
+        arg_count=1,
+    ),
     FunctionType.AVG: FunctionConfig(
         valid_inputs={
             DataType.INTEGER,
@@ -837,7 +884,7 @@ def create_function_derived_concept(
     arguments: list[Concept],
     environment: Environment,
     output_type: Optional[
-        DataType | ListType | StructType | MapType | NumericType | TraitDataType
+        DataType | ArrayType | StructType | MapType | NumericType | TraitDataType
     ] = None,
     output_purpose: Optional[Purpose] = None,
 ) -> Concept:

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/core/models/author.py

@@ -48,9 +48,9 @@ from trilogy.core.enums import (
 )
 from trilogy.core.models.core import (
     Addressable,
+    ArrayType,
     DataType,
     DataTyped,
-    ListType,
     ListWrapper,
     MapType,
     MapWrapper,
@@ -104,7 +104,7 @@ class HasUUID(ABC):
 class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
     address: str
     datatype: (
-        DataType | TraitDataType | ListType | StructType | MapType | NumericType
+        DataType | TraitDataType | ArrayType | StructType | MapType | NumericType
     ) = DataType.UNKNOWN
     metadata: Optional["Metadata"] = None
 
@@ -646,7 +646,7 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
                 )
         elif self.operator in (ComparisonOperator.IN, ComparisonOperator.NOT_IN):
             right_type = arg_to_datatype(self.right)
-            if isinstance(right_type, ListType) and not is_compatible_datatype(
+            if isinstance(right_type, ArrayType) and not is_compatible_datatype(
                 arg_to_datatype(self.left), right_type.value_data_type
             ):
                 raise SyntaxError(
@@ -802,7 +802,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         extra="forbid",
     )
     name: str
-    datatype: DataType | TraitDataType | ListType | StructType | MapType | NumericType
+    datatype: DataType | TraitDataType | ArrayType | StructType | MapType | NumericType
     purpose: Purpose
     derivation: Derivation = Derivation.ROOT
     granularity: Granularity = Granularity.MULTI_ROW
@@ -1277,7 +1277,7 @@ class UndefinedConceptFull(Concept, Mergeable, Namespaced):
     name: str
     line_no: int | None = None
     datatype: (
-        DataType | TraitDataType | ListType | StructType | MapType | NumericType
+        DataType | TraitDataType | ArrayType | StructType | MapType | NumericType
     ) = DataType.UNKNOWN
     purpose: Purpose = Purpose.UNKNOWN
 
@@ -1437,10 +1437,10 @@ class WindowItem(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
 
 
 def get_basic_type(
-    type: DataType | ListType | StructType | MapType | NumericType | TraitDataType,
+    type: DataType | ArrayType | StructType | MapType | NumericType | TraitDataType,
 ) -> DataType:
-    if isinstance(type, ListType):
-        return DataType.LIST
+    if isinstance(type, ArrayType):
+        return DataType.ARRAY
     if isinstance(type, StructType):
         return DataType.STRUCT
     if isinstance(type, MapType):
@@ -1609,7 +1609,7 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
     operator: FunctionType
     arg_count: int = Field(default=1)
     output_datatype: (
-        DataType | ListType | StructType | MapType | NumericType | TraitDataType
+        DataType | ArrayType | StructType | MapType | NumericType | TraitDataType
     )
     output_purpose: Purpose
     valid_inputs: Optional[
@@ -2358,9 +2358,10 @@ class Comment(BaseModel):
     text: str
 
 
-class ArgBinding(Namespaced, BaseModel):
+class ArgBinding(Namespaced, DataTyped, BaseModel):
     name: str
     default: Expr | None = None
+    datatype: DataType = DataType.UNKNOWN
 
     def with_namespace(self, namespace):
         return ArgBinding(
@@ -2372,6 +2373,12 @@ class ArgBinding(Namespaced, BaseModel):
             ),
         )
 
+    @property
+    def output_datatype(self):
+        if self.default is not None:
+            return arg_to_datatype(self.default)
+        return self.datatype
+
 
 class CustomType(BaseModel):
     name: str
@@ -2426,7 +2433,7 @@ FuncArgs = (
     | MapWrapper[Any, Any]
     | TraitDataType
     | DataType
-    | ListType
+    | ArrayType
     | MapType
     | NumericType
     | ListWrapper[Any]
@@ -2434,4 +2441,6 @@ FuncArgs = (
     | Comparison
     | Conditional
     | MagicConstants
+    | ArgBinding
+    | Ordering
 )

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/core/models/build.py

@@ -45,6 +45,7 @@ from trilogy.core.models.author import (
     AggregateWrapper,
     AlignClause,
     AlignItem,
+    ArgBinding,
     CaseElse,
     CaseWhen,
     Comparison,
@@ -72,9 +73,9 @@ from trilogy.core.models.author import (
 )
 from trilogy.core.models.core import (
     Addressable,
+    ArrayType,
     DataType,
     DataTyped,
-    ListType,
     ListWrapper,
     MapType,
     MapWrapper,
@@ -791,7 +792,7 @@ class BuildSubselectComparison(BuildComparison):
 class BuildConcept(Addressable, BuildConceptArgs, DataTyped, BaseModel):
     model_config = ConfigDict(extra="forbid")
     name: str
-    datatype: DataType | ListType | StructType | MapType | NumericType
+    datatype: DataType | ArrayType | StructType | MapType | NumericType
     purpose: Purpose
     build_is_aggregate: bool
     derivation: Derivation = Derivation.ROOT
@@ -1083,7 +1084,7 @@ class BuildFunction(DataTyped, BuildConceptArgs, BaseModel):
     operator: FunctionType
     arg_count: int = Field(default=1)
     output_datatype: (
-        DataType | ListType | StructType | MapType | NumericType | TraitDataType
+        DataType | ArrayType | StructType | MapType | NumericType | TraitDataType
     )
     output_purpose: Purpose
     valid_inputs: Optional[
@@ -1102,7 +1103,7 @@ class BuildFunction(DataTyped, BuildConceptArgs, BaseModel):
             MapWrapper[Any, Any],
             TraitDataType,
             DataType,
-            ListType,
+            ArrayType,
             MapType,
             NumericType,
             DatePart,
@@ -2075,7 +2076,7 @@ class Factory:
         return base
 
     @build.register
-    def _(self, base: ListType):
+    def _(self, base: ArrayType):
         return base
 
     @build.register
@@ -2086,6 +2087,14 @@ class Factory:
     def _(self, base: MapType):
         return base
 
+    @build.register
+    def _(self, base: ArgBinding):
+        return base
+
+    @build.register
+    def _(self, base: Ordering):
+        return base
+
     @build.register
     def _(self, base: Datasource):
         local_cache: dict[str, BuildConcept] = {}

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/core/models/core.py

@@ -27,6 +27,7 @@ from pydantic_core import core_schema
 from trilogy.constants import (
     MagicConstants,
 )
+from trilogy.core.enums import Ordering
 
 
 class DataTyped(ABC):
@@ -53,7 +54,7 @@ class Addressable(ABC):
 TYPEDEF_TYPES = Union[
     "DataType",
     "MapType",
-    "ListType",
+    "ArrayType",
     "NumericType",
     "StructType",
     "DataTyped",
@@ -63,7 +64,7 @@ TYPEDEF_TYPES = Union[
 CONCRETE_TYPES = Union[
     "DataType",
     "MapType",
-    "ListType",
+    "ArrayType",
     "NumericType",
     "StructType",
     "TraitDataType",
@@ -79,7 +80,6 @@ class DataType(Enum):
     STRING = "string"
     BOOL = "bool"
     MAP = "map"
-    LIST = "list"
     NUMBER = "number"
     FLOAT = "float"
     NUMERIC = "numeric"
@@ -105,7 +105,7 @@ class DataType(Enum):
 
 
 class TraitDataType(BaseModel):
-    type: DataType | NumericType | StructType | ListType | MapType
+    type: DataType | NumericType | StructType | ArrayType | MapType
     traits: list[str]
 
     def __hash__(self):
@@ -146,7 +146,7 @@ class NumericType(BaseModel):
         return self.data_type.value
 
 
-class ListType(BaseModel):
+class ArrayType(BaseModel):
     model_config = ConfigDict(frozen=True)
     type: TYPEDEF_TYPES
 
@@ -159,7 +159,7 @@ class ListType(BaseModel):
 
     @property
     def data_type(self):
-        return DataType.LIST
+        return DataType.ARRAY
 
     @property
     def value(self):
@@ -340,9 +340,9 @@ def dict_to_map_wrapper(arg):
 
 def merge_datatypes(
     inputs: list[
-        DataType | ListType | StructType | MapType | NumericType | TraitDataType
+        DataType | ArrayType | StructType | MapType | NumericType | TraitDataType
     ],
-) -> DataType | ListType | StructType | MapType | NumericType | TraitDataType:
+) -> DataType | ArrayType | StructType | MapType | NumericType | TraitDataType:
     """This is a temporary hack for doing between
     allowable datatype transformation matrix"""
     if len(inputs) == 1:
@@ -393,6 +393,8 @@ def arg_to_datatype(arg) -> CONCRETE_TYPES:
         raise ValueError(f"Cannot parse arg datatype for arg of type {arg}")
     elif isinstance(arg, bool):
         return DataType.BOOL
+    elif isinstance(arg, Ordering):
+        return DataType.STRING  # TODO: revisit
     elif isinstance(arg, int):
         return DataType.INTEGER
     elif isinstance(arg, str):
@@ -404,14 +406,14 @@ def arg_to_datatype(arg) -> CONCRETE_TYPES:
     elif isinstance(arg, TraitDataType):
         return arg
     elif isinstance(arg, ListWrapper):
-        return ListType(type=arg.type)
+        return ArrayType(type=arg.type)
     elif isinstance(arg, DataTyped):
         return arg.output_datatype
     elif isinstance(arg, TupleWrapper):
-        return ListType(type=arg.type)
+        return ArrayType(type=arg.type)
     elif isinstance(arg, list):
         wrapper = list_to_wrapper(arg)
-        return ListType(type=wrapper.type)
+        return ArrayType(type=wrapper.type)
     elif isinstance(arg, MapWrapper):
         return MapType(key_type=arg.key_type, value_type=arg.value_type)
     elif isinstance(arg, datetime):

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/core/processing/utility.py

@@ -33,8 +33,8 @@ from trilogy.core.models.build import (
 )
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.models.core import (
+    ArrayType,
     DataType,
-    ListType,
     ListWrapper,
     MapType,
     MapWrapper,
@@ -471,7 +471,7 @@ def is_scalar_condition(
         | TraitDataType
         | DataType
         | MapWrapper[Any, Any]
-        | ListType
+        | ArrayType
         | MapType
         | NumericType
         | DatePart

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/dialect/base.py

@@ -15,10 +15,12 @@ from trilogy.core.enums import (
     ComparisonOperator,
     DatePart,
     FunctionType,
+    Ordering,
     UnnestMode,
     WindowType,
 )
 from trilogy.core.internal import DEFAULT_CONCEPTS
+from trilogy.core.models.author import ArgBinding
 from trilogy.core.models.build import (
     BuildAggregateWrapper,
     BuildCaseElse,
@@ -37,8 +39,8 @@ from trilogy.core.models.build import (
     BuildWindowItem,
 )
 from trilogy.core.models.core import (
+    ArrayType,
     DataType,
-    ListType,
     ListWrapper,
     MapType,
     MapWrapper,
@@ -142,11 +144,11 @@ DATATYPE_MAP: dict[DataType, str] = {
     DataType.MAP: "map",
     DataType.DATE: "date",
     DataType.DATETIME: "datetime",
-    DataType.LIST: "list",
+    DataType.ARRAY: "list",
 }
 
 COMPLEX_DATATYPE_MAP = {
-    DataType.LIST: lambda x: f"{x}[]",
+    DataType.ARRAY: lambda x: f"{x}[]",
 }
 
 
@@ -182,6 +184,13 @@ FUNCTION_MAP = {
     FunctionType.ARRAY: lambda x: f"[{', '.join(x)}]",
     FunctionType.DATE_LITERAL: lambda x: f"date '{x}'",
     FunctionType.DATETIME_LITERAL: lambda x: f"datetime '{x}'",
+    # ARRAY
+    FunctionType.ARRAY_SUM: lambda x: f"array_sum({x[0]})",
+    FunctionType.ARRAY_DISTINCT: lambda x: f"array_distinct({x[0]})",
+    FunctionType.ARRAY_SORT: lambda x: f"array_sort({x[0]})",
+    FunctionType.ARRAY_TRANSFORM: lambda args: (
+        f"array_transform({args[0]}, {args[1]} -> {args[2]})"
+    ),
     # math
     FunctionType.ADD: lambda x: " + ".join(x),
     FunctionType.ABS: lambda x: f"abs({x[0]})",
@@ -198,6 +207,7 @@ FUNCTION_MAP = {
     FunctionType.COUNT_DISTINCT: lambda x: f"count(distinct {x[0]})",
     FunctionType.COUNT: lambda x: f"count({x[0]})",
     FunctionType.SUM: lambda x: f"sum({x[0]})",
+    FunctionType.ARRAY_AGG: lambda x: f"array_agg({x[0]})",
     FunctionType.LENGTH: lambda x: f"length({x[0]})",
     FunctionType.AVG: lambda x: f"avg({x[0]})",
     FunctionType.MAX: lambda x: f"max({x[0]})",
@@ -569,7 +579,7 @@ class BaseDialect:
             MapType,
             NumericType,
             StructType,
-            ListType,
+            ArrayType,
             ListWrapper[Any],
             TupleWrapper[Any],
             DatePart,
@@ -749,8 +759,12 @@ class BaseDialect:
             return self.FUNCTION_MAP[FunctionType.DATETIME_LITERAL](e)
         elif isinstance(e, TraitDataType):
             return self.render_expr(e.type, cte=cte, cte_map=cte_map)
-        elif isinstance(e, ListType):
-            return f"{self.COMPLEX_DATATYPE_MAP[DataType.LIST](self.render_expr(e.value_data_type, cte=cte, cte_map=cte_map))}"
+        elif isinstance(e, ArgBinding):
+            return e.name
+        elif isinstance(e, Ordering):
+            return str(e.value)
+        elif isinstance(e, ArrayType):
+            return f"{self.COMPLEX_DATATYPE_MAP[DataType.ARRAY](self.render_expr(e.value_data_type, cte=cte, cte_map=cte_map))}"
         elif isinstance(e, BuildParamaterizedConceptReference):
             if self.rendering.parameters:
                 if e.concept.namespace == DEFAULT_NAMESPACE:

{pytrilogy-0.0.3.73 → pytrilogy-0.0.3.75}/trilogy/dialect/duckdb.py

@@ -23,6 +23,16 @@ def generate_regex_extract(x: list[str]) -> str:
     return f"REGEXP_EXTRACT({x[0]},{x[1]},{x[2]})"
 
 
+def render_sort(args):
+    if len(args) == 1:
+        return f"list_sort({args[0]})"
+    order = args[1].split(" ", 1)
+    if len(order) == 1:
+        return f"list_sort({args[0]}, '{order[0]}')"
+    elif len(order) == 2:
+        return f"list_sort({args[0]}, '{order[0]}', '{order[1]}')"
+
+
 FUNCTION_MAP = {
     FunctionType.COUNT: lambda args: f"count({args[0]})",
     FunctionType.SUM: lambda args: f"sum({args[0]})",
@@ -39,6 +49,14 @@ FUNCTION_MAP = {
     ),
     ## Duckdb indexes from 1, not 0
     FunctionType.INDEX_ACCESS: lambda args: (f"{args[0]}[{args[1]}]"),
+    ## Duckdb uses list for array
+    FunctionType.ARRAY_DISTINCT: lambda args: f"list_distinct({args[0]})",
+    FunctionType.ARRAY_SUM: lambda args: f"list_sum({args[0]})",
+    FunctionType.ARRAY_SORT: render_sort,
+    FunctionType.ARRAY_TRANSFORM: lambda args: (
+        f"list_transform({args[0]}, {args[1]} -> {args[2]})"
+    ),
+    FunctionType.ARRAY_AGG: lambda args: f"array_agg({args[0]})",
     # datetime is aliased
     FunctionType.CURRENT_DATETIME: lambda x: "cast(get_current_timestamp() as datetime)",
     FunctionType.DATE: lambda x: f"cast({x[0]} as date)",