diff --git a/src/common/customizations/defaults.js b/src/common/customizations/defaults.js index 3c5e8f45..73477750 100644 --- a/src/common/customizations/defaults.js +++ b/src/common/customizations/defaults.js @@ -44,6 +44,7 @@ module.exports = { unsigned: false, nullable: false, zerofill: false, + tableOptions: false, autoIncrement: false, comment: false, collation: false, diff --git a/src/common/customizations/mysql.js b/src/common/customizations/mysql.js index 219daac3..d55bee9f 100644 --- a/src/common/customizations/mysql.js +++ b/src/common/customizations/mysql.js @@ -40,6 +40,7 @@ module.exports = { unsigned: true, nullable: true, zerofill: true, + tableOptions: true, autoIncrement: true, comment: true, collation: true, diff --git a/src/main/ipc-handlers/updates.js b/src/main/ipc-handlers/updates.js index d28538db..ff72702e 100644 --- a/src/main/ipc-handlers/updates.js +++ b/src/main/ipc-handlers/updates.js @@ -9,7 +9,7 @@ autoUpdater.allowPrerelease = persistentStore.get('allow_prerelease', true); export default () => { ipcMain.on('check-for-updates', event => { mainWindow = event; - if (process.windowsStore) + if (process.windowsStore || (process.platform === 'linux' && !process.env.APPIMAGE)) mainWindow.reply('no-auto-update'); else { autoUpdater.checkForUpdatesAndNotify().catch(() => { diff --git a/src/renderer/components/WorkspaceExploreBarSchema.vue b/src/renderer/components/WorkspaceExploreBarSchema.vue index 3e994555..b0ce040a 100644 --- a/src/renderer/components/WorkspaceExploreBarSchema.vue +++ b/src/renderer/components/WorkspaceExploreBarSchema.vue @@ -63,7 +63,7 @@ :ref="breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name ? 'explorebar-selected' : ''" class="menu-item" :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name}" - @mousedown="selectMisc({schema: database.name, misc: trigger, type: 'trigger'})" + @mousedown.left="selectMisc({schema: database.name, misc: trigger, type: 'trigger'})" @dblclick="openMiscPermanentTab({schema: database.name, misc: trigger, type: 'trigger'})" @contextmenu.prevent="showMiscContext($event, {...trigger, type: 'trigger'})" > @@ -97,7 +97,7 @@ :ref="breadcrumbs.schema === database.name && breadcrumbs.routine === procedure.name ? 'explorebar-selected' : ''" class="menu-item" :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.routine === procedure.name}" - @mousedown="selectMisc({schema: database.name, misc: procedure, type: 'routine'})" + @mousedown.left="selectMisc({schema: database.name, misc: procedure, type: 'routine'})" @dblclick="openMiscPermanentTab({schema: database.name, misc: procedure, type: 'routine'})" @contextmenu.prevent="showMiscContext($event, {...procedure, type: 'procedure'})" > @@ -131,7 +131,7 @@ :ref="breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name ? 'explorebar-selected' : ''" class="menu-item" :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name}" - @mousedown="selectMisc({schema: database.name, misc: func, type: 'triggerFunction'})" + @mousedown.left="selectMisc({schema: database.name, misc: func, type: 'triggerFunction'})" @dblclick="openMiscPermanentTab({schema: database.name, misc: func, type: 'triggerFunction'})" @contextmenu.prevent="showMiscContext($event, {...func, type: 'triggerFunction'})" > @@ -165,7 +165,7 @@ :ref="breadcrumbs.schema === database.name && breadcrumbs.function === func.name ? 'explorebar-selected' : ''" class="menu-item" :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.function === func.name}" - @mousedown="selectMisc({schema: database.name, misc: func, type: 'function'})" + @mousedown.left="selectMisc({schema: database.name, misc: func, type: 'function'})" @dblclick="openMiscPermanentTab({schema: database.name, misc: func, type: 'function'})" @contextmenu.prevent="showMiscContext($event, {...func, type: 'function'})" > @@ -199,7 +199,7 @@ :ref="breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name ? 'explorebar-selected' : ''" class="menu-item" :class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name}" - @mousedown="selectMisc({schema: database.name, misc: scheduler, type: 'scheduler'})" + @mousedown.left="selectMisc({schema: database.name, misc: scheduler, type: 'scheduler'})" @dblclick="openMiscPermanentTab({schema: database.name, misc: scheduler, type: 'scheduler'})" @contextmenu.prevent="showMiscContext($event, {...scheduler, type: 'scheduler'})" > @@ -320,8 +320,6 @@ export default { this.addLoadedSchema(schema); this.isLoading = false; } - - this.changeBreadcrumbs({ schema, table: null }); }, selectTable ({ schema, table }) { this.newTab({ uid: this.connection.uid, elementName: table.name, schema: this.database.name, type: 'temp-data', elementType: table.type }); diff --git a/src/renderer/components/WorkspacePropsTab.vue b/src/renderer/components/WorkspacePropsTab.vue index 592ea66b..a91aad90 100644 --- a/src/renderer/components/WorkspacePropsTab.vue +++ b/src/renderer/components/WorkspacePropsTab.vue @@ -51,14 +51,15 @@ {{ $t('word.foreignKeys') }} - + -->
@@ -67,6 +68,77 @@
+
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
- + /> --> table.name === this.table) : {}; }, defaultEngine () { - return this.getDatabaseVariable(this.connection.uid, 'default_storage_engine').value || ''; + const engine = this.getDatabaseVariable(this.connection.uid, 'default_storage_engine'); + return engine ? engine.value : ''; }, schemaTables () { const schemaTables = this.workspace.structure @@ -534,6 +607,11 @@ export default { fieldToClone.name = `${fieldToClone.name}_copy`; fieldToClone.order = this.localFields.length + 1; this.localFields = [...this.localFields, fieldToClone]; + + setTimeout(() => { + const scrollable = this.$refs.indexTable.$refs.tableWrapper; + scrollable.scrollTop = scrollable.scrollHeight + 30; + }, 20); }, removeField (uid) { this.localFields = this.localFields.filter(field => field._id !== uid); diff --git a/src/renderer/components/WorkspacePropsTabFunction.vue b/src/renderer/components/WorkspacePropsTabFunction.vue index 4e21f8bb..1defe796 100644 --- a/src/renderer/components/WorkspacePropsTabFunction.vue +++ b/src/renderer/components/WorkspacePropsTabFunction.vue @@ -37,10 +37,10 @@ {{ $t('word.parameters') }} - -