Merge branch 'master' into pr/iteufel/246

2020-02-29 12:07:34 +01:00 · 2020-02-29 12:07:34 +01:00 · 2bf37bca50
commit 2bf37bca50
parent 50574e0565 9cd37839c6
2 changed files with 94 additions and 157 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -381,6 +381,12 @@
      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
      "dev": true
    },
+    "@tootallnate/once": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz",
+      "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==",
+      "dev": true
+    },
    "@types/array.prototype.flatmap": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@types/array.prototype.flatmap/-/array.prototype.flatmap-1.2.0.tgz",
@ -765,12 +771,23 @@
      }
    },
    "agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
+      "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
      "dev": true,
      "requires": {
-        "es6-promisify": "^5.0.0"
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
      }
    },
    "aggregate-error": {
@ -1563,16 +1580,16 @@
      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
    },
    "codecov": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.1.tgz",
-      "integrity": "sha512-IUJB6WG47nWK7o50etF8jBadxdMw7DmoQg05yIljstXFBGB6clOZsIj6iD4P82T2YaIU3qq+FFu8K9pxgkCJDQ==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.5.tgz",
+      "integrity": "sha512-v48WuDMUug6JXwmmfsMzhCHRnhUf8O3duqXvltaYJKrO1OekZWpB/eH6iIoaxMl8Qli0+u3OxptdsBOYiD7VAQ==",
      "dev": true,
      "requires": {
-        "argv": "^0.0.2",
-        "ignore-walk": "^3.0.1",
-        "js-yaml": "^3.13.1",
-        "teeny-request": "^3.11.3",
-        "urlgrey": "^0.4.4"
+        "argv": "0.0.2",
+        "ignore-walk": "3.0.3",
+        "js-yaml": "3.13.1",
+        "teeny-request": "6.0.1",
+        "urlgrey": "0.4.4"
      }
    },
    "color-convert": {
@ -1970,21 +1987,6 @@
      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
      "dev": true
    },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
-      "dev": true
-    },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-      "dev": true,
-      "requires": {
-        "es6-promise": "^4.0.3"
-      }
-    },
    "escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@ -2926,6 +2928,28 @@
      "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
      "dev": true
    },
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
    "http-signature": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@ -2937,13 +2961,30 @@
      }
    },
    "https-proxy-agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-      "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
      "dev": true,
      "requires": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
+        "agent-base": "5",
+        "debug": "4"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+          "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
      }
    },
    "husky": {
@ -5724,6 +5765,15 @@
        "tweetnacl": "~0.14.0"
      }
    },
+    "stream-events": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+      "dev": true,
+      "requires": {
+        "stubs": "^3.0.0"
+      }
+    },
    "string-argv": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
@ -5819,6 +5869,12 @@
      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
      "dev": true
    },
+    "stubs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
+      "dev": true
+    },
    "supports-color": {
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@ -5945,13 +6001,15 @@
      }
    },
    "teeny-request": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz",
-      "integrity": "sha512-CKncqSF7sH6p4rzCgkb/z/Pcos5efl0DmolzvlqRQUNcpRIruOhY9+T1FsIlyEbfWd7MsFpodROOwHYh2BaXzw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-6.0.1.tgz",
+      "integrity": "sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g==",
      "dev": true,
      "requires": {
-        "https-proxy-agent": "^2.2.1",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^4.0.0",
        "node-fetch": "^2.2.0",
+        "stream-events": "^1.0.5",
        "uuid": "^3.3.2"
      }
    },
--- a/test/drivers/MssqlDriver.test.ts
+++ b/test/drivers/MssqlDriver.test.ts
@ -1,121 +0,0 @@
-import { expect } from "chai";
-import * as MSSQL from "mssql";
-import * as Sinon from "sinon";
-import MssqlDriver from "../../src/drivers/MssqlDriver";
-import { Entity } from "../../src/models/Entity";
-
-interface FakeResponse extends MSSQL.IResult<any> {
-    recordsets: MSSQL.IRecordSet<any>[];
-
-    recordset: MSSQL.IRecordSet<any>;
-
-    rowsAffected: number[];
-
-    output: { [key: string]: any };
-}
-
-class FakeRecordset extends Array<any> implements MSSQL.IRecordSet<any> {
-    public columns: MSSQL.IColumnMetadata;
-
-    // eslint-disable-next-line class-methods-use-this
-    public toTable(): MSSQL.Table {
-        return new MSSQL.Table();
-    }
-}
-
-describe("MssqlDriver", () => {
-    let driver: MssqlDriver;
-    const sandbox = Sinon.sandbox.create();
-
-    beforeEach(() => {
-        driver = new MssqlDriver();
-    });
-
-    afterEach(() => {
-        sandbox.restore();
-    });
-
-    it("should get tables info", async () => {
-        sandbox.stub(MSSQL, "Request").returns({
-            query: () => {
-                const response = {} as FakeResponse;
-                response.recordset = new FakeRecordset();
-                response.recordset.push({
-                    TABLE_SCHEMA: "schema",
-                    TABLE_NAME: "name"
-                });
-                return response;
-            }
-        });
-        const result = await driver.GetAllTables("schema", "db", []);
-        const expectedResult = [] as Entity[];
-        const y: Entity = {
-            columns: [],
-            indices: [],
-            relationIds: [],
-            relations: [],
-            sqlName: "name",
-            tscName: "name",
-            schema: "schema",
-            database: "",
-            fileImports: []
-        };
-        expectedResult.push(y);
-        expect(result).to.be.deep.equal(expectedResult);
-    });
-    it("should get columns info", async () => {
-        sandbox.stub(MSSQL, "Request").returns({
-            query: () => {
-                const response = {} as FakeResponse;
-                response.recordset = new FakeRecordset();
-                response.recordset.push({
-                    TABLE_NAME: "name",
-                    CHARACTER_MAXIMUM_LENGTH: 0,
-                    COLUMN_DEFAULT: "'a'",
-                    COLUMN_NAME: "name",
-                    DATA_TYPE: "int",
-                    IS_NULLABLE: "NO",
-                    NUMERIC_PRECISION: 0,
-                    NUMERIC_SCALE: 0,
-                    IsIdentity: 1
-                });
-                return response;
-            }
-        });
-
-        const entities = [] as Entity[];
-        const y: Entity = {
-            columns: [],
-            indices: [],
-            relationIds: [],
-            relations: [],
-            sqlName: "name",
-            tscName: "name",
-            schema: "schema",
-            database: "",
-            fileImports: []
-        };
-        entities.push(y);
-        const expected: Entity[] = JSON.parse(JSON.stringify(entities));
-        expected[0].columns.push({
-            options: {
-                name: "name"
-            },
-            type: "int",
-            generated: true,
-            default: `() => "'a'"`,
-            tscName: "name",
-            tscType: "number"
-        });
-
-        const result = await driver.GetCoulmnsFromEntity(
-            entities,
-            "schema",
-            "db"
-        );
-        expect(result).to.be.deep.equal(expected);
-    });
-    it("should find primary indexes");
-    it("should get indexes info");
-    it("should get relations info");
-});