Merge pull request #136 from malloydata/maden/update-malloy

Update malloy version.
malloydata · Aug 28, 2024 · fffa842 · fffa842
2 parents abe7d21 + 31520eb
commit fffa842
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/malloy/data/bigquery/bq_connection.py b/src/malloy/data/bigquery/bq_connection.py
@@ -143,7 +143,7 @@ def _to_inner_struct_def(self, name, mode):
         },
         "structRelationship": {
             "type": "nested",
-            "field": name,
+            "fieldName": name,
             "isArray": False
         } if mode == "REPEATED" else {
             "type": "inline"
@@ -167,7 +167,7 @@ def _map_schema(self, schema):
       elif metadata.field_type in self.TYPE_MAP:
         field |= self.TYPE_MAP[metadata.field_type]
       else:
-        field["type"] = "unsupported"
+        field["type"] = "sql native"
         field["rawType"] = metadata.field_type.lower()
       fields.append(field)
 
@@ -191,7 +191,7 @@ def _map_sql_block_schema(self, schema):
       elif schema_field["type"] in self.TYPE_MAP:
         field |= self.TYPE_MAP[schema_field["type"]]
       else:
-        field["type"] = "unsupported"
+        field["type"] = "sql native"
         field["rawType"] = schema_field["type"].lower()
       fields.append(field)
 

diff --git a/src/malloy/data/duckdb/duckdb_connection.py b/src/malloy/data/duckdb/duckdb_connection.py
@@ -184,7 +184,7 @@ def _map_fields(self, schema):
             },
             "structRelationship": {
                 "type": "nested" if is_array else "inline",
-                "field": name,
+                "fieldName": name,
                 "isArray": False,
             },
             "fields": self._map_fields(sub_schema),
@@ -205,7 +205,7 @@ def _map_fields(self, schema):
               },
               "structRelationship": {
                   "type": "nested",
-                  "field": name,
+                  "fieldName": name,
                   "isArray": True,
               },
               "fields": [{

diff --git a/src/malloy/utils/third_party_licenses.py b/src/malloy/utils/third_party_licenses.py
@@ -84,6 +84,9 @@
     'grpcio-tools': {
         METADATA_LICENSE_FILE: 'LICENSE'
     },
+    'jinja2': {
+        METADATA_LICENSE_FILE: 'LICENSE.txt'
+    },
     'jaraco-classes': {
         METADATA_NAME: 'jaraco.classes'
     },
@@ -115,6 +118,9 @@
     'markdown-it-py': {
         METADATA_LICENSE_FILE: 'LICENSE'
     },
+    'markupsafe': {
+        METADATA_LICENSE_FILE: 'LICENSE.txt'
+    },
     'more-itertools': {
         METADATA_LICENSE_FILE: 'LICENSE'
     },
@@ -167,10 +173,8 @@
         METADATA_NAME: 'typing_extensions'
     },
     'uri-template': {
-        METADATA_URL:
-            'https://gitlab.linss.com/open-source/python/uri-template/-',
-        METADATA_LICENSE_FILE:
-            'LICENSE'
+        METADATA_URL: 'https://github.com/plinss/uri-template',
+        METADATA_LICENSE_FILE: 'LICENSE'
     },
     'webencodings': {
         METADATA_LICENSE_FILE: 'LICENSE'

diff --git a/submodules/malloy-service b/submodules/malloy-service
diff --git a/tests/malloy/test_runtime.py b/tests/malloy/test_runtime.py
@@ -90,10 +90,10 @@ async def test_returns_sql(service_manager):
   [sql, connection] = await rt.get_sql(query=query_by_state)
   assert (sql == """
 SELECT\x20
-   airports."state" as "state",
+   base."state" as "state",
    COUNT(1) as "airport_count"
-FROM 'data/airports.parquet' as airports
-WHERE airports."state" IS NOT NULL
+FROM 'data/airports.parquet' as base
+WHERE base."state" IS NOT NULL
 GROUP BY 1
 ORDER BY 2 desc NULLS LAST
 """.lstrip())
+1,090 −1,464		package-lock.json
+7 −4		package.json
+1 −1		scripts/license-disclaimer.ts
+2 −2		scripts/third-party-licenses.ts
+1 −0		src/server.ts
+2 −2		src/services/v1/compiler_handler.ts
+4 −7		src/services/v1/compiler_runtime.ts
+1 −1		src/services/v1/compiler_urlreader.ts
+10 −11		src/services/v1/streaming_compile_connection.ts
+1 −1		src/services/v1/streaming_compile_urlreader.ts