pytrilogy 0.0.1.106__py3-none-any.whl → 0.0.1.107__py3-none-any.whl

{pytrilogy-0.0.1.106.dist-info → pytrilogy-0.0.1.107.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.1.106
+Version: 0.0.1.107
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -275,3 +275,81 @@ but all are worth checking out. Please open PRs/comment for anything missed!
 - [malloy](https://github.com/malloydata/malloy)
 - [preql](https://github.com/erezsh/Preql)
 - [PREQL](https://github.com/PRQL/prql)
+
+## Minimal Syntax Reference
+
+#### IMPORT
+
+`import <path> as <alias>;`
+
+#### CONCEPT
+
+Types: `string | int | float | bool | date | datetime | time | timestamp | interval`;
+
+Key:
+`key <name> <type>;`
+
+Property:
+`property <key>.<name> <type>;`
+
+Transformation:
+`auto <name> <- <expression>;`
+
+#### DATASOURCE
+```sql
+datasource <name>(
+    <column>:<concept>,
+    <column>:<concept>,
+)
+grain(<concept>, <concept>)
+address <table>;
+```
+
+#### SELECT
+
+Primary acces
+
+```sql
+select
+    <concept>,
+    <concept>+1 -> <alias>
+WHERE
+    <concept> = <value>
+ORDER BY
+    <concept> asc|desc
+;
+```
+
+#### CTE/ROWSET
+
+Reusable virtual set of rows. Useful for windows, filtering. 
+
+```sql
+with <alias> as
+select
+    <concept>,
+    <concept>+1 -> <alias>
+WHERE
+    <concept> = <value>
+
+select <alias>.<concept>;
+
+```
+
+
+#### PERSIST
+
+Store output of a query in a warehouse table
+
+```sql
+persist <alias> as <table_name> from
+<select>;
+```
+
+#### SHOW
+
+Return generated SQL without executing.
+
+```sql
+show <select>;
+```

{pytrilogy-0.0.1.106.dist-info → pytrilogy-0.0.1.107.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=QcYAoArrO_pOGn6dyWOs06p6eNxUKc9er8KszAob8xA,292
+trilogy/__init__.py,sha256=ouq-RNu0DVYw8n1C2ekRmcAJ_SL_PFzbRBzo2O814TM,292
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=LxiK2TiVQPEa6tXkxWk9DJHOR3zsGNSqgQuqtOf66cw,518
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -16,7 +16,7 @@ trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,56
 trilogy/core/functions.py,sha256=zkRReytiotOBAW-a3Ri5eoejZDYTt2-7Op80ZxZxUmw,9129
 trilogy/core/graph_models.py,sha256=oJUMSpmYhqXlavckHLpR07GJxuQ8dZ1VbB1fB0KaS8c,2036
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=7ZKnQF8wj-ppGvkIhzU3Jb1OiXY-_5EVNnLOT9N7lX8,108555
+trilogy/core/models.py,sha256=WH7GHgn1a3xegVo12_NTP7V_ptN-_ObY7s4ZgkPI0D4,108548
 trilogy/core/optimization.py,sha256=SpWRQL1biAUvMCijk2I-FCQY2KzXd4eiu3ZlxzVE-uQ,4505
 trilogy/core/query_processor.py,sha256=w_CS2TEmSk8Bhk6ukxLavQgQyA9UwcgoPChouLREujQ,11747
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,8 +45,8 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=tAADeVruch-flFiedbY1zi7uk
 trilogy/core/processing/nodes/unnest_node.py,sha256=t4kY3a_dR3iXistPemStfdw0uJfnxwTcoQg1HiDa3xo,1501
 trilogy/core/processing/nodes/window_node.py,sha256=QjAWgqBZqFSRCPwc7JBmgQJobWW50rsHI0pjJe0Zzg0,926
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=Xe2YZPrRyiyqZXp1k9201D0EjnIy428A4CDzJ65JyGY,29223
-trilogy/dialect/bigquery.py,sha256=5R6sGTgVRmTBGO-eFQEkztYFyXsez585rPN7Xu5L41o,2907
+trilogy/dialect/base.py,sha256=nYrm7Z-GnVVhr5vWHjMghWkGoq2r7ogzoGVasAGTxGo,29223
+trilogy/dialect/bigquery.py,sha256=9vxQn2BMv_oTGQSWQpoN5ho_OgqMWaHH9e-5vQVf44c,2906
 trilogy/dialect/common.py,sha256=zWrYmvevlXznocw9uGHmY5Ws1rp_kICm9zA_ulTe4eg,2165
 trilogy/dialect/config.py,sha256=JdGIiHf2EVoFNTYzqQUy1bMmzqZiFTjcnYglzAMa4dM,3351
 trilogy/dialect/duckdb.py,sha256=Ddyt68sr8IL2HnZMenyytoD65FXwY_O2pz1McyS0bis,3075
@@ -70,9 +70,9 @@ trilogy/parsing/parse_engine.py,sha256=TLy56pDatDfzfwbJkrJ-XXB05s_VW9_iRrkwtKR0G
 trilogy/parsing/render.py,sha256=fxjpq2FZLgllw_d4cru-t_IXNPAz2DmYkT7v9ED0XRI,11540
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.1.106.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.1.106.dist-info/METADATA,sha256=PCZYzrx7U69kPjUwtLsobgnjrTqUQt-VGTgC9zvd1ag,6883
-pytrilogy-0.0.1.106.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-pytrilogy-0.0.1.106.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.1.106.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.1.106.dist-info/RECORD,,
+pytrilogy-0.0.1.107.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.1.107.dist-info/METADATA,sha256=KF68qL9kNj855oUEtUVCCMd5hei-LRfABfoaEWlTa8g,7882
+pytrilogy-0.0.1.107.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+pytrilogy-0.0.1.107.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.1.107.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.1.107.dist-info/RECORD,,

{pytrilogy-0.0.1.106.dist-info → pytrilogy-0.0.1.107.dist-info}/WHEEL

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

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.1.106"
+__version__ = "0.0.1.107"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -1669,7 +1669,7 @@ class Datasource(Namespaced, BaseModel):
         namespace = self.namespace.replace(".", "_") if self.namespace else ""
         return f"{namespace}_{self.identifier}"
 
-    @cached_property
+    @property
     def safe_location(self) -> str:
         if isinstance(self.address, Address):
             return self.address.location

trilogy/dialect/base.py

@@ -229,11 +229,11 @@ def safe_get_cte_value(coalesce, cte: CTE, c: Concept, quote_char: str):
         return INVALID_REFERENCE_STRING("Missing source reference")
     if isinstance(raw, str):
         rendered = cte.get_alias(c, raw)
-        return f"{raw}.{quote_char}{rendered}{quote_char}"
+        return f"{raw}.{safe_quote(rendered, quote_char)}"
     if isinstance(raw, list) and len(raw) == 1:
         rendered = cte.get_alias(c, raw[0])
-        return f"{raw[0]}.{quote_char}{rendered}{quote_char}"
-    return coalesce([f"{x}.{quote_char}{cte.get_alias(c, x)}{quote_char}" for x in raw])
+        return f"{raw[0]}.{safe_quote(rendered, quote_char)}"
+    return coalesce([f"{x}.{safe_quote(cte.get_alias(c, x), quote_char)}" for x in raw])
 
 
 class BaseDialect:

trilogy/dialect/bigquery.py

@@ -45,7 +45,7 @@ WITH {% for cte in ctes %}
 {{cte.name}} as ({{cte.statement}}){% if not loop.last %},{% endif %}{% endfor %}{% endif %}
 {%- if full_select -%}
 {{full_select}}
-{%- else -%}
+{% else -%}
 
 SELECT
 {%- for select in select_columns %}