@budibase/server 1.4.15 → 1.4.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.4.15",
-    "@budibase/client": "^1.4.15",
-    "@budibase/pro": "1.4.14",
-    "@budibase/string-templates": "^1.4.15",
-    "@budibase/types": "^1.4.15",
+    "@budibase/backend-core": "^1.4.17",
+    "@budibase/client": "^1.4.17",
+    "@budibase/pro": "1.4.16",
+    "@budibase/string-templates": "^1.4.17",
+    "@budibase/types": "^1.4.17",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -199,5 +199,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "4776b4402861e8617d507be3e97cdd411d3fec43"
+  "gitHead": "3ff0089293ddb047d76c1027f6e5ccf2c63c313d"
 }

package/src/api/controllers/application.ts

@@ -304,7 +304,7 @@ const performAppCreate = async (ctx: any) => {
     })
 
     // Migrate navigation settings and screens if required
-    if (existing && !existing.navigation) {
+    if (existing) {
       const navigation = await migrateAppNavigation()
       if (navigation) {
         newApplication.navigation = navigation
@@ -601,7 +601,7 @@ const migrateAppNavigation = async () => {
   // Migrate all screens, removing custom layouts
   for (let screen of screens) {
     if (!screen.layoutId) {
-      return
+      continue
     }
     const layout = layouts.find(layout => layout._id === screen.layoutId)
     screen.layoutId = undefined
@@ -615,7 +615,7 @@ const migrateAppNavigation = async () => {
   const layout = layouts?.find(
     (layout: Layout) => layout._id === BASE_LAYOUT_PROP_IDS.PRIVATE
   )
-  if (layout) {
+  if (layout && !existing.navigation) {
     let navigationSettings: any = {
       navigation: "Top",
       title: name,

package/src/integrations/mysql.ts

@@ -30,6 +30,7 @@ interface MySQLConfig {
   ssl?: { [key: string]: any }
   rejectUnauthorized: boolean
   typeCast: Function
+  multipleStatements: boolean
 }
 
 const SCHEMA: Integration = {
@@ -136,6 +137,7 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
     delete config.rejectUnauthorized
     this.config = {
       ...config,
+      multipleStatements: true,
       typeCast: function (field: any, next: any) {
         if (
           field.type == "DATETIME" ||