pytrilogy 0.0.3.74__py3-none-any.whl → 0.0.3.75__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of pytrilogy might be problematic. Click here for more details.

Files changed (9) hide show
  1. {pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/METADATA +1 -1
  2. {pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/RECORD +9 -9
  3. trilogy/__init__.py +1 -1
  4. trilogy/parsing/parse_engine.py +6 -2
  5. trilogy/parsing/trilogy.lark +1 -1
  6. {pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/WHEEL +0 -0
  7. {pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/entry_points.txt +0 -0
  8. {pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/licenses/LICENSE.md +0 -0
  9. {pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/top_level.txt +0 -0
{pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytrilogy
3
- Version: 0.0.3.74
3
+ Version: 0.0.3.75
4
4
  Summary: Declarative, typed query language that compiles to SQL.
5
5
  Home-page:
6
6
  Author:
{pytrilogy-0.0.3.74.dist-info → pytrilogy-0.0.3.75.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
- pytrilogy-0.0.3.74.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
2
- trilogy/__init__.py,sha256=-tu5G2_JLIrEtSCh2c0MSRV1txclwOCIZpbTn2SSsj4,303
1
+ pytrilogy-0.0.3.75.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
2
+ trilogy/__init__.py,sha256=MIf9sLTcNq9Rl4yjZRDALK9URcm1vSxXzixHDnfPJg0,303
3
3
  trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
4
4
  trilogy/constants.py,sha256=eKb_EJvSqjN9tGbdVEViwdtwwh8fZ3-jpOEDqL71y70,1691
5
5
  trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -97,9 +97,9 @@ trilogy/parsing/common.py,sha256=yV1AckK0h8u1OFeGQBTMu-wuW5m63c5CcZuPicsTH_w,306
97
97
  trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
98
98
  trilogy/parsing/exceptions.py,sha256=Xwwsv2C9kSNv2q-HrrKC1f60JNHShXcCMzstTSEbiCw,154
99
99
  trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
100
- trilogy/parsing/parse_engine.py,sha256=quD0yuavWvSw-d_0kq774_Q29KgJDlr9VhDQv62udyY,74471
100
+ trilogy/parsing/parse_engine.py,sha256=XQa8kSLiXd--MH89HvwlyNClQnFJ7ZLkm8PwxMsxHeY,74587
101
101
  trilogy/parsing/render.py,sha256=HSNntD82GiiwHT-TWPLXAaIMWLYVV5B5zQEsgwrHIBE,19605
102
- trilogy/parsing/trilogy.lark,sha256=srzQ2zTfHjNfIP13XwDhHRCNIvmZyx_4AF7ha4sNCic,14970
102
+ trilogy/parsing/trilogy.lark,sha256=v2UqMBhU9hn9km4mvQkk3E2wsEZjJ4cz4wU72NFFvU4,14993
103
103
  trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
104
104
  trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
105
105
  trilogy/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -110,8 +110,8 @@ trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
110
110
  trilogy/std/net.preql,sha256=7l7MqIjs6TDCpO6dBAoNJU81Ex255jZRK36kBgE1GDs,158
111
111
  trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
112
112
  trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
113
- pytrilogy-0.0.3.74.dist-info/METADATA,sha256=YRMjU1pyIGds_7Y7b7rP_gbF-4XGdF7gOSO6uGGpZys,9734
114
- pytrilogy-0.0.3.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
115
- pytrilogy-0.0.3.74.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
116
- pytrilogy-0.0.3.74.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
117
- pytrilogy-0.0.3.74.dist-info/RECORD,,
113
+ pytrilogy-0.0.3.75.dist-info/METADATA,sha256=BiUDu-P-eT6dmtLstg2EmFFJ0Pc-eU6k17U--NmkXqU,9734
114
+ pytrilogy-0.0.3.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
115
+ pytrilogy-0.0.3.75.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
116
+ pytrilogy-0.0.3.75.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
117
+ pytrilogy-0.0.3.75.dist-info/RECORD,,
trilogy/__init__.py CHANGED
@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
4
4
  from trilogy.executor import Executor
5
5
  from trilogy.parser import parse
6
6
 
7
- __version__ = "0.0.3.74"
7
+ __version__ = "0.0.3.75"
8
8
 
9
9
  __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]
trilogy/parsing/parse_engine.py CHANGED
@@ -524,8 +524,12 @@ class ParseToObjects(Transformer):
524
524
  @v_args(meta=True)
525
525
  def column_assignment(self, meta: Meta, args):
526
526
  modifiers = []
527
- alias = args[0]
528
- concept_list = args[1]
527
+ if len(args) == 2:
528
+ alias = args[0]
529
+ concept_list = args[1]
530
+ else:
531
+ alias = args[0][-1]
532
+ concept_list = args[0]
529
533
  # recursively collect modifiers
530
534
  if len(concept_list) > 1:
531
535
  modifiers += concept_list[:-1]
trilogy/parsing/trilogy.lark CHANGED
@@ -51,7 +51,7 @@
51
51
 
52
52
  //column_assignment
53
53
  //figure out if we want static
54
- column_assignment: (raw_column_assignment | IDENTIFIER | QUOTED_IDENTIFIER | expr ) ":" concept_assignment
54
+ column_assignment: ((raw_column_assignment | IDENTIFIER | QUOTED_IDENTIFIER | expr ) ":" concept_assignment) | concept_assignment
55
55
 
56
56
  RAW_ENTRY.1: /raw\s*\(/s
57
57