fabio286
/
antares
mirror of https://github.com/Fabio286/antares.git
1
1
Fork 0
Code Issues Releases Wiki Activity

fix: deletion of rows with non-numeric ID

This commit is contained in:
Fabio Di Stasio 2020-12-07 15:07:59 +01:00
parent e0e2131981
commit d38583262e
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/ipc-handlers/tables.js
View File

@ -89,11 +89,18 @@ export default (connections) => {
});
ipcMain.handle('delete-table-rows', async (event, params) => {
let idString;
if (typeof params.rows[0] === 'string')
idString = params.rows.map(row => `"${row}"`).join(',');
else
idString = params.rows.join(',');
try {
const result = await connections[params.uid]
.schema(params.schema)
.delete(params.table)
.where({ [params.primary]: `IN (${params.rows.join(',')})` })
.where({ [params.primary]: `IN (${idString})` })
.run();
return { status: 'success', response: result };

24
src/renderer/components/WorkspacePropsTableRow.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="tr" @contextmenu.prevent="$emit('contextmenu', $event, localRow._id)">
<div class="td">
<div class="td" tabindex="0">
<div class="row-draggable">
<i class="mdi mdi-drag-horizontal row-draggable-icon" />
{{ localRow.order }}
@ -17,7 +17,7 @@
/>
</div>
</div>
<div class="td">
<div class="td" tabindex="0">
<span
v-if="!isInlineEditor.name"
class="cell-content"
@ -35,7 +35,11 @@
@blur="editOFF"
>
</div>
<div class="td text-uppercase text-left" :class="`type-${lowerCase(localRow.type)}`">
<div
class="td text-uppercase text-left"
tabindex="0"
:class="`type-${lowerCase(localRow.type)}`"
>
<span
v-if="!isInlineEditor.type"
class="cell-content"
@ -66,7 +70,7 @@
</optgroup>
</select>
</div>
<div class="td type-int">
<div class="td type-int" tabindex="0">
<template v-if="fieldType.length">
<span
v-if="!isInlineEditor.length"
@ -86,7 +90,7 @@
>
</template>
</div>
<div class="td">
<div class="td" tabindex="0">
<label class="form-checkbox">
<input
v-model="localRow.unsigned"
@ -96,7 +100,7 @@
<i class="form-icon" />
</label>
</div>
<div class="td">
<div class="td" tabindex="0">
<label class="form-checkbox">
<input
v-model="localRow.nullable"
@ -106,7 +110,7 @@
<i class="form-icon" />
</label>
</div>
<div class="td">
<div class="td" tabindex="0">
<label class="form-checkbox">
<input
v-model="localRow.zerofill"
@ -116,12 +120,12 @@
<i class="form-icon" />
</label>
</div>
<div class="td">
<div class="td" tabindex="0">
<span class="cell-content" @dblclick="editON($event, localRow.default, 'default')">
{{ fieldDefault }}
</span>
</div>
<div class="td type-varchar">
<div class="td type-varchar" tabindex="0">
<span
v-if="!isInlineEditor.comment"
class="cell-content"
@ -139,7 +143,7 @@
@blur="editOFF"
>
</div>
<div class="td">
<div class="td" tabindex="0">
<template v-if="fieldType.collation">
<span
v-if="!isInlineEditor.collation"