Merge pull request #536 from dolthub/taylor/er-fix

graphql: Fix ER diagram error, bump multer

Author: tbantle22

graphql-server/package.json

@@ -91,6 +91,6 @@
   },
   "resolutions": {
     "brace-expansion": "2.0.2",
-    "multer": "2.0.1"
+    "multer": "2.0.2"
   }
 }

graphql-server/src/indexes/index.model.ts

@@ -31,7 +31,7 @@ export function fromDoltRowsRes(rows: RawRow[]): Index[] {
     return {
       name: r.INDEX_NAME,
       type: getIndexType(cols, r.NON_UNIQUES === 1 || r.NON_UNIQUES === "1"),
-      comment: r.COMMENTS,
+      comment: r.COMMENTS ?? "",
       columns: cols.map(c => {
         return { name: c };
       }),

graphql-server/yarn.lock

@@ -7687,9 +7687,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multer@npm:2.0.1":
-  version: 2.0.1
-  resolution: "multer@npm:2.0.1"
+"multer@npm:2.0.2":
+  version: 2.0.2
+  resolution: "multer@npm:2.0.2"
   dependencies:
     append-field: "npm:^1.0.0"
     busboy: "npm:^1.6.0"
@@ -7698,7 +7698,7 @@ __metadata:
     object-assign: "npm:^4.1.1"
     type-is: "npm:^1.6.18"
     xtend: "npm:^4.0.2"
-  checksum: 10c0/2b5ab16a2bc6070690cff1f30589bb0d1218ed62051d65fdb1a8d9c65c63238c07af81ae8921de449f921ff10c849f3f6830fd07ef5640c46aaaca5c94044d25
+  checksum: 10c0/d3b99dd0512169bbabf15440e1bbb3ecdc000b761e5a3e4aaca40b5e5e213c6cdcc9b7dffebaa601b7691a84f6876aa87e0173ffcc47139253793cf5657819eb
   languageName: node
   linkType: hard
 

workbench-cypress/cypress/e2e/database/erDiagram.spec.ts

@@ -0,0 +1,30 @@
+import { newExpectation } from "@utils/helpers";
+import { runTests } from "@utils/index";
+import { testDBHeader } from "@utils/sharedTests/dbHeaders";
+import {
+  notExist,
+  shouldBeVisible,
+  shouldNotExist,
+} from "@utils/sharedTests/sharedFunctionsAndVariables";
+
+const pageName = "ER Diagram";
+const connectionName = "CypressTestConnection";
+const dbName = "us-jails";
+const currentPage = `/database/${dbName}/schema/main`;
+const hasDocs = true;
+
+describe(pageName, () => {
+  const tests = [
+    newExpectation(
+      "should not find empty database",
+      "[data-cy=db-data-table-empty]",
+      notExist,
+    ),
+    shouldNotExist("db-doc-markdown"),
+    ...testDBHeader(connectionName, dbName, hasDocs),
+    shouldBeVisible("er-diagram-canvas"),
+    shouldBeVisible("er-diagram-close-control-button"),
+    shouldBeVisible("er-diagram-notation"),
+  ];
+  runTests({ tests, currentPage, pageName });
+});