pytrilogy 0.0.3.56__py3-none-any.whl → 0.0.3.60__py3-none-any.whl

{pytrilogy-0.0.3.56.dist-info → pytrilogy-0.0.3.60.dist-info}/METADATA

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

{pytrilogy-0.0.3.56.dist-info → pytrilogy-0.0.3.60.dist-info}/RECORD

@@ -1,17 +1,17 @@
-pytrilogy-0.0.3.56.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=E6tZFZr367OLf8N5bIFQ-PZJTvXpcgVF1NGc8rJZXsk,303
+pytrilogy-0.0.3.60.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=8jDnsd42NfWTeVpYr5aVIC5F7YtNxUA3qJ-UpkKPzbU,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=lv_aJWP6dn6e2aF4BAE72jbnNtceFddfqtiDSsvzno0,1692
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
-trilogy/executor.py,sha256=GwNhP9UW4565dxnpHbw-VWNE2lX8uroQJQtSpC_j2pI,16298
+trilogy/executor.py,sha256=BolR6UwgDOdIcDG0gw_OSaB23rISgIn8Dzdll0kODmg,16506
 trilogy/parser.py,sha256=o4cfk3j3yhUFoiDKq9ZX_GjBF3dKhDjXEwb63rcBkBM,293
 trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/render.py,sha256=qQWwduymauOlB517UtM-VGbVe8Cswa4UJub5aGbSO6c,1512
 trilogy/utility.py,sha256=euQccZLKoYBz0LNg5tzLlvv2YHvXh9HArnYp1V3uXsM,763
-trilogy/authoring/__init__.py,sha256=v9PRuZs4fTnxhpXAnwTxCDwlLasUax6g2FONidcujR4,2369
+trilogy/authoring/__init__.py,sha256=h-Ag7vT76tsjib9BfjOgI-yVpuJDgpn2TSps-ibRAj8,2593
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=9thKx6u-Z3vzT3iGBBUtHsHCXaU-8L4IaqGJp1G7It0,7737
+trilogy/core/constants.py,sha256=nizWYDCJQ1bigQMtkNIEMNTcN0NoEAXiIHLzpelxQ24,201
+trilogy/core/enums.py,sha256=z2mljNfhosnap4Nesx-mVOzM4UAPYU0R-Gy-HQVqcBI,7781
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
 trilogy/core/environment_helpers.py,sha256=VvPIiFemqaLLpIpLIqprfu63K7muZ1YzNg7UZIUph8w,8267
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
@@ -19,8 +19,8 @@ trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,67
 trilogy/core/functions.py,sha256=poVfAwet1xdxTkC7WL38UmGRDpUVO9iSMNWSagl9_r4,29302
 trilogy/core/graph_models.py,sha256=z17EoO8oky2QOuO6E2aMWoVNKEVJFhLdsQZOhC4fNLU,2079
 trilogy/core/internal.py,sha256=iicDBlC6nM8d7e7jqzf_ZOmpUsW8yrr2AA8AqEiLx-s,1577
-trilogy/core/optimization.py,sha256=ChIAv0kRmw9RKyDGDCdSdbIN5fJGMkIlE6eVfTFsxg4,8867
-trilogy/core/query_processor.py,sha256=jSS1xZFDqBuI0sZBbuYAAuuVGwas7W-mV_v5oFZJFpA,20275
+trilogy/core/optimization.py,sha256=lE5WSTsDHOaqvh-G9bOfbegP3R7NDqD4jrD3VAYxEHY,8853
+trilogy/core/query_processor.py,sha256=QiE_w5HgheT4GLZFnaLssJ4plf4voK0TeTd6N3jhR6A,20188
 trilogy/core/utility.py,sha256=3VC13uSQWcZNghgt7Ot0ZTeEmNqs__cx122abVq9qhM,410
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/models/author.py,sha256=8XbIsQr6cQrgo9uzee5qRoYiMdEG7yKF4FiiWImW7U0,77490
@@ -29,41 +29,41 @@ trilogy/core/models/build_environment.py,sha256=s_C9xAHuD3yZ26T15pWVBvoqvlp2LdZ8
 trilogy/core/models/core.py,sha256=wx6hJcFECMG-Ij972ADNkr-3nFXkYESr82ObPiC46_U,10875
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
 trilogy/core/models/environment.py,sha256=AVSrvjNcNX535GhCPtYhCRY2Lp_Hj0tdY3VVt_kZb9Q,27260
-trilogy/core/models/execute.py,sha256=_JC93S5tpCQM9jpgmmbd6wkLMEfPvaMZwWZBVcgehlI,42931
+trilogy/core/models/execute.py,sha256=hOilC-lka4W-C8Pakb0Vd1-T0oskeWdC8Ls0bm8_388,43109
 trilogy/core/optimizations/__init__.py,sha256=YH2-mGXZnVDnBcWVi8vTbrdw7Qs5TivG4h38rH3js_I,290
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
 trilogy/core/optimizations/inline_datasource.py,sha256=2sWNRpoRInnTgo9wExVT_r9RfLAQHI57reEV5cGHUcg,4329
 trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP754NTurrDduFECkUjoBnc,9399
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=COK6rpKwhXxfawKhliz6DryqZa7FSAXQ6eD1eMMq1JI,22005
+trilogy/core/processing/concept_strategies_v3.py,sha256=KHpSQyG5Ubb5H1dmzpDWI2ypJL_rxeS3zc3sjaeCq_s,21997
 trilogy/core/processing/discovery_loop.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/discovery_node_factory.py,sha256=CFQPaqsJPqe0ZGnU1a81R1ZjlRNihbiR0qQtakcUEqI,14639
+trilogy/core/processing/discovery_node_factory.py,sha256=LFGHUznUz_kszcs8QywZ0pNaejbRoNVHv81gX6Mqm2Y,14909
 trilogy/core/processing/discovery_utility.py,sha256=hF3aUbRHHZFeFT5aBjE6TuSeU60I90gzmj512QXG_t8,4856
 trilogy/core/processing/discovery_validation.py,sha256=Ek9jviFgimLMUMYLXBChUQmOD94ihhwQ3NDVe6RTdWg,4930
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
-trilogy/core/processing/utility.py,sha256=rfzdgl-vWkCyhLzXNNuWgPLK59eiYypQb6TdZKymUqk,21469
+trilogy/core/processing/utility.py,sha256=mrfR9pgek-xjxoDQSlvPqOW9dpmREjgzqn4AGoqpGeM,22774
 trilogy/core/processing/node_generators/__init__.py,sha256=w8TQQgNhyAra6JQHdg1_Ags4BGyxjXYruu6UeC5yOkI,873
-trilogy/core/processing/node_generators/basic_node.py,sha256=UVsXMn6jTjm_ofVFt218jAS11s4RV4zD781vP4im-GI,3371
+trilogy/core/processing/node_generators/basic_node.py,sha256=kyOAiVaYnUlWWRs4y6ctQPlisQ2kCRZ1wZYmJfbkRSw,4337
 trilogy/core/processing/node_generators/common.py,sha256=PdysdroW9DUADP7f5Wv_GKPUyCTROZV1g3L45fawxi8,9443
 trilogy/core/processing/node_generators/filter_node.py,sha256=0hdfiS2I-Jvr6P-il3jnAJK-g-DMG7_cFbZGCnLnJAo,10032
 trilogy/core/processing/node_generators/group_node.py,sha256=nIfiMrJQEksUfqAeeA3X5PS1343y4lmPTipYuCa-rvs,6141
 trilogy/core/processing/node_generators/group_to_node.py,sha256=jKcNCDOY6fNblrdZwaRU0sbUSr9H0moQbAxrGgX6iGA,3832
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=GWV5yLmKTe1yyPhN60RG1Rnrn4ktfn9lYYXi_FVU4UI,7061
-trilogy/core/processing/node_generators/node_merge_node.py,sha256=sv55oynfqgpHEpo1OEtVDri-5fywzPhDlR85qaWikvY,16195
+trilogy/core/processing/node_generators/node_merge_node.py,sha256=1vUmNE0qQQ1MYAvC6TO2dNsudIUytj9ZVcW4w1IGHXY,16734
 trilogy/core/processing/node_generators/recursive_node.py,sha256=l5zdh0dURKwmAy8kK4OpMtZfyUEQRk6N-PwSWIyBpSM,2468
 trilogy/core/processing/node_generators/rowset_node.py,sha256=2BiSsegbRF9csJ_Xl8P_CxIm4dAAb7dF29u6v_Odr-A,6709
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=lxXhMhDKGbu67QFNbbAT-BO8gbWppIvjn_hAXpLEPe0,19953
 trilogy/core/processing/node_generators/select_node.py,sha256=3dvw0d53eUtCRCUPN6J48I3qBEX1Wha7saQ_ndPu6_I,1777
-trilogy/core/processing/node_generators/synonym_node.py,sha256=9LHK2XHDjbyTLjmDQieskG8fqbiSpRnFOkfrutDnOTE,2258
+trilogy/core/processing/node_generators/synonym_node.py,sha256=a_RllD_5b4wg4JtiEkxJOfroFdEXJq6P4VUjga7sv5w,2300
 trilogy/core/processing/node_generators/union_node.py,sha256=VNo6Oey4p8etU9xrOh2oTT2lIOTvY6PULUPRvVa2uxU,2877
-trilogy/core/processing/node_generators/unnest_node.py,sha256=cOEKnMRzXUW3bwmiOlgn3E1-B38osng0dh2pDykwITY,2410
+trilogy/core/processing/node_generators/unnest_node.py,sha256=uWug51k3WtvFzj1uKyEoori0nDfvxeaiLbvf7ZmfYCM,2666
 trilogy/core/processing/node_generators/window_node.py,sha256=GP3Hvkbb0TDA6ef7W7bmvQEHVH-NRIfBT_0W4fcH3g4,6529
 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=GMW07bb6hXurhF0hZLYoMAKSIS65tat5hwBjvqqPeSA,6516
 trilogy/core/processing/nodes/__init__.py,sha256=97eFwBa9vBhhXszgO-9JVxUzejKKeSHG6DilxRCWRm0,6083
-trilogy/core/processing/nodes/base_node.py,sha256=IdKR2yaQGY1iRgKXgxF1UtlyuJEmPXWRh0rGFXv7Z_U,18111
+trilogy/core/processing/nodes/base_node.py,sha256=p6yljFNLQsXz277c5wTATMNqsKUbsdP_3e7--tezBMw,17691
 trilogy/core/processing/nodes/filter_node.py,sha256=5VtRfKbCORx0dV-vQfgy3gOEkmmscL9f31ExvlODwvY,2461
-trilogy/core/processing/nodes/group_node.py,sha256=MUvcOg9U5J6TnWBel8eht9PdI9BfAKjUxmfjP_ZXx9o,10484
+trilogy/core/processing/nodes/group_node.py,sha256=4EbOur1wSsOpPvP6znHih126o6A-TWbBXyvhiw5B0rs,10505
 trilogy/core/processing/nodes/merge_node.py,sha256=02oWRca0ba41U6PSAB14jwnWWxoyrvxRPLwkli259SY,15865
 trilogy/core/processing/nodes/recursive_node.py,sha256=k0rizxR8KE64ievfHx_GPfQmU8QAP118Laeyq5BLUOk,1526
 trilogy/core/processing/nodes/select_node_v2.py,sha256=Xyfq8lU7rP7JTAd8VV0ATDNal64n4xIBgWQsOuMe_Ak,8824
@@ -71,14 +71,14 @@ trilogy/core/processing/nodes/union_node.py,sha256=fDFzLAUh5876X6_NM7nkhoMvHEdGJ
 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=jCwPXmnjj8u2ytBRAS_NU7ga0uB7k3_TZY6dZSIMl9Y,15253
+trilogy/core/statements/author.py,sha256=PES6GPOAt90EOb6pSJol7A_ChTSUuj740TOO60PG0Wg,15400
 trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/statements/common.py,sha256=KxEmz2ySySyZ6CTPzn0fJl5NX2KOk1RPyuUSwWhnK1g,759
-trilogy/core/statements/execute.py,sha256=cSlvpHFOqpiZ89pPZ5GDp9Hu6j6uj-5_h21FWm_L-KM,1248
+trilogy/core/statements/execute.py,sha256=rqfuoMuXPcH7L7TmE1dSiZ_K_A1ohB8whVMfGimZBOk,1294
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=SwYg3aCLmam70mlkJURYN42IggmbxviFnMUJ72WYE4g,42940
-trilogy/dialect/bigquery.py,sha256=4u4SuQ67_Zwyu0czyQnBMDUVlegqir0SA30iEbZEAwU,3575
-trilogy/dialect/common.py,sha256=IhW0v5zATvZ2K0vr4Ab4TWpYMKKkGangSpIyqaPYEkw,5762
+trilogy/dialect/base.py,sha256=V9003GLDMf1fg-EhphlxKov84f1LKqhyYfnqujXblPg,42754
+trilogy/dialect/bigquery.py,sha256=6ghCqy-k7UioIJc1EEQ7gRo_PHaO8Vm7yYbiQ-kgpzs,3629
+trilogy/dialect/common.py,sha256=61yWE0K6M-Hfc934HkdHakIdLAUNB5kPSAQcTeAo3sU,5917
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
 trilogy/dialect/dataframe.py,sha256=RUbNgReEa9g3pL6H7fP9lPTrAij5pkqedpZ99D8_5AE,1522
 trilogy/dialect/duckdb.py,sha256=C5TovwacDXo9YDpMTpPxkH7D0AxQERa7JL1RUkDGVng,3898
@@ -93,24 +93,25 @@ trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2
 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=kjA0-14mgrr1smOjt01h0nk6iatLj9tXXC8cMsir084,29782
+trilogy/parsing/common.py,sha256=OOAssbo6Yp3L4u2OSGUYIuC_iAG_843vLpUtLkk1ub8,29960
 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=Fjjh6YpLS1PluEymkNtDe698EIgtzZqqPb0kfDEenQc,71080
+trilogy/parsing/parse_engine.py,sha256=ioKWF6EFj1AIyg_pqPB9L6AjalkKQYoNav4cw4orWik,71368
 trilogy/parsing/render.py,sha256=hI4y-xjXrEXvHslY2l2TQ8ic0zAOpN41ADH37J2_FZY,19047
-trilogy/parsing/trilogy.lark,sha256=se-gnL3UfrdznVvhNbzzcE5VZxZ18iNMbNMFvRjr30I,14304
+trilogy/parsing/trilogy.lark,sha256=CK7Hqqr9W6FYb1BRWd9k3B6SzhJ8GgK4lu4hALxn_kw,14307
 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
-trilogy/std/date.preql,sha256=Ki4M-dG2xUIT_U16kOBXdaZb62S3P7iDrMBY93I4I3Q,132
+trilogy/std/date.preql,sha256=HWZm4t4HWyxr5geWRsY05RnHBVDMci8z8YA2cu0-OOw,188
 trilogy/std/display.preql,sha256=2BbhvqR4rcltyAbOXAUo7SZ_yGFYZgFnurglHMbjW2g,40
 trilogy/std/geography.preql,sha256=qLnHmDU5EnvjTbfqZF-NEclSYM5_e9rZra7QjV01rZ4,582
 trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
 trilogy/std/net.preql,sha256=-bMV6dyofskl4Kvows-iQ4JCxjVUwsZOeWCy8JO5Ftw,135
+trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.56.dist-info/METADATA,sha256=f1YsxdSUDeoSLE8O430eEFxgXPs5DZpnmLNhab9f9U4,9095
-pytrilogy-0.0.3.56.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-pytrilogy-0.0.3.56.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.56.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.56.dist-info/RECORD,,
+pytrilogy-0.0.3.60.dist-info/METADATA,sha256=n3i-LaY9KCLDvVzwfo7Z1xuUqYRPZR3LMXmOGFwBeGU,9095
+pytrilogy-0.0.3.60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.60.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.60.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.60.dist-info/RECORD,,

{pytrilogy-0.0.3.56.dist-info → pytrilogy-0.0.3.60.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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

trilogy/authoring/__init__.py

@@ -43,14 +43,19 @@ from trilogy.core.models.core import (
     MapType,
     StructType,
 )
-from trilogy.core.models.datasource import Datasource, DatasourceMetadata
+from trilogy.core.models.datasource import Address, Datasource, DatasourceMetadata
 from trilogy.core.models.environment import Environment
 from trilogy.core.statements.author import (
     ConceptDeclarationStatement,
     ConceptTransform,
+    CopyStatement,
+    Grain,
+    HasUUID,
+    ImportStatement,
     MultiSelectStatement,
     PersistStatement,
     RawSQLStatement,
+    RowsetDerivationStatement,
     SelectItem,
     SelectStatement,
 )
@@ -73,6 +78,8 @@ __all__ = [
     "DataType",
     "StructType",
     "ListType",
+    "Grain",
+    "RowsetDerivationStatement",
     "MapType",
     "ListWrapper",
     "FunctionType",
@@ -109,4 +116,8 @@ __all__ = [
     "MultiSelectLineage",
     "RowsetItem",
     "FunctionCallWrapper",
+    "CopyStatement",
+    "HasUUID",
+    "ImportStatement",
+    "Address",
 ]

trilogy/core/constants.py

@@ -2,3 +2,4 @@ CONSTANT_DATASET: str = "preql_internal_constant_dataset"
 ALL_ROWS_CONCEPT = "all_rows"
 INTERNAL_NAMESPACE = "__preql_internal"
 PERSISTED_CONCEPT_PREFIX = "__pre_persist"
+UNNEST_NAME = "_unnest_alias"

trilogy/core/enums.py

@@ -7,6 +7,7 @@ class UnnestMode(Enum):
     DIRECT = "direct"
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
+    CROSS_JOIN_UNNEST = "cross_join_unnest"
     CROSS_JOIN_ALIAS = "cross_join_alias"
     SNOWFLAKE = "snowflake"
 

trilogy/core/models/execute.py

@@ -658,18 +658,21 @@ class QueryDatasource(BaseModel):
     @classmethod
     def validate_source_map(cls, v: dict, info: ValidationInfo):
         values = info.data
+        hidden_concepts = values.get("hidden_concepts", set())
         for key in ("input_concepts", "output_concepts"):
             if not values.get(key):
                 continue
             concept: BuildConcept
             for concept in values[key]:
+                if concept.address in hidden_concepts:
+                    continue
                 if (
                     concept.address not in v
                     and not any(x in v for x in concept.pseudonyms)
                     and CONFIG.validate_missing
                 ):
                     raise SyntaxError(
-                        f"On query datasource missing source map for {concept.address} on {key} with pseudonyms {concept.pseudonyms}, have {v}"
+                        f"On query datasource from {values} missing source map entry (map: {v}) for {concept.address} on {key} with pseudonyms {concept.pseudonyms}, have {v}"
                     )
         return v
 

trilogy/core/optimization.py

@@ -141,9 +141,7 @@ def is_direct_return_eligible(cte: CTE | UnionCTE) -> CTE | UnionCTE | None:
     if not output_addresses.issubset(parent_output_addresses):
         return None
     if not direct_parent.grain == cte.grain:
-        logger.info("grain mismatch, cannot early exit")
-        logger.info(direct_parent.grain)
-        logger.info(cte.grain)
+        logger.info("[Direct Return] grain mismatch, cannot early exit")
         return None
 
     assert isinstance(cte, CTE)
@@ -236,6 +234,8 @@ def optimize_ctes(
             complete = not actions_taken
             loops += 1
             input = reorder_ctes(filter_irrelevant_ctes(input, root_cte))
-        logger.info(f"finished checking for {type(rule).__name__} in {loops} loops")
+        logger.info(
+            f"[Optimization] Finished checking for {type(rule).__name__} after {loops} loop(s)"
+        )
 
     return reorder_ctes(filter_irrelevant_ctes(input, root_cte))

trilogy/core/processing/concept_strategies_v3.py

@@ -408,8 +408,9 @@ def generate_loop_completion(context: LoopContext, virtual) -> StrategyNode:
         logger.info(
             f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Conditions {context.conditions} were injected, checking if we need a group to restore grain"
         )
+
         result = GroupNode.check_if_required(
-            downstream_concepts=context.original_mandatory,
+            downstream_concepts=output.usable_outputs,
             parents=[output.resolve()],
             environment=context.environment,
             depth=context.depth,
@@ -420,7 +421,7 @@ def generate_loop_completion(context: LoopContext, virtual) -> StrategyNode:
             )
             return GroupNode(
                 output_concepts=context.original_mandatory,
-                input_concepts=context.original_mandatory,
+                input_concepts=output.usable_outputs,
                 environment=context.environment,
                 parents=[output],
                 partial_concepts=output.partial_concepts,
@@ -504,7 +505,7 @@ def _search_concepts(
             conditions=context.conditions,
             accept_partial=accept_partial,
         )
-        # assig
+        # assign
         context.found = found_c
         early_exit = check_for_early_exit(complete, partial, context, priority_concept)
         if early_exit:

trilogy/core/processing/discovery_node_factory.py

@@ -307,12 +307,18 @@ class RootNodeHandler:
     def _resolve_root_concepts(
         self, root_targets: List[BuildConcept]
     ) -> Optional[StrategyNode]:
-
+        synonym_node = self._try_synonym_resolution(root_targets)
+        if synonym_node:
+            logger.info(
+                f"{depth_to_prefix(self.ctx.depth)}{LOGGER_PREFIX} "
+                f"resolved root concepts through synonyms"
+            )
+            return synonym_node
         expanded_node = self._try_merge_expansion(root_targets)
         if expanded_node:
             return expanded_node
 
-        return self._try_synonym_resolution(root_targets)
+        return None
 
     def _try_merge_expansion(
         self, root_targets: List[BuildConcept]
@@ -367,7 +373,7 @@ class RootNodeHandler:
     ) -> Optional[StrategyNode]:
         logger.info(
             f"{depth_to_prefix(self.ctx.depth)}{LOGGER_PREFIX} "
-            f"Could not resolve root concepts, checking for synonyms"
+            f"Could not resolve root concepts, checking for synonyms for {root_targets}"
         )
 
         if not self.ctx.history.check_started(

trilogy/core/processing/node_generators/basic_node.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from trilogy.constants import logger
-from trilogy.core.enums import FunctionClass, SourceType
+from trilogy.core.enums import FunctionClass, FunctionType, SourceType
 from trilogy.core.models.build import BuildConcept, BuildFunction, BuildWhereClause
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.processing.node_generators.common import (
@@ -47,13 +47,25 @@ def gen_basic_node(
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} basic node for {concept} with lineage {concept.lineage} has parents {[x for x in parent_concepts]}"
     )
-
+    synonyms: list[BuildConcept] = []
+    ignored_optional: set[str] = set()
+    assert isinstance(concept.lineage, BuildFunction)
+    if concept.lineage.operator == FunctionType.ATTR_ACCESS:
+        logger.info(
+            f"{depth_prefix}{LOGGER_PREFIX} checking for synonyms for attribute access"
+        )
+        for x in local_optional:
+            for z in x.pseudonyms:
+                s_concept = environment.alias_origin_lookup[z]
+                if is_equivalent_basic_function_lineage(concept, s_concept):
+                    synonyms.append(s_concept)
+                    ignored_optional.add(x.address)
     equivalent_optional = [
         x
         for x in local_optional
         if is_equivalent_basic_function_lineage(concept, x)
         and x.address != concept.address
-    ]
+    ] + synonyms
 
     if equivalent_optional:
         logger.info(
@@ -66,6 +78,7 @@ def gen_basic_node(
         for x in local_optional
         if x not in equivalent_optional
         and not any(x.address in y.pseudonyms for y in equivalent_optional)
+        and x.address not in ignored_optional
     ]
     all_parents: list[BuildConcept] = unique(
         parent_concepts + non_equivalent_optional, "address"
@@ -73,7 +86,7 @@ def gen_basic_node(
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Fetching parents {[x.address for x in all_parents]}"
     )
-    parent_node: StrategyNode = source_concepts(
+    parent_node: StrategyNode | None = source_concepts(
         mandatory_list=all_parents,
         environment=environment,
         g=g,
@@ -92,14 +105,19 @@ def gen_basic_node(
     parent_node.add_output_concept(concept)
     for x in equivalent_optional:
         parent_node.add_output_concept(x)
-
-    parent_node.remove_output_concepts(
-        [
-            x
-            for x in parent_node.output_concepts
-            if x.address not in [concept] + local_optional
-        ]
+    targets = [concept] + local_optional
+    logger.info(
+        f"{depth_prefix}{LOGGER_PREFIX} Returning basic select for {concept}: output {[x.address for x in parent_node.output_concepts]}"
     )
+    should_hide = [
+        x
+        for x in parent_node.output_concepts
+        if (
+            x.address not in targets
+            and not any(x.address in y.pseudonyms for y in targets)
+        )
+    ]
+    parent_node.hide_output_concepts(should_hide)
 
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Returning basic select for {concept}: output {[x.address for x in parent_node.output_concepts]}"

trilogy/core/processing/node_generators/node_merge_node.py

@@ -88,7 +88,10 @@ def determine_induced_minimal_nodes(
     for node in G.nodes:
         if concepts.get(node):
             lookup: BuildConcept = concepts[node]
-            if lookup.derivation in (Derivation.CONSTANT,):
+            # inclusion of aggregates can create ambiguous node relation chains
+            # there may be a better way to handle this
+            # can be revisited if we need to connect a derived synonym based on an aggregate
+            if lookup.derivation in (Derivation.CONSTANT, Derivation.AGGREGATE):
                 nodes_to_remove.append(node)
             # purge a node if we're already looking for all it's parents
             if filter_downstream and lookup.derivation not in (Derivation.ROOT,):
@@ -112,6 +115,7 @@ def determine_induced_minimal_nodes(
         return None
     H.remove_nodes_from(list(x for x in H.nodes if x not in paths))
     sG: nx.Graph = ax.steinertree.steiner_tree(H, nodelist).copy()
+    logger.debug("Steiner tree found for nodes %s", nodelist)
     final: nx.DiGraph = nx.subgraph(G, sG.nodes).copy()
 
     for edge in G.edges:
@@ -143,7 +147,7 @@ def determine_induced_minimal_nodes(
     if not all([node in final.nodes for node in nodelist]):
         missing = [node for node in nodelist if node not in final.nodes]
         logger.debug(
-            f"Skipping graph for {nodelist} as missing nodes {missing} from {final.nodes}"
+            f"Skipping graph for initial list {nodelist} as missing nodes {missing} from final graph {final.nodes}"
         )
         return None
     logger.debug(f"Found final graph {final.nodes}")
@@ -228,11 +232,14 @@ def resolve_weak_components(
     # to ensure there are not ambiguous discovery paths
     # (if we did not care about raising ambiguity errors, we could just use the first one)
     count = 0
-    node_list = [
-        concept_to_node(c.with_default_grain())
-        for c in all_concepts
-        if "__preql_internal" not in c.address
-    ]
+    node_list = sorted(
+        [
+            concept_to_node(c.with_default_grain())
+            for c in all_concepts
+            if "__preql_internal" not in c.address
+        ]
+    )
+    logger.debug(f"Resolving weak components for {node_list} in {search_graph.nodes}")
     synonyms: set[str] = set()
     for x in all_concepts:
         synonyms = synonyms.union(x.pseudonyms)
@@ -354,7 +361,7 @@ def subgraphs_to_merge_node(
         parents.append(parent)
     input_c = []
     for x in parents:
-        for y in x.output_concepts:
+        for y in x.usable_outputs:
             input_c.append(y)
     if len(parents) == 1 and enable_early_exit:
         logger.info(
@@ -392,6 +399,7 @@ def gen_merge_node(
         )
     else:
         all_search_concepts = all_concepts
+    all_search_concepts = sorted(all_search_concepts, key=lambda x: x.address)
     for filter_downstream in [True, False]:
         weak_resolve = resolve_weak_components(
             all_search_concepts,

trilogy/core/processing/node_generators/synonym_node.py

@@ -29,7 +29,7 @@ def gen_synonym_node(
     conditions: BuildWhereClause | None = None,
     accept_partial: bool = False,
 ) -> StrategyNode | None:
-    local_prefix = f"[GEN_SYNONYM_NODE] {padding(depth)}"
+    local_prefix = f"{padding(depth)}[GEN_SYNONYM_NODE]"
     base_fingerprint = tuple([x.address for x in all_concepts])
     synonyms = defaultdict(list)
     synonym_count = 0
@@ -64,5 +64,6 @@ def gen_synonym_node(
         )
         if attempt:
             logger.info(f"{local_prefix} found inputs with {combo}")
+            print(attempt.output_concepts)
             return attempt
     return None

trilogy/core/processing/node_generators/unnest_node.py

@@ -20,16 +20,22 @@ def gen_unnest_node(
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
     arguments = []
+    depth_prefix = "\t" * depth
     if isinstance(concept.lineage, BuildFunction):
         arguments = concept.lineage.concept_arguments
 
     equivalent_optional = [x for x in local_optional if x.lineage == concept.lineage]
+
     non_equivalent_optional = [
         x for x in local_optional if x not in equivalent_optional
     ]
+    all_parents = arguments + non_equivalent_optional
+    logger.info(
+        f"{depth_prefix}{LOGGER_PREFIX} unnest node for {concept} with lineage {concept.lineage} has parents {all_parents} and equivalent optional {equivalent_optional}"
+    )
     if arguments or local_optional:
         parent = source_concepts(
-            mandatory_list=arguments + non_equivalent_optional,
+            mandatory_list=all_parents,
             environment=environment,
             g=g,
             depth=depth + 1,

trilogy/core/processing/nodes/base_node.py

@@ -311,19 +311,6 @@ class StrategyNode:
             self.rebuild_cache()
         return self
 
-    def remove_output_concepts(
-        self, concepts: List[BuildConcept], rebuild: bool = True
-    ):
-        for x in concepts:
-            self.hidden_concepts.add(x.address)
-        addresses = [x.address for x in concepts]
-        self.output_concepts = [
-            x for x in self.output_concepts if x.address not in addresses
-        ]
-        if rebuild:
-            self.rebuild_cache()
-        return self
-
     @property
     def usable_outputs(self) -> list[BuildConcept]:
         return [

trilogy/core/processing/nodes/group_node.py

@@ -105,7 +105,7 @@ class GroupNode(StrategyNode):
         if comp_grain.issubset(target_grain):
 
             logger.info(
-                f"{padding}{LOGGER_PREFIX} Group requirement check: {comp_grain}, {target_grain}, is subset, no grain required"
+                f"{padding}{LOGGER_PREFIX} Group requirement check: {comp_grain}, {target_grain}, grain is subset of target, no group node required"
             )
             return GroupRequiredResponse(target_grain, comp_grain, False)
         # find out what extra is in the comp grain vs target grain

trilogy/core/processing/utility.py

@@ -409,7 +409,7 @@ def get_node_joins(
 
 
 def get_disconnected_components(
-    concept_map: Dict[str, Set[BuildConcept]]
+    concept_map: Dict[str, Set[BuildConcept]],
 ) -> Tuple[int, List]:
     """Find if any of the datasources are not linked"""
     import networkx as nx
@@ -608,8 +608,24 @@ def sort_select_output_processed(
     mapping = {x.address: x for x in cte.output_columns}
 
     new_output: list[BuildConcept] = []
-    for x in output_addresses:
-        new_output.append(mapping[x])
+    for x in query.output_columns:
+        if x.address in mapping:
+            new_output.append(mapping[x.address])
+        for oc in cte.output_columns:
+            if x.address in oc.pseudonyms:
+                # create a wrapper BuildConcept to render the pseudonym under the original name
+                new_output.append(
+                    BuildConcept(
+                        name=x.name,
+                        namespace=x.namespace,
+                        pseudonyms={oc.address},
+                        datatype=oc.datatype,
+                        purpose=oc.purpose,
+                        grain=oc.grain,
+                        build_is_aggregate=oc.build_is_aggregate,
+                    )
+                )
+                break
 
     for oc in cte.output_columns:
         # add hidden back
@@ -637,17 +653,28 @@ def sort_select_output(
     if isinstance(query, ProcessedQuery):
         return sort_select_output_processed(cte, query)
 
-    output_addresses = [
-        c.address
-        for c in query.output_components
-        # if c.address not in query.hidden_components
-    ]
-
     mapping = {x.address: x for x in cte.output_columns}
 
     new_output: list[BuildConcept] = []
-    for x in output_addresses:
-        new_output.append(mapping[x])
+    for x in query.output_components:
+        if x.address in mapping:
+            new_output.append(mapping[x.address])
+        else:
+            for oc in cte.output_columns:
+                if x.address in oc.pseudonyms:
+                    # create a wrapper BuildConcept to render the pseudonym under the original name
+                    new_output.append(
+                        BuildConcept(
+                            name=x.name,
+                            namespace=x.namespace,
+                            pseudonyms={oc.address},
+                            datatype=oc.datatype,
+                            purpose=oc.purpose,
+                            grain=oc.grain,
+                            build_is_aggregate=oc.build_is_aggregate,
+                        )
+                    )
+                    break
     cte.output_columns = new_output
     cte.hidden_concepts = set(
         [

trilogy/core/query_processor.py

@@ -432,7 +432,7 @@ def get_query_node(
             )
         ds = SelectNode(
             output_concepts=build_statement.output_components,
-            input_concepts=ds.output_concepts,
+            input_concepts=ds.usable_outputs,
             parents=[ds],
             environment=ds.environment,
             partial_concepts=ds.partial_concepts,
@@ -553,11 +553,11 @@ def process_query(
     root_cte.hidden_concepts = statement.hidden_components
 
     final_ctes = optimize_ctes(deduped_ctes, root_cte, statement)
-    mapping = {x.address: x for x in cte.output_columns}
+
     return ProcessedQuery(
         order_by=root_cte.order_by,
         limit=statement.limit,
-        output_columns=[mapping[x.address] for x in statement.output_components],
+        output_columns=statement.output_components,
         ctes=final_ctes,
         base=root_cte,
         hidden_columns=set([x for x in statement.hidden_components]),

trilogy/core/statements/author.py

@@ -5,7 +5,7 @@ from typing import Annotated, List, Optional, Union
 from pydantic import BaseModel, Field, computed_field, field_validator
 from pydantic.functional_validators import PlainValidator
 
-from trilogy.constants import CONFIG
+from trilogy.constants import CONFIG, DEFAULT_NAMESPACE
 from trilogy.core.enums import (
     ConceptSource,
     FunctionClass,
@@ -281,7 +281,11 @@ class SelectStatement(HasUUID, SelectTypeMixin, BaseModel):
             # if the concept is a locally derived concept, it cannot ever be partial
             # but if it's a concept pulled in from upstream and we have a where clause, it should be partial
             ColumnAssignment(
-                alias=c.address.replace(".", "_"),
+                alias=(
+                    c.address.replace(".", "_")
+                    if c.namespace != DEFAULT_NAMESPACE
+                    else c.name
+                ),
                 concept=environment.concepts[c.address].reference,
                 modifiers=modifiers if c.address not in self.locally_derived else [],
             )

trilogy/core/statements/execute.py

@@ -3,6 +3,7 @@ from typing import Annotated, List, Optional, Union
 from pydantic import BaseModel, Field
 from pydantic.functional_validators import PlainValidator
 
+from trilogy.core.models.author import ConceptRef
 from trilogy.core.models.build import (
     BuildConcept,
     BuildDatasource,
@@ -14,7 +15,7 @@ from trilogy.core.statements.common import CopyQueryMixin, PersistQueryMixin
 
 
 class ProcessedQuery(BaseModel):
-    output_columns: List[BuildConcept]
+    output_columns: List[ConceptRef]
     ctes: List[CTE | UnionCTE]
     base: CTE | UnionCTE
     hidden_columns: set[str] = Field(default_factory=set)
@@ -38,5 +39,5 @@ class ProcessedRawSQLStatement(BaseModel):
 
 
 class ProcessedShowStatement(BaseModel):
-    output_columns: List[BuildConcept]
+    output_columns: List[ConceptRef]
     output_values: List[Union[BuildConcept, BuildDatasource, ProcessedQuery]]

trilogy/dialect/base.py

@@ -10,6 +10,7 @@ from trilogy.constants import (
     Rendering,
     logger,
 )
+from trilogy.core.constants import UNNEST_NAME
 from trilogy.core.enums import (
     DatePart,
     FunctionType,
@@ -33,7 +34,6 @@ from trilogy.core.models.build import (
     BuildRowsetItem,
     BuildSubselectComparison,
     BuildWindowItem,
-    Factory,
 )
 from trilogy.core.models.core import (
     DataType,
@@ -757,6 +757,16 @@ class BaseDialect:
                 f"{self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
                 for c in cte.join_derived_concepts
             ]
+        elif self.UNNEST_MODE == UnnestMode.CROSS_JOIN_UNNEST:
+            select_columns = [
+                self.render_concept_sql(c, cte)
+                for c in cte.output_columns
+                if c.address not in [y.address for y in cte.join_derived_concepts]
+                and c.address not in cte.hidden_concepts
+            ] + [
+                f"{UNNEST_NAME} as {self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
+                for c in cte.join_derived_concepts
+            ]
         else:
             # otherwse, assume we are unnesting directly in the select
             select_columns = [
@@ -771,11 +781,18 @@ class BaseDialect:
             if len(cte.joins) > 0:
                 if cte.join_derived_concepts and self.UNNEST_MODE in (
                     UnnestMode.CROSS_JOIN_ALIAS,
+                    # UnnestMode.CROSS_JOIN_UNNEST,
                     UnnestMode.CROSS_JOIN,
                     UnnestMode.CROSS_APPLY,
                 ):
 
                     source = f"{render_unnest(self.UNNEST_MODE, self.QUOTE_CHARACTER, cte.join_derived_concepts[0], self.render_expr, cte)}"
+                elif (
+                    cte.join_derived_concepts
+                    and self.UNNEST_MODE == UnnestMode.CROSS_JOIN_UNNEST
+                ):
+                    source = f"{self.render_expr(cte.join_derived_concepts[0], cte)} as {self.QUOTE_CHARACTER}{UNNEST_NAME}{self.QUOTE_CHARACTER}"
+
                 elif (
                     cte.join_derived_concepts
                     and self.UNNEST_MODE == UnnestMode.SNOWFLAKE
@@ -904,7 +921,6 @@ class BaseDialect:
             | ProcessedRawSQLStatement
             | ProcessedCopyStatement
         ] = []
-        factory = Factory(environment=environment)
         for statement in statements:
             if isinstance(statement, PersistStatement):
                 if hooks:
@@ -939,11 +955,9 @@ class BaseDialect:
                     output.append(
                         ProcessedShowStatement(
                             output_columns=[
-                                factory.build(
-                                    environment.concepts[
-                                        DEFAULT_CONCEPTS["query_text"].address
-                                    ]
-                                )
+                                environment.concepts[
+                                    DEFAULT_CONCEPTS["query_text"].address
+                                ].reference
                             ],
                             output_values=[
                                 process_query(
@@ -984,29 +998,6 @@ class BaseDialect:
             return ";\n".join([str(x) for x in query.output_values])
         elif isinstance(query, ProcessedRawSQLStatement):
             return query.text
-        select_columns: Dict[str, str] = {}
-        cte_output_map = {}
-        selected = set()
-        output_addresses = [
-            c.address
-            for c in query.output_columns
-            if c.address not in query.hidden_columns
-        ]
-
-        for c in query.base.output_columns:
-            if c.address not in selected:
-                select_columns[c.address] = (
-                    f"{query.base.name}.{safe_quote(c.safe_address, self.QUOTE_CHARACTER)}"
-                )
-                cte_output_map[c.address] = query.base
-                if c.address not in query.hidden_columns:
-                    selected.add(c.address)
-        if not all([x in selected for x in output_addresses]):
-            missing = [x for x in output_addresses if x not in selected]
-            raise ValueError(
-                f"Did not get all output addresses in select - missing: {missing}, have"
-                f" {selected}"
-            )
 
         recursive = any(isinstance(x, RecursiveCTE) for x in query.ctes)
 

trilogy/dialect/bigquery.py

@@ -22,7 +22,7 @@ FUNCTION_MAP = {
     FunctionType.MINUTE: lambda x: f"EXTRACT(MINUTE from {x[0]})",
     FunctionType.SECOND: lambda x: f"EXTRACT(SECOND from {x[0]})",
     FunctionType.HOUR: lambda x: f"EXTRACT(HOUR from {x[0]})",
-    FunctionType.DAY_OF_WEEK: lambda x: f"EXTRACT(DAYOFWEEK from {x[0]})",
+    FunctionType.DAY_OF_WEEK: lambda x: f"EXTRACT(DAYOFWEEK from {x[0]})-1",  # BigQuery's DAYOFWEEK returns 1 for Sunday
     FunctionType.DAY: lambda x: f"EXTRACT(DAY from {x[0]})",
     FunctionType.YEAR: lambda x: f"EXTRACT(YEAR from {x[0]})",
     FunctionType.MONTH: lambda x: f"EXTRACT(MONTH from {x[0]})",
@@ -97,5 +97,5 @@ class BigqueryDialect(BaseDialect):
     }
     QUOTE_CHARACTER = "`"
     SQL_TEMPLATE = BQ_SQL_TEMPLATE
-    UNNEST_MODE = UnnestMode.CROSS_JOIN
+    UNNEST_MODE = UnnestMode.CROSS_JOIN_UNNEST
     DATATYPE_MAP = DATATYPE_MAP

trilogy/dialect/common.py

@@ -1,5 +1,6 @@
 from typing import Callable
 
+from trilogy.core.constants import UNNEST_NAME
 from trilogy.core.enums import Modifier, UnnestMode
 from trilogy.core.models.build import (
     BuildComparison,
@@ -34,11 +35,14 @@ def render_unnest(
     cte: CTE,
 ):
     if not isinstance(concept, (BuildConcept, BuildParamaterizedConceptReference)):
-        address = "anon_function"
+        print(type(concept))
+        address = UNNEST_NAME
     else:
         address = concept.safe_address
     if unnest_mode == UnnestMode.CROSS_JOIN:
         return f"{render_func(concept, cte)} as {quote_character}{address}{quote_character}"
+    elif unnest_mode == UnnestMode.CROSS_JOIN_UNNEST:
+        return f"unnest({render_func(concept, cte)}) as {quote_character}{address}{quote_character}"
     elif unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
         return f"{render_func(concept, cte)} as unnest_wrapper ({quote_character}{address}{quote_character})"
     elif unnest_mode == UnnestMode.SNOWFLAKE:
@@ -95,9 +99,11 @@ def render_join(
             return None
         if not cte:
             raise ValueError("must provide a cte to build an unnest joins")
-        if unnest_mode == UnnestMode.CROSS_JOIN:
-            return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"
-        if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
+        if unnest_mode in (
+            UnnestMode.CROSS_JOIN,
+            UnnestMode.CROSS_JOIN_UNNEST,
+            UnnestMode.CROSS_JOIN_ALIAS,
+        ):
             return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"
         if unnest_mode == UnnestMode.SNOWFLAKE:
             return f"LEFT JOIN LATERAL {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"

trilogy/executor.py

@@ -8,8 +8,8 @@ from sqlalchemy.engine import CursorResult
 
 from trilogy.constants import Rendering, logger
 from trilogy.core.enums import FunctionType, Granularity, IOType
-from trilogy.core.models.author import Concept, Function
-from trilogy.core.models.build import BuildConcept, BuildFunction
+from trilogy.core.models.author import Concept, ConceptRef, Function
+from trilogy.core.models.build import BuildFunction
 from trilogy.core.models.core import ListWrapper, MapWrapper
 from trilogy.core.models.datasource import Datasource
 from trilogy.core.models.environment import Environment
@@ -61,7 +61,7 @@ class MockResult:
 
 
 def generate_result_set(
-    columns: List[BuildConcept], output_data: list[Any]
+    columns: List[ConceptRef], output_data: list[Any]
 ) -> MockResult:
     names = [x.address.replace(".", "_") for x in columns]
     return MockResult(
@@ -90,7 +90,16 @@ class Executor(object):
         if self.dialect == Dialects.DATAFRAME:
             self.engine.setup(self.environment, self.connection)
 
-    def execute_statement(self, statement) -> Optional[CursorResult]:
+    def execute_statement(
+        self,
+        statement: (
+            ProcessedQuery
+            | ProcessedCopyStatement
+            | ProcessedRawSQLStatement
+            | ProcessedQueryPersist
+            | ProcessedShowStatement
+        ),
+    ) -> Optional[CursorResult]:
         if not isinstance(
             statement,
             (

trilogy/parsing/common.py

@@ -38,6 +38,7 @@ from trilogy.core.models.author import (
     Parenthetical,
     RowsetItem,
     RowsetLineage,
+    TraitDataType,
     UndefinedConcept,
     WhereClause,
     WindowItem,
@@ -608,6 +609,9 @@ def window_item_to_concept(
                 and set([x.address for x in item.expr.by]) == keys
             ):
                 continue
+            elif isinstance(item.expr, AggregateWrapper):
+
+                grain_components += item.expr.by
             else:
                 grain_components += item.concept_arguments
     else:
@@ -617,19 +621,20 @@ def window_item_to_concept(
     modifiers = get_upstream_modifiers(bcontent.concept_arguments, environment)
     datatype = parent.content.datatype
     if parent.type in (
-        WindowType.RANK,
+        # WindowType.RANK,
         WindowType.ROW_NUMBER,
         WindowType.COUNT,
         WindowType.COUNT_DISTINCT,
     ):
         datatype = DataType.INTEGER
+    if parent.type == WindowType.RANK:
+        datatype = TraitDataType(type=DataType.INTEGER, traits=["rank"])
     return Concept(
         name=name,
         datatype=datatype,
         purpose=local_purpose,
         lineage=parent,
         metadata=fmetadata,
-        # filters are implicitly at the grain of the base item
         grain=final_grain,
         namespace=namespace,
         keys=keys,

trilogy/parsing/parse_engine.py

@@ -667,8 +667,14 @@ class ParseToObjects(Transformer):
                 environment=self.environment,
                 metadata=metadata,
             )
-
-            if purpose and purpose != Purpose.AUTO and concept.purpose != purpose:
+            # let constant purposes exist to support round-tripping
+            # as a build concept may end up with a constant based on constant inlining happening recursively
+            if (
+                purpose
+                and purpose != Purpose.AUTO
+                and concept.purpose != purpose
+                and purpose != Purpose.CONSTANT
+            ):
                 raise SyntaxError(
                     f'Concept {name} purpose {concept.purpose} does not match declared purpose {purpose}. Suggest defaulting to "auto"'
                 )

trilogy/parsing/trilogy.lark

@@ -379,7 +379,7 @@
 
     int_lit:  /\-?[0-9]+/
     
-    float_lit: /[0-9]*\.[0-9]+/
+    float_lit: /\-?[0-9]*\.[0-9]+/
 
     array_lit: "[" (literal ",")* literal ","? "]"()
 

trilogy/std/date.preql

@@ -2,9 +2,12 @@
 
 type year int;
 type month int;
+type month_name string;
 type week int;
 type day int;
 type hour int;
 type minute int;
 type second int;
-type day_of_week int;
+type day_of_week int;
+type day_of_week_name string;
+

trilogy/std/ranking.preql

@@ -0,0 +1,6 @@
+
+type rank int;
+type score int;
+type position int;
+type index int;
+type grade int;