@salesforce/plugin-data 2.0.4 → 2.1.2
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/CHANGELOG.md +15 -0
- package/README.md +59 -15
- package/lib/api/data/tree/exportApi.js +15 -24
- package/lib/api/data/tree/exportApi.js.map +1 -1
- package/lib/commands/force/data/soql/bulk/report.d.ts +9 -0
- package/lib/commands/force/data/soql/bulk/report.js +45 -0
- package/lib/commands/force/data/soql/bulk/report.js.map +1 -0
- package/lib/commands/force/data/soql/query.d.ts +20 -2
- package/lib/commands/force/data/soql/query.js +81 -11
- package/lib/commands/force/data/soql/query.js.map +1 -1
- package/lib/commands/force/data/tree/import.js +1 -2
- package/lib/commands/force/data/tree/import.js.map +1 -1
- package/lib/dataCommand.js +2 -3
- package/lib/dataCommand.js.map +1 -1
- package/lib/dataSoqlQueryTypes.d.ts +3 -1
- package/lib/dataSoqlQueryTypes.js +1 -1
- package/lib/dataSoqlQueryTypes.js.map +1 -1
- package/lib/reporters.js +12 -11
- package/lib/reporters.js.map +1 -1
- package/messages/bulk.report.json +7 -0
- package/messages/soql.query.json +7 -1
- package/oclif.manifest.json +1 -1
- package/package.json +16 -10
|
@@ -8,10 +8,12 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.DataSoqlQueryCommand = exports.SoqlQuery = void 0;
|
|
10
10
|
const os = require("os");
|
|
11
|
+
const fs = require("fs");
|
|
11
12
|
const command_1 = require("@salesforce/command");
|
|
12
13
|
const core_1 = require("@oclif/core");
|
|
13
14
|
const core_2 = require("@salesforce/core");
|
|
14
15
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
16
|
+
const kit_1 = require("@salesforce/kit");
|
|
15
17
|
const reporters_1 = require("../../../../reporters");
|
|
16
18
|
const dataSoqlQueryTypes_1 = require("../../../../dataSoqlQueryTypes");
|
|
17
19
|
const dataCommand_1 = require("../../../../dataCommand");
|
|
@@ -24,13 +26,60 @@ const commonMessages = core_2.Messages.loadMessages('@salesforce/plugin-data', '
|
|
|
24
26
|
* Will collect all records and the column metadata of the query
|
|
25
27
|
*/
|
|
26
28
|
class SoqlQuery {
|
|
29
|
+
/**
|
|
30
|
+
* Executs a SOQL query using the bulk 2.0 API
|
|
31
|
+
*
|
|
32
|
+
* @param connection
|
|
33
|
+
* @param query
|
|
34
|
+
* @param timeout
|
|
35
|
+
* @param ux
|
|
36
|
+
*/
|
|
37
|
+
async runBulkSoqlQuery(connection, query, timeout = kit_1.Duration.seconds(10), ux) {
|
|
38
|
+
connection.bulk2.pollTimeout = timeout.milliseconds ?? kit_1.Duration.minutes(5).milliseconds;
|
|
39
|
+
let res;
|
|
40
|
+
try {
|
|
41
|
+
res = (await connection.bulk2.query(query)) ?? [];
|
|
42
|
+
return this.transformBulkResults(res, query);
|
|
43
|
+
}
|
|
44
|
+
catch (e) {
|
|
45
|
+
const err = e;
|
|
46
|
+
if (timeout.minutes === 0 && err.message.includes('Polling time out')) {
|
|
47
|
+
// async query, so we can't throw an error, suggest force:data:query:report --queryid <id>
|
|
48
|
+
ux.log(messages.getMessage('bulkQueryTimeout', [err.jobId, err.jobId, connection.getUsername()]));
|
|
49
|
+
return { columns: [], result: { done: false, records: [], totalSize: 0, id: err.jobId }, query };
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
throw core_2.SfError.wrap(err);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* transforms Bulk 2.0 results to match the SOQL query results
|
|
58
|
+
*
|
|
59
|
+
* @param results results object
|
|
60
|
+
* @param query query string
|
|
61
|
+
*/
|
|
62
|
+
transformBulkResults(results, query) {
|
|
63
|
+
/*
|
|
64
|
+
bulk queries return a different payload, it's a [{column: data}, {column: data}]
|
|
65
|
+
so we just need to grab the first object, find the keys (columns) and create the columns
|
|
66
|
+
*/
|
|
67
|
+
const columns = Object.keys(results[0] ?? {}).map((name) => ({
|
|
68
|
+
fieldType: dataSoqlQueryTypes_1.FieldType.field,
|
|
69
|
+
name,
|
|
70
|
+
}));
|
|
71
|
+
return {
|
|
72
|
+
columns,
|
|
73
|
+
result: { done: true, records: results, totalSize: results.length },
|
|
74
|
+
query,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
27
77
|
async runSoqlQuery(connection, query, logger, configAgg) {
|
|
28
|
-
var _a;
|
|
29
78
|
logger.debug('running query');
|
|
30
79
|
// take the limit from the config, then default 50,000
|
|
31
80
|
const queryOpts = {
|
|
32
81
|
autoFetch: true,
|
|
33
|
-
maxFetch:
|
|
82
|
+
maxFetch: configAgg.getInfo('maxQueryLimit').value ?? 50000,
|
|
34
83
|
};
|
|
35
84
|
const result = await new Promise((resolve, reject) => {
|
|
36
85
|
const records = [];
|
|
@@ -68,7 +117,7 @@ class SoqlQuery {
|
|
|
68
117
|
* @param query
|
|
69
118
|
*/
|
|
70
119
|
async retrieveColumns(connection, query, logger) {
|
|
71
|
-
logger
|
|
120
|
+
logger?.debug('fetching columns for query');
|
|
72
121
|
// eslint-disable-next-line no-underscore-dangle
|
|
73
122
|
const columnUrl = `${connection._baseUrl()}/query?q=${encodeURIComponent(query)}&columns=true`;
|
|
74
123
|
const results = (0, ts_types_1.toJsonMap)(await connection.request(columnUrl));
|
|
@@ -166,13 +215,16 @@ class DataSoqlQueryCommand extends dataCommand_1.DataCommand {
|
|
|
166
215
|
try {
|
|
167
216
|
if (this.flags.resultformat !== 'json')
|
|
168
217
|
this.ux.startSpinner(messages.getMessage('queryRunningMessage'));
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
const
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
}
|
|
175
|
-
|
|
218
|
+
const queryString = this.flags.query ?? fs.readFileSync(this.flags.soqlqueryfile, 'utf8');
|
|
219
|
+
let queryResult;
|
|
220
|
+
const soqlQuery = new SoqlQuery();
|
|
221
|
+
if (this.flags.bulk) {
|
|
222
|
+
queryResult = await soqlQuery.runBulkSoqlQuery(this.org.getConnection(), queryString, this.flags.wait, this.ux);
|
|
223
|
+
}
|
|
224
|
+
else {
|
|
225
|
+
queryResult = await soqlQuery.runSoqlQuery(this.getConnection(), queryString, this.logger, this.configAggregator);
|
|
226
|
+
}
|
|
227
|
+
this.displayResults({ ...queryResult });
|
|
176
228
|
return queryResult.result;
|
|
177
229
|
}
|
|
178
230
|
finally {
|
|
@@ -209,13 +261,31 @@ DataSoqlQueryCommand.examples = messages.getMessage('examples').split(os.EOL);
|
|
|
209
261
|
DataSoqlQueryCommand.flagsConfig = {
|
|
210
262
|
query: command_1.flags.string({
|
|
211
263
|
char: 'q',
|
|
212
|
-
required: true,
|
|
213
264
|
description: messages.getMessage('queryToExecute'),
|
|
265
|
+
exclusive: ['soqlqueryfile'],
|
|
266
|
+
exactlyOne: ['query', 'soqlqueryfile'],
|
|
267
|
+
}),
|
|
268
|
+
soqlqueryfile: command_1.flags.filepath({
|
|
269
|
+
char: 'f',
|
|
270
|
+
description: messages.getMessage('soqlqueryfile'),
|
|
271
|
+
exclusive: ['query'],
|
|
272
|
+
exactlyOne: ['query', 'soqlqueryfile'],
|
|
214
273
|
}),
|
|
215
274
|
usetoolingapi: command_1.flags.boolean({
|
|
216
275
|
char: 't',
|
|
217
276
|
description: messages.getMessage('queryToolingDescription'),
|
|
218
277
|
}),
|
|
278
|
+
bulk: command_1.flags.boolean({
|
|
279
|
+
char: 'b',
|
|
280
|
+
default: false,
|
|
281
|
+
description: messages.getMessage('bulkDescription'),
|
|
282
|
+
exclusive: ['usetoolingapi'],
|
|
283
|
+
}),
|
|
284
|
+
wait: command_1.flags.minutes({
|
|
285
|
+
char: 'w',
|
|
286
|
+
description: messages.getMessage('waitDescription'),
|
|
287
|
+
dependsOn: ['bulk'],
|
|
288
|
+
}),
|
|
219
289
|
resultformat: command_1.flags.enum({
|
|
220
290
|
char: 'r',
|
|
221
291
|
description: messages.getMessage('resultFormatDescription'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../../src/commands/force/data/soql/query.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../../src/commands/force/data/soql/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,6 @@ const messages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'tree.i
|
|
|
18
18
|
*/
|
|
19
19
|
class Import extends command_1.SfdxCommand {
|
|
20
20
|
async run() {
|
|
21
|
-
var _a;
|
|
22
21
|
const importApi = new importApi_1.ImportApi(this.org);
|
|
23
22
|
if (this.flags.confighelp) {
|
|
24
23
|
// Display config help and return
|
|
@@ -38,7 +37,7 @@ class Import extends command_1.SfdxCommand {
|
|
|
38
37
|
};
|
|
39
38
|
const importResults = await importApi.import(importConfig);
|
|
40
39
|
let processedResult = [];
|
|
41
|
-
if (
|
|
40
|
+
if (importResults.responseRefs?.length) {
|
|
42
41
|
processedResult = importResults.responseRefs.map((ref) => {
|
|
43
42
|
const type = (0, ts_types_1.getString)(importResults.sobjectTypes, ref.referenceId, 'Unknown');
|
|
44
43
|
return { refId: ref.referenceId, type, id: ref.id };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../../src/commands/force/data/tree/import.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AAEzB,iDAAkF;AAClF,2CAAgE;AAChE,mDAA0D;AAC1D,mEAA8E;AAE9E,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;AAQjF;;GAEG;AACH,MAAqB,MAAO,SAAQ,qBAAW;IAiCtC,KAAK,CAAC,GAAG
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../../src/commands/force/data/tree/import.ts"],"names":[],"mappings":"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"}
|
package/lib/dataCommand.js
CHANGED
|
@@ -20,11 +20,10 @@ const originalRequestMethod = http_api_1.HttpApi.prototype.request;
|
|
|
20
20
|
// @ts-ignore
|
|
21
21
|
http_api_1.HttpApi.prototype.request = function (req, ...args) {
|
|
22
22
|
this.once('response', (response) => {
|
|
23
|
-
var _a;
|
|
24
23
|
const metrics = response.headers.perfmetrics;
|
|
25
24
|
if (metrics) {
|
|
26
25
|
DataCommand.addMetric({
|
|
27
|
-
requestPath: `/services${
|
|
26
|
+
requestPath: `/services${req?.url?.split('/services')[1]}`,
|
|
28
27
|
perfMetrics: JSON.parse(metrics),
|
|
29
28
|
});
|
|
30
29
|
}
|
|
@@ -53,7 +52,7 @@ class DataCommand extends command_1.SfdxCommand {
|
|
|
53
52
|
if (result.errors) {
|
|
54
53
|
errors = '\nErrors:\n';
|
|
55
54
|
result.errors.map((err) => {
|
|
56
|
-
errors += ' ' +
|
|
55
|
+
errors += ' ' + err?.message + '\n';
|
|
57
56
|
});
|
|
58
57
|
}
|
|
59
58
|
return errors;
|
package/lib/dataCommand.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataCommand.js","sourceRoot":"","sources":["../src/dataCommand.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,gCAAgC;AAChC,iDAAkD;AAClD,mDAA0E;AAC1E,2CAAsE;AAGtE,mDAA+C;AAG/C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAoB9E,6DAA6D;AAC7D,MAAM,qBAAqB,GAAG,kBAAO,CAAC,SAAS,CAAC,OAAO,CAAC;AAExD,6DAA6D;AAC7D,aAAa;AACb,kBAAO,CAAC,SAAS,CAAC,OAAO,GAAG,UAAU,GAAG,EAAE,GAAG,IAAe;IAC3D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,QAAkB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"dataCommand.js","sourceRoot":"","sources":["../src/dataCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ var FieldType;
|
|
|
14
14
|
FieldType[FieldType["functionField"] = 2] = "functionField";
|
|
15
15
|
})(FieldType = exports.FieldType || (exports.FieldType = {}));
|
|
16
16
|
const hasNestedRecords = (element) => {
|
|
17
|
-
return Array.isArray(element
|
|
17
|
+
return Array.isArray(element?.records);
|
|
18
18
|
};
|
|
19
19
|
exports.hasNestedRecords = hasNestedRecords;
|
|
20
20
|
const isAttributesElement = (element) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataSoqlQueryTypes.js","sourceRoot":"","sources":["../src/dataSoqlQueryTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAKH,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,2CAAK,CAAA;IACL,2DAAa,CAAA;IACb,2DAAa,CAAA;AACf,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;
|
|
1
|
+
{"version":3,"file":"dataSoqlQueryTypes.js","sourceRoot":"","sources":["../src/dataSoqlQueryTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAKH,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,2CAAK,CAAA;IACL,2DAAa,CAAA;IACb,2DAAa,CAAA;AACf,CAAC,EAJW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAIpB;AAoDM,MAAM,gBAAgB,GAAG,CAAI,OAAmC,EAA+B,EAAE;IACtG,OAAO,KAAK,CAAC,OAAO,CAAE,OAA4B,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,mBAAmB,GAAG,CACjC,OAAiD,EACN,EAAE;IAC7C,OAAO,CACL,CAAC,CAAE,OAA0C,CAAC,WAAW,IAAI,CAAC,CAAE,OAA0C,CAAC,IAAI,CAChH,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B"}
|
package/lib/reporters.js
CHANGED
|
@@ -54,10 +54,9 @@ class HumanReporter extends QueryReporter {
|
|
|
54
54
|
if (fields) {
|
|
55
55
|
this.logger.info(`Found fields ${JSON.stringify(fields.map((field) => `${typeof field}.${field.name}`))}`);
|
|
56
56
|
fields.forEach((field) => {
|
|
57
|
-
var _a;
|
|
58
57
|
if (field.fieldType === dataSoqlQueryTypes_1.FieldType.subqueryField) {
|
|
59
58
|
children.push(field.name);
|
|
60
|
-
(
|
|
59
|
+
(field.fields ?? []).forEach((subfield) => attributeNames.push(`${field.name}.${subfield.name}`));
|
|
61
60
|
}
|
|
62
61
|
else if (field.fieldType === dataSoqlQueryTypes_1.FieldType.functionField) {
|
|
63
62
|
if (field.alias) {
|
|
@@ -127,13 +126,12 @@ class HumanReporter extends QueryReporter {
|
|
|
127
126
|
queryResults.forEach((qr) => {
|
|
128
127
|
const result = qr;
|
|
129
128
|
this.data.columns.forEach((col) => {
|
|
130
|
-
var _a;
|
|
131
129
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
132
130
|
const entry = Reflect.get(result, col.name);
|
|
133
131
|
if (typeof entry === 'object' && col.fieldType === dataSoqlQueryTypes_1.FieldType.field) {
|
|
134
132
|
Reflect.set(result, col.name, JSON.stringify(entry, null, 2));
|
|
135
133
|
}
|
|
136
|
-
else if (typeof entry === 'object' &&
|
|
134
|
+
else if (typeof entry === 'object' && col.fields?.length && entry) {
|
|
137
135
|
col.fields.forEach((field) => {
|
|
138
136
|
Reflect.set(result, `${col.name}.${field.name}`, (0, ts_types_1.get)(result, `${col.name}.records[0].${field.name}`));
|
|
139
137
|
});
|
|
@@ -194,7 +192,7 @@ class HumanReporter extends QueryReporter {
|
|
|
194
192
|
return newResults;
|
|
195
193
|
}, []);
|
|
196
194
|
}
|
|
197
|
-
return qr
|
|
195
|
+
return qr ?? queryResults;
|
|
198
196
|
}
|
|
199
197
|
}
|
|
200
198
|
exports.HumanReporter = HumanReporter;
|
|
@@ -226,9 +224,14 @@ class CsvReporter extends QueryReporter {
|
|
|
226
224
|
return this.escape(name);
|
|
227
225
|
})
|
|
228
226
|
.join(SEPARATOR));
|
|
227
|
+
// explained why we need this below - foreach does not allow types
|
|
228
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
229
|
+
// @ts-ignore
|
|
229
230
|
this.data.result.records.forEach((row) => {
|
|
230
231
|
const values = attributeNames.map((name) => {
|
|
231
|
-
|
|
232
|
+
// try get(row, name) first, then if it fails, default to row[name]. The default will happen in bulk cases.
|
|
233
|
+
// the standard case returns {field:{nested: 'value'}}, while the bulk will return {field.nested: 'value'}
|
|
234
|
+
const value = (0, ts_types_1.get)(row, name, row[name]);
|
|
232
235
|
if ((0, ts_types_1.isString)(value)) {
|
|
233
236
|
return this.escape(value);
|
|
234
237
|
// if value is null, then typeof value === 'object' so check before typeof to avoid illegal csv
|
|
@@ -271,10 +274,9 @@ class CsvReporter extends QueryReporter {
|
|
|
271
274
|
// Get max lengths by iterating over the records once
|
|
272
275
|
this.data.result.records.forEach((result) => {
|
|
273
276
|
[...typeLengths.keys()].forEach((key) => {
|
|
274
|
-
var _a;
|
|
275
277
|
const record = (0, ts_types_1.get)(result, key);
|
|
276
278
|
const totalSize = (0, ts_types_1.getNumber)(record, 'totalSize');
|
|
277
|
-
if (!!totalSize && totalSize > (
|
|
279
|
+
if (!!totalSize && totalSize > (typeLengths.get(key) ?? 0)) {
|
|
278
280
|
typeLengths.set(key, totalSize);
|
|
279
281
|
}
|
|
280
282
|
});
|
|
@@ -291,11 +293,10 @@ class CsvReporter extends QueryReporter {
|
|
|
291
293
|
}
|
|
292
294
|
});
|
|
293
295
|
fields.forEach((field) => {
|
|
294
|
-
var _a, _b;
|
|
295
296
|
if (typeLengths.get(field.name)) {
|
|
296
|
-
for (let i = 0; i < (
|
|
297
|
+
for (let i = 0; i < (typeLengths.get(field.name) ?? 0); i++) {
|
|
297
298
|
attributeNames.push(`${field.name}.totalSize`);
|
|
298
|
-
(
|
|
299
|
+
(field.fields ?? []).forEach((subfield) => {
|
|
299
300
|
attributeNames.push(`${field.name}.records.${i}.${subfield.name}`);
|
|
300
301
|
});
|
|
301
302
|
}
|
package/lib/reporters.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporters.js","sourceRoot":"","sources":["../src/reporters.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reporters.js","sourceRoot":"","sources":["../src/reporters.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"description": "view the status of a bulk query\nRun this command using the job ID returned from the force:data:soql:query --bulk command.",
|
|
3
|
+
"examples": [
|
|
4
|
+
"$ sfdx force:data:soql:bulk:report -i 7500x000005BdFzXXX"
|
|
5
|
+
],
|
|
6
|
+
"bulkQueryIdDescription": "the job ID of the bulk query"
|
|
7
|
+
}
|
package/messages/soql.query.json
CHANGED
|
@@ -11,10 +11,16 @@
|
|
|
11
11
|
"queryNoResults": "Your query returned no results.",
|
|
12
12
|
"queryRunningMessage": "Querying Data",
|
|
13
13
|
"queryMoreUpdateMessage": "Result size is %d, current count is %d",
|
|
14
|
+
"bulkDescription": "use the bulk 2.0 API to query data",
|
|
15
|
+
"waitDescription": "wait time for command to finish in minutes",
|
|
16
|
+
"bulkQueryTimeout": "Query ID: %s\nQuery is in progress. \n\nRun sfdx force:data:soql:bulk:report -i %s -u %s to get the latest status/results",
|
|
17
|
+
"soqlqueryfile": "A SOQL query stored in a file",
|
|
14
18
|
"examples": [
|
|
15
19
|
"$ sfdx force:data:soql:query -q \"SELECT Id, Name, Account.Name FROM Contact\"",
|
|
16
20
|
"$ sfdx force:data:soql:query -q \"SELECT Id, Name FROM Account WHERE ShippingState IN ('CA', 'NY')\"",
|
|
17
21
|
"$ sfdx force:data:soql:query -q \"SELECT Id, Name FROM Account WHERE ShippingState IN ('CA', 'NY')\" --perflog --json",
|
|
18
|
-
"$ sfdx force:data:soql:query -q \"SELECT Name FROM ApexTrigger\" -t"
|
|
22
|
+
"$ sfdx force:data:soql:query -q \"SELECT Name FROM ApexTrigger\" -t",
|
|
23
|
+
"$ sfdx force:data:soql:query --soqlqueryfile query.txt",
|
|
24
|
+
"$ sfdx force:data:soql:query --soqlqueryfile query.txt -t"
|
|
19
25
|
]
|
|
20
26
|
}
|