pytrilogy 0.0.3.84__tar.gz → 0.0.3.85__tar.gz

{pytrilogy-0.0.3.84/pytrilogy.egg-info → pytrilogy-0.0.3.85}/PKG-INFO

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

{pytrilogy-0.0.3.84 → pytrilogy-0.0.3.85/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.84 → pytrilogy-0.0.3.85}/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.84"
+__version__ = "0.0.3.85"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.84 → pytrilogy-0.0.3.85}/trilogy/core/processing/utility.py

@@ -161,6 +161,9 @@ def resolve_join_order_v2(
                 left_is_partial = any(
                     key in partials.get(left_candidate, []) for key in common
                 )
+                left_is_nullable = any(
+                    key in nullables.get(left_candidate, []) for key in common
+                )
                 right_is_partial = any(key in partials.get(right, []) for key in common)
                 # we don't care if left is nullable for join type (just keys), but if we did
                 # left_is_nullable = any(
@@ -169,21 +172,29 @@ def resolve_join_order_v2(
                 right_is_nullable = any(
                     key in nullables.get(right, []) for key in common
                 )
-                if left_is_partial or right_is_nullable:
+                if left_is_nullable and right_is_nullable:
+                    join_type = JoinType.FULL
+                elif left_is_partial and right_is_partial:
+                    join_type = JoinType.FULL
+                elif left_is_partial:
                     join_type = JoinType.FULL
-                elif right_is_partial:
+                elif right_is_nullable:
+                    join_type = JoinType.RIGHT_OUTER
+                elif right_is_partial or left_is_nullable:
                     join_type = JoinType.LEFT_OUTER
                 # we can't inner join if the left was an outer join
                 else:
                     join_type = JoinType.INNER
+
                 join_types.add(join_type)
                 joinkeys[left_candidate] = common
-
             final_join_type = JoinType.INNER
-            if any([x == JoinType.LEFT_OUTER for x in join_types]):
-                final_join_type = JoinType.LEFT_OUTER
-            elif any([x == JoinType.FULL for x in join_types]):
+            if any([x == JoinType.FULL for x in join_types]):
                 final_join_type = JoinType.FULL
+            elif any([x == JoinType.LEFT_OUTER for x in join_types]):
+                final_join_type = JoinType.LEFT_OUTER
+            elif any([x == JoinType.RIGHT_OUTER for x in join_types]):
+                final_join_type = JoinType.RIGHT_OUTER
             output.append(
                 JoinOrderOutput(
                     # left=left_candidate,
@@ -608,13 +619,12 @@ def find_nullable_concepts(
         local_nullable = [
             x for x in datasources if k in [v.address for v in x.nullable_concepts]
         ]
-        if all(
-            [
-                k in [v.address for v in x.nullable_concepts]
-                for x in datasources
-                if k in [z.address for z in x.output_concepts]
-            ]
-        ):
+        nullable_matches = [
+            k in [v.address for v in x.nullable_concepts]
+            for x in datasources
+            if k in [z.address for z in x.output_concepts]
+        ]
+        if all(nullable_matches) and len(nullable_matches) > 0:
             final_nullable.add(k)
         all_ds = set([ds for ds in local_nullable]).union(nullable_datasources)
         if nullable_datasources:

{pytrilogy-0.0.3.84 → pytrilogy-0.0.3.85}/trilogy/std/geography.preql

@@ -9,10 +9,11 @@ type us_zip_code string; # US ZIP code
 ## generic types
 type latitude float; # Latitude in degrees
 type longitude float; # Longitude in degrees
-type lat_long string; # Latitude and longitude in degrees
+type lat_long string; # Latitude and longitude in degrees, as a coordinate pair
 
 type city string; # City name
-type country string; # Country name
+type country string; # Full Country Name
+type country_code string; # ISO-3166 Country code - ex US, CA, GB
 type timezone string; # Timezone name
 type region string; # Region name
 

pytrilogy-0.0.3.85/trilogy/std/net.preql

@@ -0,0 +1,14 @@
+
+## network types
+type url string; # URL string
+type url_image string; # URL of an image
+type domain string; # Domain name
+type ip_net_mask string; # IP network mask
+type ipv6_address string; # IPv6 address
+type ipv4_address string; # IPv4 address
+
+## communication types
+type email_address string; # Email address, including @
+
+## shared types
+type suffix string; # A file suffix or extension, like .txt, .jpg, etc.

pytrilogy-0.0.3.84/trilogy/std/net.preql

@@ -1,9 +0,0 @@
-
-
-type url string;
-type domain string;
-type ip_net_mask string;
-type ipv6_address string;
-type ipv4_address string;
-type suffix string;
-type url_image string;