pytrilogy 0.0.1.106__tar.gz → 0.0.1.107__tar.gz

{pytrilogy-0.0.1.106/pytrilogy.egg-info → pytrilogy-0.0.1.107}/PKG-INFO

@@ -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 → pytrilogy-0.0.1.107}/README.md

@@ -246,3 +246,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 → pytrilogy-0.0.1.107/pytrilogy.egg-info}/PKG-INFO

@@ -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 → pytrilogy-0.0.1.107}/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"]

{pytrilogy-0.0.1.106 → pytrilogy-0.0.1.107}/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

{pytrilogy-0.0.1.106 → pytrilogy-0.0.1.107}/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:

{pytrilogy-0.0.1.106 → pytrilogy-0.0.1.107}/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 %}