Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions forward_engineering/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,31 @@ module.exports = {
generateContainerScript(data, logger, callback, app) {
try {
const _ = app.require('lodash');
const script = {
const insertSamplesOption = _.get(data, 'options.additionalOptions', []).find(option => option.id === 'INCLUDE_SAMPLES') || {};
const withSamples = data.options.origin !== 'ui';
const samples = data.entities.map(entityId => updateSample(
JSON.parse(data.jsonData[entityId]),
data.containerData[0],
(data.entityData[entityId] || [])[0] || {},
));
const scriptData = {
partitionKey: getPartitionKey(_)(data.containerData),
indexingPolicy: getIndexPolicyScript(_)(data.containerData),
sample: data.entities.map(entityId => updateSample(
JSON.parse(data.jsonData[entityId]),
data.containerData[0],
(data.entityData[entityId] || [])[0] || {},
)),
...(withSamples && { sample: samples }),
...addItems(_)(data.containerData),
};
return callback(null, JSON.stringify(script, null, 2));
const script = JSON.stringify(scriptData, null, 2);
if (withSamples || !insertSamplesOption.value) {
return callback(null, script);
}

return callback(null, [
{ title: 'CosmosDB script', script },
{
title: 'Sample data',
script: JSON.stringify({ sample: samples }, null, 2),
},
]);
} catch (e) {
const error = { message: e.message, stack: e.stack };
logger.log('error', error, 'CosmosDB w\\ SQL API forward engineering error');
Expand Down
17 changes: 16 additions & 1 deletion forward_engineering/applyToInstance/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ module.exports = {
logger.clear();
logger.log('info', connectionInfo, 'Apply to instance connection settings', connectionInfo.hiddenKeys);
const client = helper.setUpDocumentClient(connectionInfo);
const script = JSON.parse(connectionInfo.script);
const script = parseScript(connectionInfo.script);
const containerData = _.get(connectionInfo, 'containerData');
const databaseId = _.get(containerData, '[0].dbId');
const containerId = _.get(containerData, '[0].name');
Expand Down Expand Up @@ -166,3 +166,18 @@ const createLogger = (logger, containerName, entityName) => (message) => {
logger.progress({ message, containerName, entityName });
logger.log('info', { message }, 'Applying to instance');
};

const parseScript = script => {
try {
return JSON.parse(script);
} catch (err) {
const [ main, sample ] = script.split(/\n}\n{\n/m);
const mainScript = JSON.parse(main + '}');
const sampleScript = JSON.parse('{' + sample);

return {
...mainScript,
sample: sampleScript
}
}
};
12 changes: 12 additions & 0 deletions forward_engineering/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,17 @@
"container": true,
"view": false
},
"additionalOptions": [{
"id": "INCLUDE_SAMPLES",
"value": true,
"name": "Include sample data",
"align": "right",
"level": {
"entity": false
}
}],
"splitView": {
"byAdditionalOptions": ["INCLUDE_SAMPLES"]
},
"applyScriptToInstance": true
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"versionDate": "2021-02-19",
"author": "hackolade",
"engines": {
"hackolade": "4.3.1",
"hackolade": "4.3.9",
"hackoladePlugin": "1.0.1"
},
"contributes": {
Expand Down