@malloydata/malloy-tests 0.0.100-dev231107154720 → 0.0.100

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.
Files changed (10) hide show
  1. package/dist/databases/all/lenses.spec.js +139 -0
  2. package/dist/databases/all/lenses.spec.js.map +1 -1
  3. package/dist/util/db-jest-matchers.js +3 -2
  4. package/dist/util/db-jest-matchers.js.map +1 -1
  5. package/dist/util/index.js +3 -1
  6. package/dist/util/index.js.map +1 -1
  7. package/package.json +6 -6
  8. package/src/databases/all/lenses.spec.ts +139 -0
  9. package/src/util/db-jest-matchers.ts +3 -2
  10. package/src/util/index.ts +3 -1
package/dist/databases/all/lenses.spec.js CHANGED
@@ -42,6 +42,33 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
42
42
  run: x -> d + m
43
43
  `).malloyResultMatches(runtime, { n: 1, c: 1 });
44
44
  });
45
+ it(`named view plus measure - ${databaseName}`, async () => {
46
+ await expect(`
47
+ ##! experimental { scalar_lenses }
48
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
49
+ view: d is { group_by: n }
50
+ measure: c is count()
51
+ }
52
+ run: x -> d + c
53
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
54
+ });
55
+ it(`dimension plus named view - ${databaseName}`, async () => {
56
+ await expect(`
57
+ ##! experimental { scalar_lenses }
58
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
59
+ view: m is { aggregate: c is count() }
60
+ }
61
+ run: x -> n + m
62
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
63
+ });
64
+ it(`where headed - ${databaseName}`, async () => {
65
+ await expect(`
66
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
67
+ view: m is { aggregate: c is count() }
68
+ }
69
+ run: x -> { where: true } + m
70
+ `).malloyResultMatches(runtime, { c: 1 });
71
+ });
45
72
  it(`named view plus named view in source - ${databaseName}`, async () => {
46
73
  await expect(`
47
74
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -52,6 +79,26 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
52
79
  run: x -> y
53
80
  `).malloyResultMatches(runtime, { n: 1, c: 1 });
54
81
  });
82
+ it(`dimension plus named view in source - ${databaseName}`, async () => {
83
+ await expect(`
84
+ ##! experimental { scalar_lenses }
85
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
86
+ view: m is { aggregate: c is count() }
87
+ view: y is n + m
88
+ }
89
+ run: x -> y
90
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
91
+ });
92
+ it(`named view plus dimension in source - ${databaseName}`, async () => {
93
+ await expect(`
94
+ ##! experimental { scalar_lenses }
95
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
96
+ view: m is { aggregate: c is count() }
97
+ view: y is m + n
98
+ }
99
+ run: x -> y
100
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
101
+ });
55
102
  it(`literal view plus named view - ${databaseName}`, async () => {
56
103
  await expect(`
57
104
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -60,6 +107,24 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
60
107
  run: x -> { group_by: n } + m
61
108
  `).malloyResultMatches(runtime, { n: 1, c: 1 });
62
109
  });
110
+ it(`literal view plus measure - ${databaseName}`, async () => {
111
+ await expect(`
112
+ ##! experimental { scalar_lenses }
113
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
114
+ measure: c is count()
115
+ }
116
+ run: x -> { group_by: n } + c
117
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
118
+ });
119
+ it(`dimension plus literal view - ${databaseName}`, async () => {
120
+ await expect(`
121
+ ##! experimental { scalar_lenses }
122
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
123
+ measure: c is count()
124
+ }
125
+ run: x -> c + { group_by: n }
126
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
127
+ });
63
128
  it(`literal view plus named view in source - ${databaseName}`, async () => {
64
129
  await expect(`
65
130
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -69,6 +134,16 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
69
134
  run: x -> y
70
135
  `).malloyResultMatches(runtime, { n: 1, c: 1 });
71
136
  });
137
+ it(`literal view plus measure in source - ${databaseName}`, async () => {
138
+ await expect(`
139
+ ##! experimental { scalar_lenses }
140
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
141
+ measure: c is count()
142
+ view: y is { group_by: n } + c
143
+ }
144
+ run: x -> y
145
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
146
+ });
72
147
  it(`named view plus literal view - ${databaseName}`, async () => {
73
148
  await expect(`
74
149
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -115,5 +190,69 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
115
190
  }
116
191
  `).malloyResultMatches(runtime, { 'y.n': 1, 'y.c': 1 });
117
192
  });
193
+ it(`nested no name with dimension head - ${databaseName}`, async () => {
194
+ await expect(`
195
+ ##! experimental { scalar_lenses }
196
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
197
+ view: m is { aggregate: c is count() }
198
+ }
199
+ run: x -> {
200
+ nest: n + m
201
+ }
202
+ `).malloyResultMatches(runtime, { 'n.n': 1, 'n.c': 1 });
203
+ });
204
+ it.skip(`nest dimension only - ${databaseName}`, async () => {
205
+ await expect(`
206
+ ##! experimental { scalar_lenses }
207
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
208
+ view: m is { aggregate: c is count() }
209
+ }
210
+ run: x -> {
211
+ nest: n
212
+ }
213
+ `).malloyResultMatches(runtime, { n: [{ n: 1 }] });
214
+ });
215
+ it(`view dimension only - ${databaseName}`, async () => {
216
+ await expect(`
217
+ ##! experimental { scalar_lenses }
218
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
219
+ view: m is n
220
+ }
221
+ run: x -> m
222
+ `).malloyResultMatches(runtime, { n: 1 });
223
+ });
224
+ it(`run dimension only - ${databaseName}`, async () => {
225
+ await expect(`
226
+ ##! experimental { scalar_lenses }
227
+ source: x is ${databaseName}.sql("SELECT 1 AS n")
228
+ run: x -> n
229
+ `).malloyResultMatches(runtime, { n: 1 });
230
+ });
231
+ it.skip(`second stage refinement chain - ${databaseName}`, async () => {
232
+ await expect(`
233
+ ##! experimental { scalar_lenses }
234
+ source: x is ${databaseName}.sql("SELECT 1 AS n")
235
+ run: x -> n -> n + { aggregate: c is count() }
236
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
237
+ });
238
+ it.skip(`second stage refinement chain in nest - ${databaseName}`, async () => {
239
+ await expect(`
240
+ ##! experimental { scalar_lenses }
241
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
242
+ view: v is n -> n + { aggregate: c is count() }
243
+ }
244
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
245
+ });
246
+ it(`copy of view with lens - ${databaseName}`, async () => {
247
+ await expect(`
248
+ ##! experimental { scalar_lenses }
249
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
250
+ view: metrics is { aggregate: c is count() }
251
+ view: v is { group_by: n } + metrics
252
+ view: v2 is v
253
+ }
254
+ run: x -> v
255
+ `).malloyResultMatches(runtime, { n: 1, c: 1 });
256
+ });
118
257
  });
119
258
  //# sourceMappingURL=lenses.spec.js.map
package/dist/databases/all/lenses.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lenses.spec.js","sourceRoot":"","sources":["../../../src/databases/all/lenses.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lenses.spec.js","sourceRoot":"","sources":["../../../src/databases/all/lenses.spec.ts"],"names":[],"mappings":"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"}
package/dist/util/db-jest-matchers.js CHANGED
@@ -69,17 +69,18 @@ expect.extend({
69
69
  result = await query.run();
70
70
  }
71
71
  catch (e) {
72
- let failMsg = `query.run failed: ${e.message}`;
72
+ let failMsg = `query.run failed: ${e.message}\n`;
73
73
  if (e instanceof malloy_1.MalloyError) {
74
74
  failMsg = `Error in query compilation\n${errorLogToString(querySrc, e.problems)}`;
75
75
  }
76
76
  else {
77
77
  try {
78
- failMsg += `\nSQL: ${await query.getSQL()}`;
78
+ failMsg += `SQL: ${await query.getSQL()}\n`;
79
79
  }
80
80
  catch (e2) {
81
81
  // we could not show the SQL for unknown reasons
82
82
  }
83
+ failMsg += e.stack;
83
84
  }
84
85
  return { pass: false, message: () => failMsg };
85
86
  }
package/dist/util/db-jest-matchers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"db-jest-matchers.js","sourceRoot":"","sources":["../../src/util/db-jest-matchers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"db-jest-matchers.js","sourceRoot":"","sources":["../../src/util/db-jest-matchers.ts"],"names":[],"mappings":"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"}
package/dist/util/index.js CHANGED
@@ -157,7 +157,9 @@ async function runQuery(runtime, querySrc) {
157
157
  result = await query.run();
158
158
  }
159
159
  catch (e) {
160
- throw new Error(`query.run failed: ${e.message}\n` + `SQL: ${await query.getSQL()}`);
160
+ throw new Error(`query.run failed: ${e.message}\n` +
161
+ `SQL: ${await query.getSQL()}\n` +
162
+ e.stack);
161
163
  }
162
164
  return result;
163
165
  }
package/dist/util/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -18,11 +18,11 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@jest/globals": "^29.4.3",
21
- "@malloydata/db-bigquery": "^0.0.100-dev231107154720",
22
- "@malloydata/db-duckdb": "^0.0.100-dev231107154720",
23
- "@malloydata/db-postgres": "^0.0.100-dev231107154720",
24
- "@malloydata/malloy": "^0.0.100-dev231107154720",
25
- "@malloydata/render": "^0.0.100-dev231107154720",
21
+ "@malloydata/db-bigquery": "^0.0.100",
22
+ "@malloydata/db-duckdb": "^0.0.100",
23
+ "@malloydata/db-postgres": "^0.0.100",
24
+ "@malloydata/malloy": "^0.0.100",
25
+ "@malloydata/render": "^0.0.100",
26
26
  "jsdom": "^22.1.0",
27
27
  "luxon": "^2.4.0",
28
28
  "madge": "^6.0.0"
@@ -31,5 +31,5 @@
31
31
  "@types/jsdom": "^21.1.1",
32
32
  "@types/luxon": "^2.4.0"
33
33
  },
34
- "version": "0.0.100-dev231107154720"
34
+ "version": "0.0.100"
35
35
  }
package/src/databases/all/lenses.spec.ts CHANGED
@@ -45,6 +45,33 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
45
45
  run: x -> d + m
46
46
  `).malloyResultMatches(runtime, {n: 1, c: 1});
47
47
  });
48
+ it(`named view plus measure - ${databaseName}`, async () => {
49
+ await expect(`
50
+ ##! experimental { scalar_lenses }
51
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
52
+ view: d is { group_by: n }
53
+ measure: c is count()
54
+ }
55
+ run: x -> d + c
56
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
57
+ });
58
+ it(`dimension plus named view - ${databaseName}`, async () => {
59
+ await expect(`
60
+ ##! experimental { scalar_lenses }
61
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
62
+ view: m is { aggregate: c is count() }
63
+ }
64
+ run: x -> n + m
65
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
66
+ });
67
+ it(`where headed - ${databaseName}`, async () => {
68
+ await expect(`
69
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
70
+ view: m is { aggregate: c is count() }
71
+ }
72
+ run: x -> { where: true } + m
73
+ `).malloyResultMatches(runtime, {c: 1});
74
+ });
48
75
  it(`named view plus named view in source - ${databaseName}`, async () => {
49
76
  await expect(`
50
77
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -55,6 +82,26 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
55
82
  run: x -> y
56
83
  `).malloyResultMatches(runtime, {n: 1, c: 1});
57
84
  });
85
+ it(`dimension plus named view in source - ${databaseName}`, async () => {
86
+ await expect(`
87
+ ##! experimental { scalar_lenses }
88
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
89
+ view: m is { aggregate: c is count() }
90
+ view: y is n + m
91
+ }
92
+ run: x -> y
93
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
94
+ });
95
+ it(`named view plus dimension in source - ${databaseName}`, async () => {
96
+ await expect(`
97
+ ##! experimental { scalar_lenses }
98
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
99
+ view: m is { aggregate: c is count() }
100
+ view: y is m + n
101
+ }
102
+ run: x -> y
103
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
104
+ });
58
105
  it(`literal view plus named view - ${databaseName}`, async () => {
59
106
  await expect(`
60
107
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -63,6 +110,24 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
63
110
  run: x -> { group_by: n } + m
64
111
  `).malloyResultMatches(runtime, {n: 1, c: 1});
65
112
  });
113
+ it(`literal view plus measure - ${databaseName}`, async () => {
114
+ await expect(`
115
+ ##! experimental { scalar_lenses }
116
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
117
+ measure: c is count()
118
+ }
119
+ run: x -> { group_by: n } + c
120
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
121
+ });
122
+ it(`dimension plus literal view - ${databaseName}`, async () => {
123
+ await expect(`
124
+ ##! experimental { scalar_lenses }
125
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
126
+ measure: c is count()
127
+ }
128
+ run: x -> c + { group_by: n }
129
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
130
+ });
66
131
  it(`literal view plus named view in source - ${databaseName}`, async () => {
67
132
  await expect(`
68
133
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -72,6 +137,16 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
72
137
  run: x -> y
73
138
  `).malloyResultMatches(runtime, {n: 1, c: 1});
74
139
  });
140
+ it(`literal view plus measure in source - ${databaseName}`, async () => {
141
+ await expect(`
142
+ ##! experimental { scalar_lenses }
143
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
144
+ measure: c is count()
145
+ view: y is { group_by: n } + c
146
+ }
147
+ run: x -> y
148
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
149
+ });
75
150
  it(`named view plus literal view - ${databaseName}`, async () => {
76
151
  await expect(`
77
152
  source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
@@ -118,4 +193,68 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
118
193
  }
119
194
  `).malloyResultMatches(runtime, {'y.n': 1, 'y.c': 1});
120
195
  });
196
+ it(`nested no name with dimension head - ${databaseName}`, async () => {
197
+ await expect(`
198
+ ##! experimental { scalar_lenses }
199
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
200
+ view: m is { aggregate: c is count() }
201
+ }
202
+ run: x -> {
203
+ nest: n + m
204
+ }
205
+ `).malloyResultMatches(runtime, {'n.n': 1, 'n.c': 1});
206
+ });
207
+ it.skip(`nest dimension only - ${databaseName}`, async () => {
208
+ await expect(`
209
+ ##! experimental { scalar_lenses }
210
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
211
+ view: m is { aggregate: c is count() }
212
+ }
213
+ run: x -> {
214
+ nest: n
215
+ }
216
+ `).malloyResultMatches(runtime, {n: [{n: 1}]});
217
+ });
218
+ it(`view dimension only - ${databaseName}`, async () => {
219
+ await expect(`
220
+ ##! experimental { scalar_lenses }
221
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
222
+ view: m is n
223
+ }
224
+ run: x -> m
225
+ `).malloyResultMatches(runtime, {n: 1});
226
+ });
227
+ it(`run dimension only - ${databaseName}`, async () => {
228
+ await expect(`
229
+ ##! experimental { scalar_lenses }
230
+ source: x is ${databaseName}.sql("SELECT 1 AS n")
231
+ run: x -> n
232
+ `).malloyResultMatches(runtime, {n: 1});
233
+ });
234
+ it.skip(`second stage refinement chain - ${databaseName}`, async () => {
235
+ await expect(`
236
+ ##! experimental { scalar_lenses }
237
+ source: x is ${databaseName}.sql("SELECT 1 AS n")
238
+ run: x -> n -> n + { aggregate: c is count() }
239
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
240
+ });
241
+ it.skip(`second stage refinement chain in nest - ${databaseName}`, async () => {
242
+ await expect(`
243
+ ##! experimental { scalar_lenses }
244
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
245
+ view: v is n -> n + { aggregate: c is count() }
246
+ }
247
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
248
+ });
249
+ it(`copy of view with lens - ${databaseName}`, async () => {
250
+ await expect(`
251
+ ##! experimental { scalar_lenses }
252
+ source: x is ${databaseName}.sql("SELECT 1 AS n") extend {
253
+ view: metrics is { aggregate: c is count() }
254
+ view: v is { group_by: n } + metrics
255
+ view: v2 is v
256
+ }
257
+ run: x -> v
258
+ `).malloyResultMatches(runtime, {n: 1, c: 1});
259
+ });
121
260
  });
package/src/util/db-jest-matchers.ts CHANGED
@@ -122,7 +122,7 @@ expect.extend({
122
122
  try {
123
123
  result = await query.run();
124
124
  } catch (e) {
125
- let failMsg = `query.run failed: ${e.message}`;
125
+ let failMsg = `query.run failed: ${e.message}\n`;
126
126
  if (e instanceof MalloyError) {
127
127
  failMsg = `Error in query compilation\n${errorLogToString(
128
128
  querySrc,
@@ -130,10 +130,11 @@ expect.extend({
130
130
  )}`;
131
131
  } else {
132
132
  try {
133
- failMsg += `\nSQL: ${await query.getSQL()}`;
133
+ failMsg += `SQL: ${await query.getSQL()}\n`;
134
134
  } catch (e2) {
135
135
  // we could not show the SQL for unknown reasons
136
136
  }
137
+ failMsg += e.stack;
137
138
  }
138
139
  return {pass: false, message: () => failMsg};
139
140
  }
package/src/util/index.ts CHANGED
@@ -181,7 +181,9 @@ export async function runQuery(runtime: Runtime, querySrc: string) {
181
181
  result = await query.run();
182
182
  } catch (e) {
183
183
  throw new Error(
184
- `query.run failed: ${e.message}\n` + `SQL: ${await query.getSQL()}`
184
+ `query.run failed: ${e.message}\n` +
185
+ `SQL: ${await query.getSQL()}\n` +
186
+ e.stack
185
187
  );
186
188
  }
187
189