This commit is contained in:
SPRINX0\prochazka
2024-12-20 10:38:29 +01:00
parent cadf539c3d
commit 6ae3e019ff

View File

@@ -891,30 +891,18 @@
import _ from 'lodash'; import _ from 'lodash';
import AppObjectCore from './AppObjectCore.svelte'; import AppObjectCore from './AppObjectCore.svelte';
import { import {
currentDatabase,
DEFAULT_OBJECT_SEARCH_SETTINGS, DEFAULT_OBJECT_SEARCH_SETTINGS,
extensions,
getActiveTab, getActiveTab,
getCurrentSettings,
getDatabaseObjectAppObjectSearchSettings,
getExtensions, getExtensions,
getLastUsedDefaultActions, getLastUsedDefaultActions,
lastUsedDefaultActions, lastUsedDefaultActions,
openedConnections,
openedTabs, openedTabs,
pinnedTables, pinnedTables,
selectedDatabaseObjectAppObject, selectedDatabaseObjectAppObject,
} from '../stores'; } from '../stores';
import openNewTab from '../utility/openNewTab'; import openNewTab from '../utility/openNewTab';
import { import { extractDbNameFromComposite, filterNameCompoud, getConnectionLabel } from 'dbgate-tools';
extractDbNameFromComposite, import { getConnectionInfo } from '../utility/metadataLoaders';
filterName,
filterNameCompoud,
generateDbPairingId,
getAlterDatabaseScript,
getConnectionLabel,
} from 'dbgate-tools';
import { getConnectionInfo, getDatabaseInfo } from '../utility/metadataLoaders';
import fullDisplayName from '../utility/fullDisplayName'; import fullDisplayName from '../utility/fullDisplayName';
import { showModal } from '../modals/modalTools'; import { showModal } from '../modals/modalTools';
import { findEngineDriver } from 'dbgate-tools'; import { findEngineDriver } from 'dbgate-tools';
@@ -925,7 +913,6 @@
import ConfirmSqlModal, { runOperationOnDatabase, saveScriptToDatabase } from '../modals/ConfirmSqlModal.svelte'; import ConfirmSqlModal, { runOperationOnDatabase, saveScriptToDatabase } from '../modals/ConfirmSqlModal.svelte';
import { alterDatabaseDialog, renameDatabaseObjectDialog } from '../utility/alterDatabaseTools'; import { alterDatabaseDialog, renameDatabaseObjectDialog } from '../utility/alterDatabaseTools';
import ConfirmModal from '../modals/ConfirmModal.svelte'; import ConfirmModal from '../modals/ConfirmModal.svelte';
import { apiCall } from '../utility/api';
import InputTextModal from '../modals/InputTextModal.svelte'; import InputTextModal from '../modals/InputTextModal.svelte';
import { extractShellConnection } from '../impexp/createImpExpScript'; import { extractShellConnection } from '../impexp/createImpExpScript';
import { format as dateFormat } from 'date-fns'; import { format as dateFormat } from 'date-fns';
@@ -947,9 +934,8 @@
function getExtInfo(data) { function getExtInfo(data) {
const res = []; const res = [];
if (data.objectTypeField === 'triggers') { if (data.objectTypeField === 'triggers') {
res.push(`${data.triggerTiming ?? ''} ${data.eventType ?? ''}`.toLowerCase()); res.push(`${data.tableName}, ${data.triggerTiming?.toLowerCase() ?? ''} ${data.eventType?.toLowerCase() ?? ''}`);
} }
if (data.objectComment) { if (data.objectComment) {
res.push(data.objectComment); res.push(data.objectComment);
} }