dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-21 00:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jan Prochazka
2021-10-17 11:37:27 +02:00
parent b8f08127f0 7eff7c649c
commit 4f4e3cbcc3
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/web/src/datagrid/DataGridCell.svelte
View File

@@ -99,7 +99,7 @@
{:else}
{highlightSpecialCharacters(value)}
{/if}
{:else if value.type == 'Buffer' && _.isArray(value.data)}
{:else if value?.type == 'Buffer' && _.isArray(value.data)}
{#if value.data.length <= 16}
<span class="value">{arrayToHexString(value.data)}</span>
{:else}

2
packages/web/src/utility/clipboard.js
View File

@@ -67,7 +67,7 @@ export function extractRowCopiedValue(row, col) {
if (value === undefined) value = _.get(row, col);
if (value === null) return '(NULL)';
if (value === undefined) return '(NoField)';
if (value.type == 'Buffer' && _.isArray(value.data)) return arrayToHexString(value.data);
if (value && value.type == 'Buffer' && _.isArray(value.data)) return arrayToHexString(value.data);
if (_.isPlainObject(value) || _.isArray(value)) return JSON.stringify(value);
return value;
}

7
plugins/dbgate-plugin-mysql/src/frontend/Dumper.js
View File

@@ -66,8 +66,11 @@ class Dumper extends SqlDumper {
}
putValue(value) {
if (value.type == 'Buffer' && _isArray(value.data)) this.putRaw(`unhex('${arrayToHexString(value.data)}')`);
else super.putValue(value);
if (value && value.type == 'Buffer' && _isArray(value.data)) {
this.putRaw(`unhex('${arrayToHexString(value.data)}')`);
} else {
super.putValue(value);
}
}
}