Merge branch 'main' into experimental-dialects

malloydata · Mar 18, 2024 · a070058 · a070058
2 parents 2e83075 + a3d5be3
commit a070058
Show file tree

Hide file tree

Showing 32 changed files with 57 additions and 703 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": false,
-  "version": "0.0.132",
+  "version": "0.0.133",
   "command": {
     "version": {
       "allowBranch": "main"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/malloy-db-bigquery/package.json b/packages/malloy-db-bigquery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "@google-cloud/bigquery": "^7.3.0",
     "@google-cloud/common": "^5.0.1",
     "@google-cloud/paginator": "^5.0.0",
-    "@malloydata/malloy": "^0.0.132",
+    "@malloydata/malloy": "^0.0.133",
     "gaxios": "^4.2.0"
   }
 }
diff --git a/packages/malloy-db-duckdb/package.json b/packages/malloy-db-duckdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.28.1-dev106.0",
-    "@malloydata/malloy": "^0.0.132",
+    "@malloydata/malloy": "^0.0.133",
     "@motherduck/wasm-client": "^0.4.0",
     "apache-arrow": "^14.0.0",
     "duckdb": "0.9.2",

diff --git a/packages/malloy-db-postgres/package.json b/packages/malloy-db-postgres/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.132",
+    "@malloydata/malloy": "^0.0.133",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"

diff --git a/packages/malloy-db-snowflake/package.json b/packages/malloy-db-snowflake/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-snowflake",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.132",
+    "@malloydata/malloy": "^0.0.133",
     "@types/snowflake-sdk": "^1.6.16",
     "generic-pool": "^3.9.0",
     "snowflake-sdk": "^1.9.0",

diff --git a/packages/malloy-db-trino/package.json b/packages/malloy-db-trino/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/tmp_index.js",
   "types": "dist/tmp_index.d.ts",

diff --git a/packages/malloy-interfaces/package.json b/packages/malloy-interfaces/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-interfaces",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/malloy-lint/package.json b/packages/malloy-lint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/eslint-plugin-lint",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/malloy-malloy-sql/package.json b/packages/malloy-malloy-sql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-sql",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.132"
+    "@malloydata/malloy": "^0.0.133"
   },
   "devDependencies": {
     "peggy": "^3.0.2"

diff --git a/packages/malloy-render/package.json b/packages/malloy-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.132",
+  "version": "0.0.133",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@lit/context": "^1.1.0",
-    "@malloydata/malloy": "^0.0.132",
+    "@malloydata/malloy": "^0.0.133",
     "@types/luxon": "^2.4.0",
     "lit": "^3.0.2",
     "lodash": "^4.17.20",

diff --git a/packages/malloy-syntax-highlight/grammars/malloy/malloy.monarch.ts b/packages/malloy-syntax-highlight/grammars/malloy/malloy.monarch.ts
@@ -47,18 +47,6 @@ export const monarch: Monaco.IMonarchLanguage = {
       {include: '@identifiers_unquoted'},
     ],
     sql_string: [
-      [
-        /\b(select)(\s*:\s*)(""")/,
-        [
-          'keyword.control.select',
-          '',
-          {
-            next: '@sql_end',
-            nextEmbedded: 'sql',
-            token: 'punctuation.sql.block.open',
-          },
-        ],
-      ],
       [
         /(\b[A-Za-z_][A-Za-z_0-9]*)(\s*\.\s*)(sql)(\s*\(\s*)(""")/,
         [
@@ -196,7 +184,6 @@ export const monarch: Monaco.IMonarchLanguage = {
     ],
     properties: [
       [/\baccept\b/, 'keyword.control.accept'],
-      [/\bsql\b/, 'keyword.control.sql'],
       [/\bselect\b/, 'keyword.control.select'],
       [/\bconnection\b/, 'keyword.control.connection'],
       [/\brun\b/, 'keyword.control.run'],
@@ -236,7 +223,7 @@ export const monarch: Monaco.IMonarchLanguage = {
         ['entity.name.function', '', 'entity.name.function.modifier'],
       ],
       [
-        /\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|TABLE|FROM|FROM_SQL|UNGROUPED)(\s*\()/,
+        /\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\s*\()/,
         ['entity.name.function', ''],
       ],
       [/\b([a-zA-Z_][a-zA-Z_0-9]*)(\s*\()/, ['entity.name.function', '']],

diff --git a/packages/malloy-syntax-highlight/grammars/malloy/malloy.tmGrammar.json b/packages/malloy-syntax-highlight/grammars/malloy/malloy.tmGrammar.json
@@ -39,22 +39,6 @@
     },
     "sql-string": {
       "patterns": [
-        {
-          "begin": "\\b(select)(\\s*:\\s*)(\"\"\")",
-          "end": "\"\"\"",
-          "beginCaptures": {
-            "1": { "name": "keyword.control.select" },
-            "3": { "name": "punctuation.sql-block.open" }
-          },
-          "endCaptures": {
-            "0": { "name": "punctuation.sql-block.close" }
-          },
-          "name": "source.sql",
-          "patterns": [
-            { "include": "#malloy-in-sql" },
-            { "include": "source.sql" }
-          ]
-        },
         {
           "begin": "(\\b[A-Za-z_][A-Za-z_0-9]*)(\\s*\\.\\s*)(sql)(\\s*\\(\\s*)(\"\"\")",
           "end": "\"\"\"",
@@ -84,7 +68,7 @@
           }
         },
         {
-          "match": "(?i)\\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|TABLE|FROM|FROM_SQL|UNGROUPED)(\\s*\\()",
+          "match": "(?i)\\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\\s*\\()",
           "captures": {
             "1": { "name": "entity.name.function" }
           }
@@ -350,11 +334,7 @@
           "match": "(?i)\\baccept\\b",
           "name": "keyword.control.accept"
         },
-        {
-          "match": "(?i)\\bsql\\b",
-          "name": "keyword.control.sql"
-        },
-        {
+       {
           "match": "(?i)\\bselect\\b",
           "name": "keyword.control.select"
         },

diff --git a/packages/malloy-syntax-highlight/grammars/malloy/malloyTestInput.ts b/packages/malloy-syntax-highlight/grammars/malloy/malloyTestInput.ts
@@ -60,7 +60,6 @@ export default [
   ["/'regexp string /*-- \\escapes\\uFFFF \\'more\\"],
   ['"/* -- \\e\\uFFFF \\\'\\'],
   ["state ~ 'CA' | r'M.' | \"CO\" | /'O.'  -- end"],
-  ['select: """ SELECT 1 """'],
   ['run: duckdb.sql("""', '  SELECT 1', '""")'],
   // [
   //   'select: """',