diff --git a/packages/datalib/src/ViewGridDisplay.ts b/packages/datalib/src/ViewGridDisplay.ts index da1ca6aba..8767bd5a8 100644 --- a/packages/datalib/src/ViewGridDisplay.ts +++ b/packages/datalib/src/ViewGridDisplay.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay'; -import type { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types'; +import type { EngineDriver, ViewInfo, ColumnInfo, DatabaseInfo } from 'dbgate-types'; import { GridConfig, GridCache } from './GridConfig'; export class ViewGridDisplay extends GridDisplay { @@ -11,9 +11,10 @@ export class ViewGridDisplay extends GridDisplay { setConfig: ChangeConfigFunc, cache: GridCache, setCache: ChangeCacheFunc, + dbinfo: DatabaseInfo, serverVersion ) { - super(config, setConfig, cache, setCache, driver, serverVersion); + super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion); this.columns = this.getDisplayColumns(view); this.formColumns = this.columns; this.filterable = true; diff --git a/packages/tools/src/DatabaseAnalyser.ts b/packages/tools/src/DatabaseAnalyser.ts index 0b87fddb4..255de678b 100644 --- a/packages/tools/src/DatabaseAnalyser.ts +++ b/packages/tools/src/DatabaseAnalyser.ts @@ -322,7 +322,7 @@ export class DatabaseAnalyser { this.logger.debug({ rows: res.rows.length, template }, `Loaded analyser query`); return res; } catch (err) { - logger.error({ err, message: err.message, template, sql }, 'Error running analyser query'); + logger.error({ err, message: err.message, template }, 'Error running analyser query'); return { rows: [], }; diff --git a/packages/web/src/tabs/ViewDataTab.svelte b/packages/web/src/tabs/ViewDataTab.svelte index b12230917..a5fb401db 100644 --- a/packages/web/src/tabs/ViewDataTab.svelte +++ b/packages/web/src/tabs/ViewDataTab.svelte @@ -18,7 +18,7 @@ import SqlFormView from '../formview/SqlFormView.svelte'; import { getBoolSettingsValue } from '../settings/settingsTools'; import { extensions } from '../stores'; - import { useConnectionInfo, useDatabaseServerVersion, useViewInfo } from '../utility/metadataLoaders'; + import { useConnectionInfo, useDatabaseInfo, useDatabaseServerVersion, useViewInfo } from '../utility/metadataLoaders'; import { getLocalStorage, setLocalStorage } from '../utility/storageCache'; import useGridConfig from '../utility/useGridConfig'; import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte'; @@ -32,6 +32,7 @@ $: connection = useConnectionInfo({ conid }); $: viewInfo = useViewInfo({ conid, database, schemaName, pureName }); $: serverVersion = useDatabaseServerVersion({ conid, database }); + $: dbinfo = useDatabaseInfo({ conid, database }); const config = useGridConfig(tabid); const cache = writable(createGridCache()); @@ -46,6 +47,7 @@ config.update, $cache, cache.update, + $dbinfo, $serverVersion ) : null; diff --git a/plugins/dbgate-plugin-oracle/src/backend/sql/routines.js b/plugins/dbgate-plugin-oracle/src/backend/sql/routines.js index 533d9d962..2f290386c 100644 --- a/plugins/dbgate-plugin-oracle/src/backend/sql/routines.js +++ b/plugins/dbgate-plugin-oracle/src/backend/sql/routines.js @@ -3,7 +3,7 @@ select routine_name as "pure_name", -- routine_schema as "schema_name", routine_definition as "definition", - standard_hash(routine_definition, 'MD5') as "hash_code", + ora_hash(routine_definition) as "hash_code", routine_type as "object_type", 'fixme_data_type' as "data_type", 'fixme_external_language' as "language"