sql-source-control - npm Package Compare versions

Comparing version 1.8.0 to 1.9.0

CHANGELOG.md

@@ -5,2 +5,18 @@ # Change Log
 
+<a name="1.9.0"></a>
+# [1.9.0](https://github.com/justinlettau/sql-source-control/compare/v1.8.0...v1.9.0) (2018-07-07)
+
+
+### Bug Fixes
+
+* remove column ordering by name ([80fb9d7](https://github.com/justinlettau/sql-source-control/commit/80fb9d7)), closes [#33](https://github.com/justinlettau/sql-source-control/issues/33)
+* **pull:** script computed field formula ([2092150](https://github.com/justinlettau/sql-source-control/commit/2092150)), closes [#30](https://github.com/justinlettau/sql-source-control/issues/30)
+
+
+### Features
+
+* add connection config file support ([#29](https://github.com/justinlettau/sql-source-control/issues/29)) ([ed92901](https://github.com/justinlettau/sql-source-control/commit/ed92901))
+
+
+
 <a name="1.8.0"></a>
@@ -7,0 +23,0 @@ # [1.8.0](https://github.com/justinlettau/sql-source-control/compare/v1.7.1...v1.8.0) (2018-06-11)

dist/commands/init.js

@@ -8,2 +8,11 @@ "use strict";
 /**
+ * Connection path choices.
+ */
+var PathChoices;
+(function (PathChoices) {
+    PathChoices[PathChoices["SscConfig"] = 0] = "SscConfig";
+    PathChoices[PathChoices["ConnsConfig"] = 1] = "ConnsConfig";
+    PathChoices[PathChoices["WebConfig"] = 2] = "WebConfig";
+})(PathChoices || (PathChoices = {}));
+/**
  * Create default config file.
@@ -27,3 +36,3 @@ *
         // skip prompts and create with defaults
-        util.setConfig({ connections: options.webconfig || [conn] });
+        util.setConfig(util.configFile, { connections: options.webconfig || [conn] });
         return;
@@ -34,35 +43,54 @@ }
             name: 'path',
-            message: 'Use connections from Web.config file?',
-            type: 'confirm',
-            when: function () { return !!webConfigConns; }
-        }, {
+            message: 'Where would you like to store connections?',
+            type: 'list',
+            choices: function () {
+                var choices = [
+                    { name: 'Main configuration file.', value: PathChoices.SscConfig },
+                    { name: 'Separate connections configuration file.', value: PathChoices.ConnsConfig }
+                ];
+                if (webConfigConns) {
+                    choices.push({
+                        name: 'Web.config file with connection strings.',
+                        value: PathChoices.WebConfig
+                    });
+                }
+                return choices;
+            }
+        },
+        {
             name: 'server',
             message: 'Server URL.',
             default: (conn.server || undefined),
-            when: function (answers) { return (!webConfigConns || !answers.path); }
-        }, {
+            when: function (answers) { return (answers.path !== PathChoices.WebConfig); }
+        },
+        {
             name: 'port',
             message: 'Server port.',
             default: (conn.port || undefined),
-            when: function (answers) { return (!webConfigConns || !answers.path); }
-        }, {
+            when: function (answers) { return (answers.path !== PathChoices.WebConfig); }
+        },
+        {
             name: 'database',
             message: 'Database name.',
             default: (conn.database || undefined),
-            when: function (answers) { return (!webConfigConns || !answers.path); }
-        }, {
+            when: function (answers) { return (answers.path !== PathChoices.WebConfig); }
+        },
+        {
             name: 'user',
             message: 'Login username.',
             default: (conn.user || undefined),
-            when: function (answers) { return (!webConfigConns || !answers.path); }
-        }, {
+            when: function (answers) { return (answers.path !== PathChoices.WebConfig); }
+        },
+        {
             name: 'password',
             message: 'Login password.',
+            type: 'password',
             default: (conn.password || undefined),
-            when: function (answers) { return (!webConfigConns || !answers.path); }
-        }, {
+            when: function (answers) { return (answers.path !== PathChoices.WebConfig); }
+        },
+        {
             name: 'name',
             message: 'Connection name.',
             default: 'dev',
-            when: function (answers) { return (!webConfigConns || !answers.path); }
+            when: function (answers) { return (answers.path !== PathChoices.WebConfig); }
         }
@@ -72,8 +100,20 @@ ];
     inquirer.prompt(questions).then(function (answers) {
-        if (answers.path) {
-            // use Web.config path
-            util.setConfig({ connections: webConfigFile });
+        if (answers.path === PathChoices.WebConfig) {
+            util.setConfig(util.configFile, { connections: webConfigFile });
         }
+        else if (answers.path === PathChoices.ConnsConfig) {
+            util.setConfig(util.configFile, { connections: './ssc-connections.json' });
+            util.setConfig(util.connsFile, {
+                connections: [new connection_1.Connection({
+                        name: answers.name,
+                        server: answers.server,
+                        port: answers.port,
+                        database: answers.database,
+                        user: answers.user,
+                        password: answers.password
+                    })]
+            });
+        }
         else {
-            util.setConfig({
+            util.setConfig(util.configFile, {
                 connections: [new connection_1.Connection({
@@ -80,0 +120,0 @@ name: answers.name,

dist/commands/init.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}

dist/common/utility.js

@@ -16,2 +16,6 @@ "use strict";
 /**
+ * Connections file path.
+ */
+exports.connsFile = path.join(process.cwd(), 'ssc-connections.json');
+/**
  * Web config file path.
@@ -76,8 +80,9 @@ */
  *
+ * @param file Configuration file to write to.
  * @param config Object to save for config file.
  */
-function setConfig(config) {
+function setConfig(file, config) {
     var content = JSON.stringify(config, null, 2);
     // save file
-    fs.outputFile(exports.configFile, content, function (error) {
+    fs.outputFile(file, content, function (error) {
         if (error) {
@@ -103,4 +108,9 @@ return console.error(error);
     if (ts_util_is_1.isString(config.connections)) {
-        // get form web config
-        return getWebConfigConns(config.connections);
+        var configExt = /\.config$/;
+        if (configExt.test(config.connections)) {
+            return getWebConfigConns(config.connections);
+        }
+        else {
+            return getConnsConfigConns(config.connections);
+        }
     }
@@ -172,2 +182,19 @@ else {
 /**
+ * Safely get connections from `ssc-connections.json` file.
+ *
+ * @param file Relative path to connections config file.
+ */
+function getConnsConfigConns(file) {
+    var config;
+    try {
+        config = fs.readJsonSync(file);
+    }
+    catch (error) {
+        console.error('Could not find or parse connections config file!');
+        process.exit();
+    }
+    return config.connections;
+}
+exports.getConnsConfigConns = getConnsConfigConns;
+/**
  * Get all SQL files in correct execution order.
@@ -174,0 +201,0 @@ *

dist/common/utility.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../src/common/utility.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../src/common/utility.ts"],"names":[],"mappings":";;AAAA,+BAA0B;AAC1B,qCAAuC;AACvC,6BAA+B;AAC/B,2BAA6B;AAC7B,2BAA6B;AAC7B,yCAAsC;AACtC,+BAAiC;AAGjC,mDAAkD;AAElD;;GAEG;AACU,QAAA,UAAU,GAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;AAEvE;;GAEG;AACU,QAAA,SAAS,GAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC;AAElF;;GAEG;AACU,QAAA,aAAa,GAAW,cAAc,CAAC;AAEpD;;GAEG;AACU,QAAA,cAAc,GAAW;IACpC,WAAW,EAAE,EAAE;IACf,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;IACR,MAAM,EAAE;QACN,MAAM,EAAE,iBAAiB;QACzB,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,qBAAqB;QAC9B,eAAe,EAAE,2BAA2B;QAC5C,SAAS,EAAE,WAAW;QACtB,cAAc,EAAE,0BAA0B;QAC1C,yBAAyB,EAAE,8CAA8C;QACzE,QAAQ,EAAE,UAAU;QACpB,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE,SAAS;KACnB;IACD,WAAW,EAAE;QACX,OAAO,EAAE,gBAAgB;QACzB,eAAe,EAAE,gBAAgB;QACjC,cAAc,EAAE,gBAAgB;QAChC,yBAAyB,EAAE,eAAe;QAC1C,QAAQ,EAAE,eAAe;QACzB,UAAU,EAAE,gBAAgB;QAC5B,OAAO,EAAE,gBAAgB;KAC1B;CACF,CAAC;AAEF;;;;GAIG;AACH,kBAAyB,IAAY;IACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAFD,4BAEC;AAED;;GAEG;AACH;IACE,IAAI,MAAc,CAAC;IAEnB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,kBAAU,CAAC,CAAC;IACvC,CAAC;IAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,oFAAoF,CAAC,CAAC;QACpG,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,sBAAc,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC;AAXD,8BAWC;AAED;;;;;GAKG;AACH,mBAA0B,IAAY,EAAE,MAAc;IACpD,IAAM,OAAO,GAAW,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAExD,YAAY;IACZ,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAC,KAAY;QACxC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YACV,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAXD,8BAWC;AAED;;;;GAIG;AACH,kBAAyB,MAAc;IACrC,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACtB,sBAAsB;QACtB,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,MAAM,CAAC,mFAAmF,CAAC,CAAC,CAAC;QAEhH,IAAM,UAAU,GAAwB,MAAM,CAAC,UAAU,CAAC;QAC1D,MAAM,CAAC,WAAW,GAAG,CAAC,qBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,EAAE,CAAC,CAAC,qBAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACjC,IAAM,SAAS,GAAW,WAAW,CAAC;QAEtC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;QAAC,IAAI,CAAC,CAAC;YACN,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAAC,IAAI,CAAC,CAAC;QACN,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;AACH,CAAC;AApBD,4BAoBC;AAED;;;;;GAKG;AACH,iBAAwB,MAAc,EAAE,IAAa;IACnD,IAAM,KAAK,GAAiB,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,IAAgB,CAAC;IAErB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACT,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,EAApD,CAAoD,CAAC,CAAC;IAClF,CAAC;IAAC,IAAI,CAAC,CAAC;QACN,mBAAmB;QACnB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,wCAAsC,IAAI,OAAI,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC;QAC5G,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,IAAI,CAAC;AACd,CAAC;AAjBD,0BAiBC;AAED;;;;GAIG;AACH,2BAAkC,IAAa;IAC7C,IAAM,MAAM,GAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;IAClD,IAAM,SAAS,GAAW,IAAI,IAAI,qBAAa,CAAC;IAChD,IAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,IAAI,OAAe,CAAC;IAEpB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9B,qCAAqC;QACrC,MAAM,CAAC;IACT,CAAC;IAED,mBAAmB;IACnB,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE9C,oBAAoB;IACpB,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,UAAC,GAAG,EAAE,MAAM;QACtC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;QAED,IAAI,CAAC;YACH,IAAM,WAAW,GAAU,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAEzE,WAAW,CAAC,OAAO,CAAC,UAAA,IAAI;gBACtB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACpE,CAAC,CAAC,CAAC;QAEL,CAAC;QAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC5C,CAAC;AAnCD,8CAmCC;AAED;;;;GAIG;AACH,6BAAoC,IAAa;IAC/C,IAAI,MAAc,CAAC;IAEnB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,WAA2B,CAAC;AAC5C,CAAC;AAXD,kDAWC;AAED;;;;GAIG;AACH,yBAAgC,MAAc;IAC5C,IAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAM,WAAW,GAAa;QAC5B,MAAM,CAAC,MAAM,CAAC,OAAO;QACrB,MAAM,CAAC,MAAM,CAAC,MAAM;QACpB,MAAM,CAAC,MAAM,CAAC,KAAK;QACnB,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,KAAK;QACnB,MAAM,CAAC,MAAM,CAAC,QAAQ;QACtB,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,IAAI;KACnB,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,UAAA,GAAG;QACrB,IAAM,KAAK,GAAa,IAAI,CAAC,IAAI,CAAI,MAAM,CAAC,MAAM,CAAC,IAAI,SAAI,GAAG,cAAW,CAAC,CAAC;QAC3E,MAAM,CAAC,IAAI,OAAX,MAAM,EAAS,KAAK,EAAE;IACxB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC;AAChB,CAAC;AApBD,0CAoBC;AAED;;;;;GAKG;AACH,yBAAyB,IAAY,EAAE,UAAkB;IACvD,IAAM,KAAK,GAAa,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9C,yBAAyB;IACzB,IAAI,MAAM,GAAW,KAAK,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAArB,CAAqB,CAAC,CAAC;IAC5D,IAAI,QAAQ,GAAW,KAAK,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAvB,CAAuB,CAAC,CAAC;IAChE,IAAI,IAAI,GAAW,KAAK,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAlB,CAAkB,CAAC,CAAC;IACvD,IAAI,QAAQ,GAAW,KAAK,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAA3B,CAA2B,CAAC,CAAC;IACpE,IAAI,IAAY,CAAC;IAEjB,aAAa;IACb,MAAM,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,QAAQ,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,QAAQ,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhD,2BAA2B;IAC3B,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACX,0CAA0C;QAC1C,IAAM,GAAG,GAAa,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAChB,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,IAAI,uBAAU,CAAC;QACpB,IAAI,MAAA;QACJ,MAAM,QAAA;QACN,QAAQ,UAAA;QACR,IAAI,MAAA;QACJ,IAAI,MAAA;QACJ,QAAQ,UAAA;KACT,CAAC,CAAC;AACL,CAAC"}

dist/sql/script.js

@@ -223,3 +223,4 @@ "use strict";
     if (item.is_computed) {
-        output += " as " + item.definition;
+        output += " as " + item.formula;
+        return output;
     }
@@ -226,0 +227,0 @@ output += " " + item.datatype;

dist/sql/script.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../src/sql/script.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../src/sql/script.ts"],"names":[],"mappings":"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"}

dist/sql/sys.js

@@ -10,3 +10,3 @@ "use strict";
  */
-exports.columnRead = "\n  select\n    c.object_id,\n    c.name,\n    tp.name as [datatype],\n    c.max_length,\n    c.is_computed,\n    c.precision,\n    c.scale as scale,\n    c.collation_name,\n    c.is_nullable,\n    dc.definition,\n    ic.is_identity,\n    ic.seed_value,\n    ic.increment_value\n  from\n    sys.columns c\n    join sys.types tp on c.user_type_id = tp.user_type_id\n    left join sys.computed_columns cc on c.object_id = cc.object_id and c.column_id = cc.column_id\n    left join sys.default_constraints dc on\n      c.default_object_id != 0\n      and c.object_id = dc.parent_object_id\n      and c.column_id = dc.parent_column_id\n    left join sys.identity_columns ic on c.is_identity = 1 and c.object_id = ic.object_id and c.column_id = ic.column_id\n  order by\n    ic.is_identity desc,\n    c.name\n";
+exports.columnRead = "\n  select\n    c.object_id,\n    c.name,\n    tp.name as [datatype],\n    c.max_length,\n    c.is_computed,\n    c.precision,\n    c.scale as scale,\n    c.collation_name,\n    c.is_nullable,\n    dc.definition,\n    ic.is_identity,\n    ic.seed_value,\n    ic.increment_value,\n    cc.definition as formula\n  from\n    sys.columns c\n    join sys.types tp on c.user_type_id = tp.user_type_id\n    left join sys.computed_columns cc on c.object_id = cc.object_id and c.column_id = cc.column_id\n    left join sys.default_constraints dc on\n      c.default_object_id != 0\n      and c.object_id = dc.parent_object_id\n      and c.column_id = dc.parent_column_id\n    left join sys.identity_columns ic on c.is_identity = 1 and c.object_id = ic.object_id and c.column_id = ic.column_id\n";
 /**
@@ -13,0 +13,0 @@ * Get SQL primary key information.

dist/sql/sys.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"sys.js","sourceRoot":"","sources":["../../src/sql/sys.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACU,QAAA,SAAS,GAAW,+PAehC,CAAC;AAEF;;GAEG;AACU,QAAA,UAAU,GAAW,syBA2BjC,CAAC;AAEF;;GAEG;AACU,QAAA,cAAc,GAAW,yYAcrC,CAAC;AAEF;;GAEG;AACU,QAAA,cAAc,GAAW,kqBAkBrC,CAAC;AAEF;;GAEG;AACU,QAAA,SAAS,GAAW,wpBAuBhC,CAAC;AAEF;;GAEG;AACU,QAAA,OAAO,GAAW,uUAe9B,CAAC;AAEF;;GAEG;AACU,QAAA,UAAU,GAAW,o0BA+BjC,CAAC"}
+{"version":3,"file":"sys.js","sourceRoot":"","sources":["../../src/sql/sys.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACU,QAAA,SAAS,GAAW,+PAehC,CAAC;AAEF;;GAEG;AACU,QAAA,UAAU,GAAW,mxBAyBjC,CAAC;AAEF;;GAEG;AACU,QAAA,cAAc,GAAW,yYAcrC,CAAC;AAEF;;GAEG;AACU,QAAA,cAAc,GAAW,kqBAkBrC,CAAC;AAEF;;GAEG;AACU,QAAA,SAAS,GAAW,wpBAuBhC,CAAC;AAEF;;GAEG;AACU,QAAA,OAAO,GAAW,uUAe9B,CAAC;AAEF;;GAEG;AACU,QAAA,UAAU,GAAW,o0BA+BjC,CAAC"}

package.json

 {
   "name": "sql-source-control",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Simple CLI for getting SQL into source control systems.",
@@ -57,7 +57,6 @@ "keywords": [
   "devDependencies": {
-    "@types/commander": "^2.12.2",
     "@types/deepmerge": "^2.1.0",
     "@types/fs-extra": "^5.0.0",
     "@types/glob": "^5.0.35",
-    "@types/inquirer": "^0.0.41",
+    "@types/inquirer": "^0.0.42",
     "@types/mssql": "^4.0.7",
@@ -64,0 +63,0 @@ "@types/multimatch": "^2.1.2",

README.md

@@ -92,4 +92,4 @@ [![NPM Version](https://badge.fury.io/js/sql-source-control.svg)](https://badge.fury.io/js/sql-source-control)
 
-Data can be included in the `pull` via the `data` glob in the configuration file. All tables included
-in the `data` glob will result in a file that truncates the table and inserts all rows. Because a truncate
+Data can be included in the `pull` via the `data` option in the configuration file. All tables included
+in the `data` option will result in a file that truncates the table and inserts all rows. Because a truncate
 is issued, it is recommended to only include static data tables, like lookup tables, in the `data`
@@ -135,4 +135,7 @@ configuration.
   // ... OR, path to Web.config file with connectionStrings
-  "connections": "../Web.config",
+  "connections": "./Web.config",
 
+  // ... OR, path to ssc-connections.json file
+  "connections": "./ssc-connections.json",
+
   // the following options are optional (default values shown) ...
@@ -143,3 +146,3 @@
 
-  // glob of tables to include / exclude for data scripting (example: ["dbo.LookupTable"])
+  // list of tables to include / exclude for data scripting (example: ["dbo.LookupTable"])
   "data": [],
@@ -146,0 +149,0 @@

New alerts

Unpublished package

Supply chain risk

Package version was not found on the registry. It may exist on a different registry and need to be configured to pull from that registry.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

Unpublished package

Supply chain risk

Package version was not found on the registry. It may exist on a different registry and need to be configured to pull from that registry.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

88049

5.76%

Dev dependency count

11

-8.33%

Lines of code

1139

6.35%

Number of lines in readme file

202

1.51%

No dependency changes