fix: issue with ENUM and SET fields on table filler modal

antares-sql · May 13, 2021 · 475397c · 475397c
1 parent 7a62131
commit 475397c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
@@ -1341,7 +1341,7 @@ export class MySQLClient extends AntaresCore {
                               remappedFields = remappedFields.map(field => {
                                  const detailedField = response.find(f => f.name === field.name);
                                  if (detailedField && field.orgTable === paramObj.table && field.schema === paramObj.schema)
-                                    field = { ...detailedField, ...field };
+                                    field = { ...field, ...detailedField };
                                  return field;
                               });
                            }

diff --git a/src/renderer/components/FakerSelect.vue b/src/renderer/components/FakerSelect.vue
@@ -66,6 +66,21 @@
          :type="inputProps().type"
          :disabled="!isChecked"
       >
+      <select
+         v-else-if="enumArray"
+         v-model="selectedValue"
+         class="form-select"
+         :disabled="!isChecked"
+         @change="onChange"
+      >
+         <option
+            v-for="val in enumArray"
+            :key="val"
+            :value="val"
+         >
+            {{ val }}
+         </option>
+      </select>
       <input
          v-else
          ref="formInput"
@@ -121,7 +136,8 @@ export default {
          selectedMethod: '',
          selectedValue: '',
          debounceTimeout: null,
-         methodParams: {}
+         methodParams: {},
+         enumArray: null
       };
    },
    computed: {
@@ -150,8 +166,14 @@ export default {
    },
    watch: {
       fieldObj () {
-         if (this.fieldObj)
-            this.selectedValue = this.fieldObj.value;
+         if (this.fieldObj) {
+            if (Array.isArray(this.fieldObj.value)) {
+               this.enumArray = this.fieldObj.value;
+               this.selectedValue = this.fieldObj.value[0];
+            }
+            else
+               this.selectedValue = this.fieldObj.value;
+         }
       },
       selectedGroup () {
          if (this.fakerMethods.length)

diff --git a/src/renderer/components/ModalFakerRows.vue b/src/renderer/components/ModalFakerRows.vue
@@ -269,6 +269,9 @@ export default {
                   fieldDefault = moment().format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
                }
             }
+
+            if (field.enumValues)
+               fieldDefault = field.enumValues.replaceAll('\'', '').split(',');
          }
 
          rowObj[field.name] = { value: fieldDefault };