diff --git a/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue b/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue index 7539b4a73a2319b3a81d2c95fdf1105c3394d87b..e15c0894f2496f968560f55e1713e68af27701c5 100644 --- a/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue +++ b/dbrepo-ui/pages/database/_database_id/table/_table_id/import.vue @@ -133,7 +133,7 @@ export default { }, tableImport: { location: null, - quote: null, + quote: '"', false_element: null, true_element: null, null_element: null, diff --git a/dbrepo-ui/pages/database/_database_id/table/import.vue b/dbrepo-ui/pages/database/_database_id/table/import.vue index 190c558cbc70580c22280d63136a41ed33641fe8..aa68beb8be27d27b3a0e36102f092fa341b41167 100644 --- a/dbrepo-ui/pages/database/_database_id/table/import.vue +++ b/dbrepo-ui/pages/database/_database_id/table/import.vue @@ -132,6 +132,19 @@ </v-stepper-step> <v-stepper-content step="3"> <v-form ref="form" v-model="validStep3" @submit.prevent="submit"> + <v-row dense> + <v-col cols="8"> + <v-alert + v-if="warnAnalyseSeparator" + border="left" + color="warning"> + We analysed your .csv/.tsv file and found that the separator you provided + <code>{{ tableImport.separator }}</code> is not correct, the separator + <code>{{ suggestedAnalyseSeparator }}</code> is more likely to be correct. If you really want to import + the .csv/.tsv file still, click "continue". + </v-alert> + </v-col> + </v-row> <v-row dense> <v-col cols="8"> <v-file-input @@ -240,7 +253,7 @@ export default { }, tableImport: { location: null, - quote: null, + quote: '"', false_element: null, true_element: null, null_element: null, @@ -251,6 +264,8 @@ export default { loadingUpload: false, loadingAnalyse: false, loadingImage: false, + warnAnalyseSeparator: false, + suggestedAnalyseSeparator: null, url: null, columns: [], newTableId: 42 // FIXME ??? @@ -331,7 +346,7 @@ export default { this.loadingAnalyse = true AnalyseService.determineDataTypes(path) .then((analysis) => { - const { columns } = analysis + const { columns, separator } = analysis const dataTypes = QueryMapper.mySql8DataTypes() this.tableCreate.columns = Object.entries(columns) .map(([key, val]) => { @@ -347,7 +362,12 @@ export default { } }) this.tableImport.location = path - this.step = 4 + if (separator !== this.tableImport.separator) { + this.warnAnalyseSeparator = true + this.suggestedAnalyseSeparator = separator + } else { + this.step = 4 + } }) .finally(() => { this.loadingAnalyse = false