pytrilogy 0.0.3.113__py3-none-any.whl → 0.0.3.115__py3-none-any.whl

{pytrilogy-0.0.3.113.dist-info → pytrilogy-0.0.3.115.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.113
+Version: 0.0.3.115
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.113.dist-info → pytrilogy-0.0.3.115.dist-info}/RECORD

@@ -1,6 +1,6 @@
-pytrilogy-0.0.3.113.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=lAuWMqhwvK53mopDwiFjvqXcgCmF97vD3MVcY8Npwq4,304
-trilogy/constants.py,sha256=g_zkVCNjGop6coZ1kM8eXXAzCnUN22ldx3TYFz0E9sc,1747
+pytrilogy-0.0.3.115.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=L11AizxIDnbCCjCvAE55VTsy0d4QmvAZfNp61uAPu00,304
+trilogy/constants.py,sha256=2ERigKZBmULg3Qr43nWKgdwqiCnT8XPQVeH-O-k66wc,2640
 trilogy/engine.py,sha256=v4TpNktM4zZ9OX7jZH2nde4dpX5uAH2U23ELfULTCSg,2280
 trilogy/executor.py,sha256=q3EsAjzgxNxPn-yTHD_FTFzm7bJ2mlf9CrJEjyt6-pE,17884
 trilogy/parser.py,sha256=o4cfk3j3yhUFoiDKq9ZX_GjBF3dKhDjXEwb63rcBkBM,293
@@ -23,20 +23,20 @@ trilogy/ai/providers/utils.py,sha256=yttP6y2E_XzdytBCwhaKekfXfxM6gE6MRce4AtyLL60
 trilogy/authoring/__init__.py,sha256=TABMOETSMERrWuyDLR0nK4ISlqR0yaqeXrmuOdrSvAY,3060
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=nizWYDCJQ1bigQMtkNIEMNTcN0NoEAXiIHLzpelxQ24,201
-trilogy/core/enums.py,sha256=B0EbyjIBFl5SaP0J3lHIqudgy16fXCf9rlr16yxk6kk,8933
+trilogy/core/enums.py,sha256=R_iNsK8j0uGJ5fzfFUwoe1vhIHTX28VJfDQd99WBQ4E,9064
 trilogy/core/env_processor.py,sha256=H-rr2ALj31l5oh3FqeI47Qju6OOfiXBacXNJGNZ92zQ,4521
 trilogy/core/environment_helpers.py,sha256=TRlqVctqIRBxzfjRBmpQsAVoiCcsEKBhG1B6PUE0l1M,12743
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=axkVXYJYQXCCwMHwlyDA232g4tCOwdCZUt7eHeUMDMg,2829
-trilogy/core/functions.py,sha256=966xC6ypgzWwCs4BvORFwzWEMJoVlqvH2biipkIYl4E,34005
+trilogy/core/functions.py,sha256=hURJBM5dNcHfXuPHaHM_tz_ahsEktnmL4At0zebfjMk,34668
 trilogy/core/graph_models.py,sha256=4EWFTHGfYd72zvS2HYoV6hm7nMC_VEd7vWr6txY-ig0,3400
 trilogy/core/internal.py,sha256=r9QagDB2GvpqlyD_I7VrsfbVfIk5mnok2znEbv72Aa4,2681
 trilogy/core/optimization.py,sha256=Km0ITEx9n6Iv5ReX6tm4uXO5uniSv_ooahycNNiET3g,9212
 trilogy/core/query_processor.py,sha256=rMrtLSQxVm7yeyh0nWjDNI9nnu4Xi0NgHvBJ14gvu4I,20384
 trilogy/core/utility.py,sha256=3VC13uSQWcZNghgt7Ot0ZTeEmNqs__cx122abVq9qhM,410
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/models/author.py,sha256=YXom_XC-wdcZmJ2PexWCrJ2Slr3FnrxA__X4ayc_A8w,81792
-trilogy/core/models/build.py,sha256=iqk_-3plxX1BdxvUCTebqE9F3x62f40neKGf6Ld4VVU,70858
+trilogy/core/models/author.py,sha256=DFpIGlIruz0JYIOLJ0qZQrsdT4BvQX0augow1G8pD54,81841
+trilogy/core/models/build.py,sha256=LN8G1JRk8RDSFQwqS3CUszIIUgB5v9Nxy6EpxvAcJ1A,71514
 trilogy/core/models/build_environment.py,sha256=mpx7MKGc60fnZLVdeLi2YSREy7eQbQYycCrP4zF-rHU,5258
 trilogy/core/models/core.py,sha256=iT9WdZoiXeglmUHWn6bZyXCTBpkApTGPKtNm_Mhbu_g,12987
 trilogy/core/models/datasource.py,sha256=wogTevZ-9CyUW2a8gjzqMCieircxi-J5lkI7EOAZnck,9596
@@ -48,9 +48,9 @@ trilogy/core/optimizations/hide_unused_concept.py,sha256=DbsP8NqQOxmPv9omDOoFNPU
 trilogy/core/optimizations/inline_datasource.py,sha256=2sWNRpoRInnTgo9wExVT_r9RfLAQHI57reEV5cGHUcg,4329
 trilogy/core/optimizations/predicate_pushdown.py,sha256=5ubatgq1IwWQ4L2FDt4--y168YLuGP-vwqH0m8IeTIw,9786
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=-iC2CLALmSrOglMKZM4TslVncyOrJbUH0V_COmbqHIw,22681
-trilogy/core/processing/discovery_node_factory.py,sha256=p23jiiHyhrW-Q8ndbnRlqMHJKT8ZqPOA89SzE4xaFFo,15445
-trilogy/core/processing/discovery_utility.py,sha256=BfzeliD0CQ3x3MRLpw3msibGc7rOPh8aH_gbfuchAIs,13352
+trilogy/core/processing/concept_strategies_v3.py,sha256=Y6AG10NGU_mUiTfXmxkss7QSO5iLpOdzGN6-7Hc5XiQ,23294
+trilogy/core/processing/discovery_node_factory.py,sha256=llnLxZo1NqBRIuuPz0GUohym6LZFhVkPT3xSiORi3k4,15446
+trilogy/core/processing/discovery_utility.py,sha256=mO0npZMRlQSzxt3l4m8garKBAOrXFkzt3eiiUyUSoIU,13528
 trilogy/core/processing/discovery_validation.py,sha256=eZ4HfHMpqZLI8MGG2jez8arS8THs6ceuVrQFIY6gXrU,5364
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
 trilogy/core/processing/utility.py,sha256=ESs6pKqVP2c9eMdfB2JNjw7D7YnoezVwbLFx1D6OUYA,26088
@@ -58,7 +58,7 @@ trilogy/core/processing/node_generators/__init__.py,sha256=iVJ-crowPxYeut-hFjyEj
 trilogy/core/processing/node_generators/basic_node.py,sha256=rv53il-W633by0plvbN5qaqznJfl60yPinLZGBAC_MI,5707
 trilogy/core/processing/node_generators/common.py,sha256=xF32Kf6B08dZgKs2SOow1HomptSiSC057GCUCHFlS5s,9464
 trilogy/core/processing/node_generators/constant_node.py,sha256=LfpDq2WrBRZ3tGsLxw77LuigKfhbteWWh9L8BGdMGwk,1146
-trilogy/core/processing/node_generators/filter_node.py,sha256=cJ5od1fAfvalaUDO2O4Y6Yrr2RukOCqey7f3zrKSBbI,10808
+trilogy/core/processing/node_generators/filter_node.py,sha256=EiP_tafx-X0gM-BIVRCy2rnp1_apt2cbhVfv8cg9dVg,11259
 trilogy/core/processing/node_generators/group_node.py,sha256=sIm1QYrF4EY6sk56A48B6MieCZqvaJLSQebih_aiKnQ,8567
 trilogy/core/processing/node_generators/group_to_node.py,sha256=jKcNCDOY6fNblrdZwaRU0sbUSr9H0moQbAxrGgX6iGA,3832
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=dHPDoSKU0FF6Ue_t_LkZxTd0Q-Sf-EpYdsMYdyUlFQc,7120
@@ -69,7 +69,7 @@ trilogy/core/processing/node_generators/select_merge_node.py,sha256=9MZdQJtkoe5N
 trilogy/core/processing/node_generators/select_node.py,sha256=Ta1G39V94gjX_AgyZDz9OqnwLz4BjY3D6Drx9YpziMQ,3555
 trilogy/core/processing/node_generators/synonym_node.py,sha256=AnAsa_Wj50NJ_IK0HSgab_7klYmKVrv0WI1uUe-GvEY,3766
 trilogy/core/processing/node_generators/union_node.py,sha256=NxQbnRRoYMI4WjMeph41yk4E6yipj53qdGuNt-Mozxw,2818
-trilogy/core/processing/node_generators/unnest_node.py,sha256=u_hVHFYMz-ZylDdHH9mhFSRpxuKcTGvrrOP0rxrY_Xg,3901
+trilogy/core/processing/node_generators/unnest_node.py,sha256=Q9E6MF6uVLqP15tlx_Bwa6mIWSNW68LJpkSYyr_TArs,6229
 trilogy/core/processing/node_generators/window_node.py,sha256=wNvmumGO6AIQ7C9bDUYYZ6LJvDvPQPfFVX82pTxjV-k,6767
 trilogy/core/processing/node_generators/select_helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/processing/node_generators/select_helpers/datasource_injection.py,sha256=m2YQ4OmG0N2O61a7NEq1ZzbTa7JsCC00lxB2ymjcYRI,8224
@@ -84,7 +84,7 @@ trilogy/core/processing/nodes/union_node.py,sha256=hLAXXVWqEgMWi7dlgSHfCF59fon64
 trilogy/core/processing/nodes/unnest_node.py,sha256=oLKMMNMx6PLDPlt2V5neFMFrFWxET8r6XZElAhSNkO0,2181
 trilogy/core/processing/nodes/window_node.py,sha256=JXJ0iVRlSEM2IBr1TANym2RaUf_p5E_l2sNykRzXWDo,1710
 trilogy/core/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/statements/author.py,sha256=w_d55It4zs8qBMyEGxRyUjgMX0U3AQojG_GJ587UgrM,16414
+trilogy/core/statements/author.py,sha256=zLd-1IZKF5UE7oWQYqifn3b3JcW2wCbonlELjJiZhfo,16436
 trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/statements/common.py,sha256=VnVLULQg1TJLNUFzJaROT1tsf2ewk3IpuhvZaP36R6A,535
 trilogy/core/statements/execute.py,sha256=kiwJcVeMa4wZR-xLfM2oYOJ9DeyJkP8An38WFyJxktM,2413
@@ -95,7 +95,7 @@ trilogy/core/validation/datasource.py,sha256=nJeEFyb6iMBwlEVdYVy1vLzAbdRZwOsUjGx
 trilogy/core/validation/environment.py,sha256=ymvhQyt7jLK641JAAIQkqjQaAmr9C5022ILzYvDgPP0,2835
 trilogy/core/validation/fix.py,sha256=Z818UFNLxndMTLiyhB3doLxIfnOZ-16QGvVFWuD7UsA,3750
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=B_zjQ6HyOQEW0iRGgGBjhqJ1Xr-KODk1fUBZDAWfE54,50798
+trilogy/dialect/base.py,sha256=Eo8n5fJiHOYkfDDDFgnrqMuIZTxRorWwVer_1-DRG4c,51178
 trilogy/dialect/bigquery.py,sha256=XS3hpybeowgfrOrkycAigAF3NX2YUzTzfgE6f__2fT4,4316
 trilogy/dialect/common.py,sha256=I5Ku_TR5MwJTB3ZhcQenrtvXhH2RvTQ8wQe9w5lfkfA,5708
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
@@ -113,13 +113,13 @@ trilogy/hooks/graph_hook.py,sha256=5BfR7Dt0bgEsCLgwjowgCsVkboGYfVJGOz8g9mqpnos,4
 trilogy/hooks/query_debugger.py,sha256=1npRjww94sPV5RRBBlLqMJRaFkH9vhEY6o828MeoEcw,5583
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=alayr5yy6MZOLTnw8CKLtxU2drtzbq4bKteQWfTw9QU,32281
+trilogy/parsing/common.py,sha256=r9EmWzN2ozMKtWCY1HfjOREJnLKvaURT6h6edS5U4x8,32508
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=Xwwsv2C9kSNv2q-HrrKC1f60JNHShXcCMzstTSEbiCw,154
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=p758ukVifI_ygWp-1vJIy3X5NZVmwpNbbxVDfbkkTbU,82253
-trilogy/parsing/render.py,sha256=FhSU3-bMA0YM3oEn6nfpfjbM74nvH2r1TtFgbWNzOsM,24204
-trilogy/parsing/trilogy.lark,sha256=EN0Nrwz8cagzt69O85VSteW-k30lj8U5bRtXetM0JiU,16671
+trilogy/parsing/parse_engine.py,sha256=lMo73QD37ih5kgvAOToMLCBbCkBzo_G7QMOaQaHprV8,84333
+trilogy/parsing/render.py,sha256=k7MNp8EBTqVBSVqFlgTHSwIhfSKLyJfSeb2fSbt9dVA,24307
+trilogy/parsing/trilogy.lark,sha256=kPOIrwa__kdXvxS3uM5GzdlgIa2cQxNW_0DNRqsRBeg,16939
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
 trilogy/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -132,8 +132,8 @@ trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
 trilogy/std/net.preql,sha256=WZCuvH87_rZntZiuGJMmBDMVKkdhTtxeHOkrXNwJ1EE,416
 trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.113.dist-info/METADATA,sha256=4Ix5np1ZL_PCT0B6i4e8mazXdFNvRkpHznssca1beeI,12911
-pytrilogy-0.0.3.113.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytrilogy-0.0.3.113.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.113.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.113.dist-info/RECORD,,
+pytrilogy-0.0.3.115.dist-info/METADATA,sha256=pB3OdY3t5s8GkX73rniQKQkMSy8JcXjzKZ0w1va3k5E,12911
+pytrilogy-0.0.3.115.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.115.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.115.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.115.dist-info/RECORD,,

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.113"
+__version__ = "0.0.3.115"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/constants.py

@@ -1,7 +1,9 @@
 import random
+from contextlib import contextmanager
 from dataclasses import dataclass, field
 from enum import Enum
 from logging import getLogger
+from typing import Any
 
 logger = getLogger("trilogy")
 
@@ -50,6 +52,32 @@ class Rendering:
     parameters: bool = True
     concise: bool = False
 
+    @contextmanager
+    def temporary(self, **kwargs: Any):
+        """
+        Context manager to temporarily set attributes and revert them afterwards.
+
+        Usage:
+            r = Rendering()
+            with r.temporary(parameters=False, concise=True):
+                # parameters is False, concise is True here
+                do_something()
+            # parameters and concise are back to their original values
+        """
+        # Store original values
+        original_values = {key: getattr(self, key) for key in kwargs}
+
+        # Set new values
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+        try:
+            yield self
+        finally:
+            # Restore original values
+            for key, value in original_values.items():
+                setattr(self, key, value)
+
 
 @dataclass
 class Parsing:

trilogy/core/enums.py

@@ -169,6 +169,7 @@ class FunctionType(Enum):
     ARRAY_SORT = "array_sort"
     ARRAY_TRANSFORM = "array_transform"
     ARRAY_TO_STRING = "array_to_string"
+    ARRAY_FILTER = "array_filter"
 
     # MAP
     MAP_KEYS = "map_keys"
@@ -204,6 +205,7 @@ class FunctionType(Enum):
     MIN = "min"
     AVG = "avg"
     ARRAY_AGG = "array_agg"
+    ANY = "any"
 
     # String
     LIKE = "like"
@@ -244,6 +246,7 @@ class FunctionType(Enum):
     DATE_ADD = "date_add"
     DATE_SUB = "date_sub"
     DATE_DIFF = "date_diff"
+    DATE_SPINE = "date_spine"
 
     # UNIX
     UNIX_TO_TIMESTAMP = "unix_to_timestamp"
@@ -263,6 +266,7 @@ class FunctionClass(Enum):
         FunctionType.ARRAY_AGG,
         FunctionType.COUNT,
         FunctionType.COUNT_DISTINCT,
+        FunctionType.ANY,
     ]
     SINGLE_ROW = [
         FunctionType.CONSTANT,
@@ -270,7 +274,7 @@ class FunctionClass(Enum):
         FunctionType.CURRENT_DATETIME,
     ]
 
-    ONE_TO_MANY = [FunctionType.UNNEST]
+    ONE_TO_MANY = [FunctionType.UNNEST, FunctionType.DATE_SPINE]
 
     RECURSIVE = [FunctionType.RECURSE_EDGE]
 

trilogy/core/functions.py

@@ -212,6 +212,14 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=get_unnest_output_type,
         arg_count=1,
     ),
+    FunctionType.DATE_SPINE: FunctionConfig(
+        valid_inputs={
+            DataType.DATE,
+        },
+        output_purpose=Purpose.KEY,
+        output_type=DataType.DATE,
+        arg_count=2,
+    ),
     FunctionType.RECURSE_EDGE: FunctionConfig(
         arg_count=2,
     ),
@@ -318,6 +326,18 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=get_transform_output_type,
         arg_count=3,
     ),
+    FunctionType.ARRAY_FILTER: FunctionConfig(
+        valid_inputs=[
+            {
+                DataType.ARRAY,
+            },
+            {*DataType},
+            {*DataType},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=get_transform_output_type,
+        arg_count=3,
+    ),
     FunctionType.ARRAY_TO_STRING: FunctionConfig(
         valid_inputs={
             DataType.ARRAY,
@@ -887,6 +907,11 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         ),
         arg_count=1,
     ),
+    FunctionType.ANY: FunctionConfig(
+        valid_inputs={*DataType},
+        output_purpose=Purpose.PROPERTY,
+        arg_count=1,
+    ),
     FunctionType.AVG: FunctionConfig(
         valid_inputs={
             DataType.INTEGER,

trilogy/core/models/author.py

@@ -1234,7 +1234,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         elif (
             lineage
             and isinstance(lineage, (BuildFunction, Function))
-            and lineage.operator == FunctionType.UNNEST
+            and lineage.operator in FunctionClass.ONE_TO_MANY.value
         ):
             return Derivation.UNNEST
         elif (
@@ -1286,7 +1286,8 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         elif (
             lineage
             and isinstance(lineage, (Function, BuildFunction))
-            and lineage.operator in (FunctionType.UNNEST, FunctionType.UNION)
+            and lineage.operator
+            in (FunctionType.UNNEST, FunctionType.UNION, FunctionType.DATE_SPINE)
         ):
             return Granularity.MULTI_ROW
         elif lineage and all(

trilogy/core/models/build.py

@@ -134,8 +134,9 @@ def concept_is_relevant(
     if concept.purpose in (Purpose.METRIC,):
         if all([c in others for c in concept.grain.components]):
             return False
+    if concept.derivation in (Derivation.UNNEST,):
+        return True
     if concept.derivation in (Derivation.BASIC,):
-
         return any(concept_is_relevant(c, others) for c in concept.concept_arguments)
     if concept.granularity == Granularity.SINGLE_ROW:
         return False
@@ -1668,7 +1669,6 @@ class Factory:
                     valid_inputs=base.valid_inputs,
                     arg_count=base.arg_count,
                 )
-
         new = BuildFunction(
             operator=base.operator,
             arguments=[self.handle_constant(self.build(c)) for c in raw_args],
@@ -1724,6 +1724,14 @@ class Factory:
         return self._build_concept(base)
 
     def _build_concept(self, base: Concept) -> BuildConcept:
+        try:
+            return self.__build_concept(base)
+        except RecursionError as e:
+            raise RecursionError(
+                f"Recursion error building concept {base.address}. This is likely due to a circular reference."
+            ) from e
+
+    def __build_concept(self, base: Concept) -> BuildConcept:
         # TODO: if we are using parameters, wrap it in a new model and use that in rendering
         if base.address in self.local_concepts:
             return self.local_concepts[base.address]
@@ -2002,6 +2010,13 @@ class Factory:
     def _build_tuple_wrapper(self, base: TupleWrapper) -> TupleWrapper:
         return TupleWrapper(val=[self.build(x) for x in base.val], type=base.type)
 
+    @build.register
+    def _(self, base: ListWrapper) -> ListWrapper:
+        return self._build_list_wrapper(base)
+
+    def _build_list_wrapper(self, base: ListWrapper) -> ListWrapper:
+        return ListWrapper([self.build(x) for x in base], type=base.type)
+
     @build.register
     def _(self, base: FilterItem) -> BuildFilterItem:
         return self._build_filter_item(base)

trilogy/core/processing/concept_strategies_v3.py

@@ -306,7 +306,12 @@ def evaluate_loop_conditions(
 
 
 def check_for_early_exit(
-    complete, partial, missing, context: LoopContext, priority_concept: BuildConcept
+    complete: ValidationResult,
+    found: set[str],
+    partial: set[str],
+    missing: set[str],
+    context: LoopContext,
+    priority_concept: BuildConcept,
 ) -> bool:
     if complete == ValidationResult.INCOMPLETE_CONDITION:
         cond_dict = {str(node): node.preexisting_conditions for node in context.stack}
@@ -331,8 +336,18 @@ def check_for_early_exit(
                 f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Breaking as we have attempted all nodes"
             )
             return True
+        elif all(
+            [
+                x.address in found and x.address not in partial
+                for x in context.mandatory_list
+            ]
+        ):
+            logger.info(
+                f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Breaking as we have found all mandatory nodes without partials"
+            )
+            return True
         logger.info(
-            f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Found complete stack with partials {partial}, continuing search, attempted {context.attempted} all {len(context.mandatory_list)}"
+            f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Found complete stack with partials {partial}, continuing search, attempted {context.attempted} of total {len(context.mandatory_list)}."
         )
     else:
         logger.info(
@@ -436,6 +451,7 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
             context.original_mandatory,
             context.environment,
             non_virtual_difference_values,
+            depth=context.depth,
         )
 
     return group_if_required_v2(
@@ -443,6 +459,7 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
         context.original_mandatory,
         context.environment,
         non_virtual_difference_values,
+        depth=context.depth,
     )
 
 
@@ -466,6 +483,7 @@ def _search_concepts(
         conditions=conditions,
     )
 
+    # if we get a can
     if candidate:
         return candidate
     context = initialize_loop_context(
@@ -477,13 +495,14 @@ def _search_concepts(
         accept_partial=accept_partial,
         conditions=conditions,
     )
-
+    partial: set[str] = set()
     while context.incomplete:
 
         priority_concept = get_priority_concept(
             context.mandatory_list,
             context.attempted,
             found_concepts=context.found,
+            partial_concepts=partial,
             depth=depth,
         )
 
@@ -538,7 +557,7 @@ def _search_concepts(
         # assign
         context.found = found_c
         early_exit = check_for_early_exit(
-            complete, partial, missing_c, context, priority_concept
+            complete, found_c, partial, missing_c, context, priority_concept
         )
         if early_exit:
             break
@@ -608,4 +627,4 @@ def source_query_concepts(
     logger.info(
         f"{depth_to_prefix(0)}{LOGGER_PREFIX} final concepts are {[x.address for x in final]}"
     )
-    return group_if_required_v2(root, output_concepts, environment)
+    return group_if_required_v2(root, output_concepts, environment, depth=0)

trilogy/core/processing/discovery_node_factory.py

@@ -187,7 +187,7 @@ def _generate_aggregate_node(ctx: NodeGenerationContext) -> StrategyNode | None:
 
     logger.info(
         f"{depth_to_prefix(ctx.depth)}{LOGGER_PREFIX} "
-        f"for {ctx.concept.address}, generating aggregate node with {agg_optional}"
+        f"for {ctx.concept.address}, generating aggregate node with optional {agg_optional}"
     )
 
     return gen_group_node(
@@ -441,7 +441,7 @@ def generate_node(
     depth: int,
     source_concepts: SearchConceptsType,
     history: History,
-    accept_partial: bool = False,
+    accept_partial: bool,
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
 

trilogy/core/processing/discovery_utility.py

@@ -184,10 +184,14 @@ def group_if_required_v2(
     final: List[BuildConcept],
     environment: BuildEnvironment,
     where_injected: set[str] | None = None,
+    depth: int = 0,
 ):
     where_injected = where_injected or set()
     required = check_if_group_required(
-        downstream_concepts=final, parents=[root.resolve()], environment=environment
+        downstream_concepts=final,
+        parents=[root.resolve()],
+        environment=environment,
+        depth=depth,
     )
     targets = [
         x
@@ -258,6 +262,7 @@ def get_priority_concept(
     all_concepts: List[BuildConcept],
     attempted_addresses: set[str],
     found_concepts: set[str],
+    partial_concepts: set[str],
     depth: int,
 ) -> BuildConcept:
     # optimized search for missing concepts
@@ -265,13 +270,15 @@ def get_priority_concept(
         [
             c
             for c in all_concepts
-            if c.address not in attempted_addresses and c.address not in found_concepts
+            if c.address not in attempted_addresses
+            and (c.address not in found_concepts or c.address in partial_concepts)
         ],
         key=lambda x: x.address,
     )
     # sometimes we need to scan intermediate concepts to get merge keys or filter keys,
     # so do an exhaustive search
-    # pass_two = [c for c in all_concepts+filter_only if c.address not in attempted_addresses]
+    # pass_two = [c for c in all_concepts if c.address not in attempted_addresses]
+
     for remaining_concept in (pass_one,):
         priority = (
             # then multiselects to remove them from scope
@@ -333,5 +340,5 @@ def get_priority_concept(
         if final:
             return final[0]
     raise ValueError(
-        f"Cannot resolve query. No remaining priority concepts, have attempted {attempted_addresses}"
+        f"Cannot resolve query. No remaining priority concepts, have attempted {attempted_addresses} out of {all_concepts} with found {found_concepts}"
     )

trilogy/core/processing/node_generators/filter_node.py

@@ -96,6 +96,8 @@ def build_parent_concepts(
                 continue
         elif global_filter_is_local_filter:
             same_filter_optional.append(x)
+            # also append it to the parent row concepts
+            parent_row_concepts.append(x)
 
     # sometimes, it's okay to include other local optional above the filter
     # in case it is, prep our list
@@ -204,11 +206,16 @@ def gen_filter_node(
             f"{padding(depth)}{LOGGER_PREFIX} filter node row parents {[x.address for x in parent_row_concepts]} could not be found"
         )
         return None
+    else:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} filter node has row parents {[x.address for x in parent_row_concepts]} from node with output [{[x.address for x in row_parent.output_concepts]}] partial {row_parent.partial_concepts}"
+        )
     if global_filter_is_local_filter:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} filter node conditions match global conditions adding row parent {row_parent.output_concepts} with condition {where.conditional}"
         )
         row_parent.add_parents(core_parent_nodes)
+        # all local optional will be in the parent already, so we can set outputs
         row_parent.set_output_concepts([concept] + local_optional)
         return row_parent
     if optimized_pushdown:

trilogy/core/processing/node_generators/unnest_node.py

@@ -9,6 +9,7 @@ from trilogy.core.models.build import (
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.processing.nodes import (
     History,
+    MergeNode,
     StrategyNode,
     UnnestNode,
     WhereSafetyNode,
@@ -18,6 +19,32 @@ from trilogy.core.processing.utility import padding
 LOGGER_PREFIX = "[GEN_UNNEST_NODE]"
 
 
+def get_pseudonym_parents(
+    concept: BuildConcept,
+    local_optional: List[BuildConcept],
+    source_concepts,
+    environment: BuildEnvironment,
+    g,
+    depth,
+    history,
+    conditions,
+) -> List[StrategyNode]:
+    for x in concept.pseudonyms:
+        attempt = source_concepts(
+            mandatory_list=[environment.alias_origin_lookup[x]] + local_optional,
+            environment=environment,
+            g=g,
+            depth=depth + 1,
+            history=history,
+            conditions=conditions,
+            accept_partial=True,
+        )
+        if not attempt:
+            continue
+        return [attempt]
+    return []
+
+
 def gen_unnest_node(
     concept: BuildConcept,
     local_optional: List[BuildConcept],
@@ -29,14 +56,34 @@ def gen_unnest_node(
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
     arguments = []
+    join_nodes: list[StrategyNode] = []
     depth_prefix = "\t" * depth
     if isinstance(concept.lineage, BuildFunction):
         arguments = concept.lineage.concept_arguments
+    search_optional = local_optional
+    if (not arguments) and (local_optional and concept.pseudonyms):
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} unnest node for {concept} has no parents; creating solo unnest node"
+        )
+        join_nodes += get_pseudonym_parents(
+            concept,
+            local_optional,
+            source_concepts,
+            environment,
+            g,
+            depth,
+            history,
+            conditions,
+        )
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} unnest node for {concept} got join nodes {join_nodes}"
+        )
+        search_optional = []
 
-    equivalent_optional = [x for x in local_optional if x.lineage == concept.lineage]
+    equivalent_optional = [x for x in search_optional if x.lineage == concept.lineage]
 
     non_equivalent_optional = [
-        x for x in local_optional if x not in equivalent_optional
+        x for x in search_optional if x not in equivalent_optional
     ]
     all_parents = arguments + non_equivalent_optional
     logger.info(
@@ -44,7 +91,8 @@ def gen_unnest_node(
     )
     local_conditions = False
     expected_outputs = [concept] + local_optional
-    if arguments or local_optional:
+    parent: StrategyNode | None = None
+    if arguments or search_optional:
         parent = source_concepts(
             mandatory_list=all_parents,
             environment=environment,
@@ -86,14 +134,37 @@ def gen_unnest_node(
     base = UnnestNode(
         unnest_concepts=[concept] + equivalent_optional,
         input_concepts=arguments + non_equivalent_optional,
-        output_concepts=[concept] + local_optional,
+        output_concepts=[concept] + search_optional,
         environment=environment,
         parents=([parent] if parent else []),
     )
+
+    conditional = conditions.conditional if conditions else None
+    if join_nodes:
+        logger.info(
+            f"{depth_prefix}{LOGGER_PREFIX} unnest node for {concept} needs to merge with join nodes {join_nodes}"
+        )
+        for x in join_nodes:
+            logger.info(
+                f"{depth_prefix}{LOGGER_PREFIX} join node {x} with partial {x.partial_concepts}"
+            )
+            pseudonyms = [
+                environment.alias_origin_lookup[p] for p in concept.pseudonyms
+            ]
+            x.add_partial_concepts(pseudonyms)
+        return MergeNode(
+            input_concepts=base.output_concepts
+            + [j for n in join_nodes for j in n.output_concepts],
+            output_concepts=[concept] + local_optional,
+            environment=environment,
+            parents=[base] + join_nodes,
+            conditions=conditional if local_conditions is True else None,
+            preexisting_conditions=(
+                conditional if conditional and local_conditions is False else None
+            ),
+        )
     # we need to sometimes nest an unnest node,
     # as unnest operations are not valid in all situations
-    # TODO: inline this node when we can detect it's safe
-    conditional = conditions.conditional if conditions else None
     new = WhereSafetyNode(
         input_concepts=base.output_concepts,
         output_concepts=base.output_concepts,

trilogy/core/statements/author.py

@@ -197,7 +197,7 @@ class SelectStatement(HasUUID, SelectTypeMixin, BaseModel):
             for x in self.where_clause.concept_arguments:
                 if isinstance(x, UndefinedConcept):
                     validate = environment.concepts.get(x.address)
-                    if validate:
+                    if validate and self.where_clause:
                         self.where_clause = (
                             self.where_clause.with_reference_replacement(
                                 x.address, validate.reference

trilogy/dialect/base.py

@@ -194,6 +194,13 @@ FUNCTION_MAP = {
     FunctionType.INDEX_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
     FunctionType.MAP_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
     FunctionType.UNNEST: lambda x: f"unnest({x[0]})",
+    FunctionType.DATE_SPINE: lambda x: f"""unnest(
+        generate_series(
+            {x[0]},
+            {x[1]},
+            INTERVAL '1 day'
+        )
+    )""",
     FunctionType.RECURSE_EDGE: lambda x: f"CASE WHEN {x[1]} IS NULL THEN {x[0]} ELSE {x[1]} END",
     FunctionType.ATTR_ACCESS: lambda x: f"""{x[0]}.{x[1].replace("'", "")}""",
     FunctionType.STRUCT: lambda x: f"{{{', '.join(struct_arg(x))}}}",
@@ -213,6 +220,9 @@ FUNCTION_MAP = {
     FunctionType.ARRAY_TO_STRING: lambda args: (
         f"array_to_string({args[0]}, {args[1]})"
     ),
+    FunctionType.ARRAY_FILTER: lambda args: (
+        f"array_filter({args[0]}, {args[1]} -> {args[2]})"
+    ),
     # math
     FunctionType.ADD: lambda x: " + ".join(x),
     FunctionType.ABS: lambda x: f"abs({x[0]})",
@@ -237,6 +247,7 @@ FUNCTION_MAP = {
     FunctionType.AVG: lambda x: f"avg({x[0]})",
     FunctionType.MAX: lambda x: f"max({x[0]})",
     FunctionType.MIN: lambda x: f"min({x[0]})",
+    FunctionType.ANY: lambda x: f"any_value({x[0]})",
     # string types
     FunctionType.LIKE: lambda x: f" {x[0]} like {x[1]} ",
     FunctionType.UPPER: lambda x: f"UPPER({x[0]}) ",
@@ -285,6 +296,7 @@ FUNCTION_GRAIN_MATCH_MAP = {
     FunctionType.AVG: lambda args: f"{args[0]}",
     FunctionType.MAX: lambda args: f"{args[0]}",
     FunctionType.MIN: lambda args: f"{args[0]}",
+    FunctionType.ANY: lambda args: f"{args[0]}",
 }
 
 

trilogy/parsing/common.py

@@ -91,7 +91,7 @@ def process_function_arg(
         # to simplify anonymous function handling
         if (
             arg.operator not in FunctionClass.AGGREGATE_FUNCTIONS.value
-            and arg.operator != FunctionType.UNNEST
+            and arg.operator not in FunctionClass.ONE_TO_MANY.value
         ):
             return arg
         id_hash = string_to_hash(str(arg))
@@ -311,13 +311,18 @@ def concept_is_relevant(
     if concept.purpose in (Purpose.METRIC,):
         if all([c in others for c in concept.grain.components]):
             return False
+    if (
+        concept.derivation in (Derivation.BASIC,)
+        and isinstance(concept.lineage, Function)
+        and concept.lineage.operator == FunctionType.DATE_SPINE
+    ):
+        return True
     if concept.derivation in (Derivation.BASIC,) and isinstance(
         concept.lineage, (Function, CaseWhen)
     ):
         relevant = False
         for arg in concept.lineage.arguments:
             relevant = atom_is_relevant(arg, others, environment) or relevant
-
         return relevant
     if concept.derivation in (Derivation.BASIC,) and isinstance(
         concept.lineage, Parenthetical
@@ -529,7 +534,7 @@ def function_to_concept(
     elif parent.operator == FunctionType.UNION:
         derivation = Derivation.UNION
         granularity = Granularity.MULTI_ROW
-    elif parent.operator == FunctionType.UNNEST:
+    elif parent.operator in FunctionClass.ONE_TO_MANY.value:
         derivation = Derivation.UNNEST
         granularity = Granularity.MULTI_ROW
     elif parent.operator == FunctionType.RECURSE_EDGE:

trilogy/parsing/parse_engine.py

@@ -1819,6 +1819,10 @@ class ParseToObjects(Transformer):
     def array_agg(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.ARRAY_AGG, meta)
 
+    @v_args(meta=True)
+    def any(self, meta, args):
+        return self.function_factory.create_function(args, FunctionType.ANY, meta)
+
     @v_args(meta=True)
     def avg(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.AVG, meta)
@@ -2022,6 +2026,12 @@ class ParseToObjects(Transformer):
             )
         return self.function_factory.create_function(args, FunctionType.CAST, meta)
 
+    @v_args(meta=True)
+    def fdate_spine(self, meta, args) -> Function:
+        return self.function_factory.create_function(
+            args, FunctionType.DATE_SPINE, meta
+        )
+
     # utility functions
     @v_args(meta=True)
     def fcast(self, meta, args) -> Function:
@@ -2191,6 +2201,33 @@ class ParseToObjects(Transformer):
             meta,
         )
 
+    @v_args(meta=True)
+    def farray_filter(self, meta, args) -> Function:
+        factory: CustomFunctionFactory = args[1]
+        if not len(factory.function_arguments) == 1:
+            raise InvalidSyntaxException(
+                "Array filter function must have exactly one argument;"
+            )
+        array_type = arg_to_datatype(args[0])
+        if not isinstance(array_type, ArrayType):
+            raise InvalidSyntaxException(
+                f"Array filter function must be applied to an array, not {array_type}"
+            )
+        return self.function_factory.create_function(
+            [
+                args[0],
+                factory.function_arguments[0],
+                factory(
+                    ArgBinding(
+                        name=factory.function_arguments[0].name,
+                        datatype=array_type.value_data_type,
+                    )
+                ),
+            ],
+            FunctionType.ARRAY_FILTER,
+            meta,
+        )
+
 
 def unpack_visit_error(e: VisitError, text: str | None = None):
     """This is required to get exceptions from imports, which would
@@ -2227,6 +2264,7 @@ ERROR_CODES: dict[int, str] = {
     101: "Using FROM keyword? Trilogy does not have a FROM clause (Datasource resolution is automatic).",
     # 200 codes relate to required explicit syntax (we could loosen these?)
     201: 'Missing alias? Alias must be specified with "AS" - e.g. `SELECT x+1 AS y`',
+    202: "Missing closing semicolon? Statements must be terminated with a semicolon `;`.",
     210: "Missing order direction? Order by must be explicit about direction - specify `asc` or `desc`.",
 }
 
@@ -2307,7 +2345,7 @@ def parse_text(
         )
 
     def _handle_unexpected_token(e: UnexpectedToken, text: str) -> None:
-        """Handle UnexpectedToken errors with specific logic."""
+        """Handle UnexpectedToken errors to make friendlier error messages."""
         # Handle ordering direction error
         pos = e.pos_in_stream or 0
         if e.expected == {"ORDERING_DIRECTION"}:
@@ -2319,12 +2357,27 @@ def parse_text(
         )
         if parsed_tokens == ["FROM"]:
             raise _create_syntax_error(101, pos, text)
-
-        # Attempt recovery for aliasing
+        # check if they are missing a semicolon
+        try:
+            e.interactive_parser.feed_token(Token("_TERMINATOR", ";"))
+            state = e.interactive_parser.lexer_thread.state
+            if state and state.last_token:
+                new_pos = state.last_token.end_pos or pos
+            else:
+                new_pos = pos
+            raise _create_syntax_error(202, new_pos, text)
+        except UnexpectedToken:
+            pass
+        # check if they forgot an as
         try:
             e.interactive_parser.feed_token(Token("AS", "AS"))
+            state = e.interactive_parser.lexer_thread.state
+            if state and state.last_token:
+                new_pos = state.last_token.end_pos or pos
+            else:
+                new_pos = pos
             e.interactive_parser.feed_token(Token("IDENTIFIER", e.token.value))
-            raise _create_syntax_error(201, pos, text)
+            raise _create_syntax_error(201, new_pos, text)
         except UnexpectedToken:
             pass
 

trilogy/parsing/render.py

@@ -662,7 +662,8 @@ class Renderer:
                     pair_strings.append(self.indent_lines(pair_line))
             inputs = ",\n".join(pair_strings)
             return f"struct(\n{inputs}\n{self.indent_context.current_indent})"
-
+        if arg.operator == FunctionType.ALIAS:
+            return f"{self.to_string(arg.arguments[0])}"
         inputs = ",".join(args)
         return f"{arg.operator.value}({inputs})"
 

trilogy/parsing/trilogy.lark

@@ -113,7 +113,7 @@
     filter_item: _filter_base | _filter_alt
 
     // rank/lag/lead
-    WINDOW_TYPE: ("row_number"i|"rank"i|"lag"i|"lead"i | "sum"i | "avg"i | "max"i | "min"i )  /[\s]+/
+    WINDOW_TYPE: ("row_number"i|"rank"i|"lag"i|"lead"i | "sum"i | "avg"i | "max"i | "min"i | "count"i  )  /[\s]+/
 
     window_item_over: ("OVER"i over_list)
    
@@ -323,8 +323,10 @@
     _ARRAY_TRANSFORM.1: "array_transform("i
     transform_lambda: "@" IDENTIFIER
     farray_transform: _ARRAY_TRANSFORM expr ","  transform_lambda   ")"
+    _ARRAY_FILTER.1: "array_filter("i
+    farray_filter: _ARRAY_FILTER expr "," transform_lambda ")"
 
-    _array_functions: farray_sum | farray_distinct | farray_sort | farray_transform | farray_to_string
+    _array_functions: farray_sum | farray_distinct | farray_sort | farray_transform | farray_to_string | farray_filter
 
     //map_functions
     _MAP_KEYS.1: "map_keys("i
@@ -358,11 +360,13 @@
     min: _MIN expr ")"
     _ARRAY_AGG.1: "array_agg("i
     array_agg: _ARRAY_AGG expr ")"
+    _ANY.1: "any("i
+    any: _ANY expr ")"
     
     //aggregates can force a grain
     aggregate_all: "*"
     aggregate_over: ("BY"i (aggregate_all | over_list))
-    aggregate_functions: (count | count_distinct | sum | avg | max | min | array_agg) aggregate_over?
+    aggregate_functions: (count | count_distinct | sum | avg | max | min | array_agg | any) aggregate_over?
 
     // date functions
     _DATE.1: "date("i
@@ -405,8 +409,10 @@
     fdate_sub: _DATE_SUB expr "," DATE_PART "," expr ")"
     _DATE_DIFF.1: "date_diff("i
     fdate_diff: _DATE_DIFF expr "," expr "," DATE_PART ")"
+    _DATE_SPINE.1: "date_spine("i
+    fdate_spine: _DATE_SPINE expr "," expr  ")"
     
-    _date_functions: fdate | fdate_add | fdate_sub | fdate_diff | fdatetime | ftimestamp | fsecond | fminute | fhour | fday |fday_name | fday_of_week | fweek | fmonth | fmonth_name | fquarter | fyear | fdate_part | fdate_trunc
+    _date_functions: fdate | fdate_add | fdate_sub | fdate_diff | fdatetime | ftimestamp | fsecond | fminute | fhour | fday |fday_name | fday_of_week | fweek | fmonth | fmonth_name | fquarter | fyear | fdate_part | fdate_trunc | fdate_spine
     
     _static_functions:  _string_functions | _math_functions | _array_functions | _map_functions
 
@@ -434,7 +440,7 @@
     
     float_lit: /\-?[0-9]*\.[0-9]+/
 
-    array_lit: "[" (literal ",")* literal ","? "]"()
+    array_lit: "[" (expr ",")* expr ","? "]"()
 
     tuple_lit: "(" (literal ",")* literal ","? ")"