Merge pull request #2512 from Budibase/fix/martin-bugfixes-116

Fix/martin bugfixes 116

packages/server/package.json

@@ -95,7 +95,7 @@
     "lodash": "4.17.21",
     "mongodb": "3.6.3",
     "mssql": "6.2.3",
-    "mysql": "2.18.1",
+    "mysql": "^2.18.1",
     "node-fetch": "2.6.0",
     "open": "7.3.0",
     "pg": "8.5.1",

packages/server/src/api/controllers/row/ExternalRequest.ts

@@ -276,7 +276,7 @@ module External {
     }
 
     outputProcessing(
-      rows: Row[],
+      rows: Row[] = [],
       table: Table,
       relationships: RelationshipsJson[]
     ) {

packages/server/src/integrations/mysql.ts

@@ -140,7 +140,7 @@ module MySQLModule {
       this.client = mysql.createConnection(config)
     }
 
-    async buildSchema(datasourceId: string) {
+    async buildSchema(datasourceId: string, entities: Record<string, Table>) {
       const tables: { [key: string]: Table } = {}
       const database = this.config.database
       this.client.connect()
@@ -193,6 +193,19 @@ module MySQLModule {
             schema,
           }
         }
+
+        // add the existing relationships from the entities if they exist, to prevent them from being overridden
+        if (entities && entities[tableName]) {
+          const existingTableSchema = entities[tableName].schema
+          for (let key in existingTableSchema) {
+            if (!existingTableSchema.hasOwnProperty(key)) {
+              continue
+            }
+            if (existingTableSchema[key].type === "link") {
+              tables[tableName].schema[key] = existingTableSchema[key]
+            }
+          }
+        }
       }
 
       this.client.end()