@malloydata/malloy-sql 0.0.37-dev230526070709 → 0.0.37
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.
package/dist/malloySQLParser.js
CHANGED
|
@@ -120,14 +120,14 @@ class MalloySQLParser {
|
|
|
120
120
|
for (const parsedStatement of parsed.statements) {
|
|
121
121
|
if (parsedStatement.statementType === 'malloy' &&
|
|
122
122
|
parsedStatement.config !== '') {
|
|
123
|
-
errors.push(this.createParseError('Only comments are allowed after ">>>malloy"', parsedStatement.delimiterRange));
|
|
123
|
+
errors.push(this.createParseError('Only comments are allowed after ">>>malloy"', parsedStatement.delimiterRange, url));
|
|
124
124
|
}
|
|
125
125
|
if (parsedStatement.config.startsWith('connection:')) {
|
|
126
126
|
const splitConfig = parsedStatement.config.split('connection:');
|
|
127
127
|
if (splitConfig.length > 0)
|
|
128
128
|
config = { connection: splitConfig[1].trim() };
|
|
129
129
|
else
|
|
130
|
-
errors.push(this.createParseError('"connection:" found but no connection value was provided', parsedStatement.delimiterRange));
|
|
130
|
+
errors.push(this.createParseError('"connection:" found but no connection value was provided', parsedStatement.delimiterRange, url));
|
|
131
131
|
}
|
|
132
132
|
const base = {
|
|
133
133
|
statementIndex,
|
|
@@ -146,7 +146,7 @@ class MalloySQLParser {
|
|
|
146
146
|
else {
|
|
147
147
|
if (!config.connection) {
|
|
148
148
|
if (!previousConnection)
|
|
149
|
-
errors.push(this.createParseError('No connection configuration specified, add "connection: my_connection_name" to this >>>sql line or to an above one', parsedStatement.delimiterRange));
|
|
149
|
+
errors.push(this.createParseError('No connection configuration specified, add "connection: my_connection_name" to this >>>sql line or to an above one', parsedStatement.delimiterRange, url));
|
|
150
150
|
config.connection = previousConnection;
|
|
151
151
|
}
|
|
152
152
|
previousConnection = config.connection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@malloydata/malloy-sql",
|
|
3
|
-
"version": "0.0.37
|
|
3
|
+
"version": "0.0.37",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"prepublishOnly": "npm run build"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@malloydata/malloy": "^0.0.37
|
|
22
|
+
"@malloydata/malloy": "^0.0.37"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"md5": "^2.3.0",
|