From 056d58e8b4d594e219e5a4c7156b0bbbead6d0ea Mon Sep 17 00:00:00 2001 From: Justin Lettau Date: Sat, 13 Jan 2018 09:11:54 -0500 Subject: [PATCH] fix: remove duplicate schemas --- dist/commands/pull.js | 11 ++++++----- dist/commands/pull.js.map | 2 +- package-lock.json | 38 +++++++++++++++++++------------------- src/commands/pull.ts | 11 ++++++----- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dist/commands/pull.js b/dist/commands/pull.js index ec50a41..b3b95dd 100644 --- a/dist/commands/pull.js +++ b/dist/commands/pull.js @@ -60,9 +60,10 @@ function scriptFiles(config, results) { var foreignKeys = results[4].recordset; var indexes = results[5].recordset; // get unique schema names - var schemas = tables.map(function (item) { - return { name: item.schema, type: 'SCHEMA' }; - }); + var schemas = tables + .map(function (item) { return item.schema; }) + .filter(function (value, index, array) { return array.indexOf(value) === index; }) + .map(function (value) { return ({ name: value, type: 'SCHEMA' }); }); // write files for schemas for (var _i = 0, schemas_1 = schemas; _i < schemas_1.length; _i++) { var item = schemas_1[_i]; @@ -148,7 +149,7 @@ function createFile(config, item, file, content) { // idempotent prefix content = script.idempotency(item, type) + content; // create file - console.log("Creating '" + chalk_1.default.cyan(dir) + "' ..."); + console.log("Creating " + chalk_1.default.cyan(dir) + " ..."); fs.outputFileSync(dir, content.trim()); return dir; } @@ -188,7 +189,7 @@ function exclude(existing, dir) { function removeFiles(files) { for (var _i = 0, files_1 = files; _i < files_1.length; _i++) { var file = files_1[_i]; - console.log("Removing '" + chalk_1.default.cyan(file) + "' ..."); + console.log("Removing " + chalk_1.default.cyan(file) + " ..."); fs.removeSync(file); } } diff --git a/dist/commands/pull.js.map b/dist/commands/pull.js.map index a525a2e..0b272be 100644 --- a/dist/commands/pull.js.map +++ b/dist/commands/pull.js.map @@ -1 +1 @@ -{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 76f5d92..e023363 100644 --- a/package-lock.json +++ b/package-lock.json @@ -226,16 +226,6 @@ "@types/node": "8.0.47" } }, - "JSONStream": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", - "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", - "dev": true, - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - } - }, "align-text": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", @@ -693,8 +683,8 @@ "integrity": "sha512-8MD05yN0Zb6aRsZnFX1ET+8rHWfWJk+my7ANCJZBU2mhz7TSB1fk2vZhkrwVy/PCllcTYAP/1T1NiWQ7Z01mKw==", "dev": true, "requires": { - "JSONStream": "1.3.2", "is-text-path": "1.0.1", + "JSONStream": "1.3.2", "lodash": "4.17.4", "meow": "3.7.0", "split2": "2.2.0", @@ -1236,6 +1226,16 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, + "JSONStream": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz", + "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=", + "dev": true, + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -1941,6 +1941,14 @@ } } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -1950,14 +1958,6 @@ "strip-ansi": "4.0.0" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", diff --git a/src/commands/pull.ts b/src/commands/pull.ts index ce3b29c..01a52c0 100644 --- a/src/commands/pull.ts +++ b/src/commands/pull.ts @@ -83,9 +83,10 @@ function scriptFiles(config: Config, results: sql.IResult[]): void { const indexes: IndexRecordSet[] = results[5].recordset; // get unique schema names - const schemas: SchemaRecordSet[] = tables.map(item => { - return { name: item.schema, type: 'SCHEMA' }; - }); + const schemas: SchemaRecordSet[] = tables + .map(item => item.schema) + .filter((value, index, array) => array.indexOf(value) === index) + .map(value => ({ name: value, type: 'SCHEMA' })); // write files for schemas for (const item of schemas) { @@ -183,7 +184,7 @@ function createFile(config: Config, item: any, file: string, content: string): s content = script.idempotency(item, type) + content; // create file - console.log(`Creating '${chalk.cyan(dir)}' ...`); + console.log(`Creating ${chalk.cyan(dir)} ...`); fs.outputFileSync(dir, content.trim()); return dir; @@ -229,7 +230,7 @@ function exclude(existing: string[], dir: string): void { */ function removeFiles(files: string[]): void { for (const file of files) { - console.log(`Removing '${chalk.cyan(file)}' ...`); + console.log(`Removing ${chalk.cyan(file)} ...`); fs.removeSync(file); } }