Merge pull request beekeeper-studio#2170 from beekeeper-studio/fix/bo…

…olean-options-tabulator fix tabulator select options
jackojun · Apr 29, 2024 · dae1741 · dae1741
2 parents 705eb80 + f2926d0
commit dae1741
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/apps/studio/src/components/tableinfo/TableIndexes.vue b/apps/studio/src/components/tableinfo/TableIndexes.vue
@@ -221,7 +221,7 @@ export default Vue.extend({
           title: 'Columns',
           field: 'columns',
           editable,
-          editor: 'select',
+          editor: 'list',
           formatter: this.cellFormatter,
           editorParams: {
             multiselect: true,

diff --git a/apps/studio/src/components/tableinfo/TableRelations.vue b/apps/studio/src/components/tableinfo/TableRelations.vue
@@ -224,7 +224,7 @@ export default Vue.extend({
           field: 'toColumn',
           title: "FK Column",
           editable,
-          editor: 'select',
+          editor: 'list',
           editorParams: {
             // @ts-expect-error Incorrectly typed
             valuesLookup: this.getColumns
@@ -233,7 +233,7 @@ export default Vue.extend({
         {
           field: 'onUpdate',
           title: "On Update",
-          editor: 'select',
+          editor: 'list',
           editable,
           editorParams: {
             values: this.dialectData.constraintActions,
@@ -244,7 +244,7 @@ export default Vue.extend({
           field: 'onDelete',
           title: 'On Delete',
           editable,
-          editor: 'select',
+          editor: 'list',
           // @ts-expect-error Bad Type
           editorParams: {
             values: this.dialectData.constraintActions,

diff --git a/apps/studio/src/components/tableinfo/TableSchema.vue b/apps/studio/src/components/tableinfo/TableSchema.vue
@@ -216,7 +216,8 @@ export default Vue.extend({
         allowEmpty: false,
         values: this.columnTypes,
         defaultValue: 'varchar(255)',
-        showListOnEmpty: true
+        listOnEmpty: true,
+        autocomplete: true,
       }
 
       const result = [
@@ -236,7 +237,7 @@ export default Vue.extend({
         {
           title: 'Type',
           field: 'dataType',
-          editor: 'autocomplete',
+          editor: 'list',
           editorParams: autocompleteOptions,
           cellEdited: this.cellEdited,
           editable: this.isCellEditable.bind(this, 'alterColumn'),

diff --git a/apps/studio/src/components/tableview/TableTable.vue b/apps/studio/src/components/tableview/TableTable.vue
@@ -640,9 +640,10 @@ export default Vue.extend({
         }
 
         if (column.dataType && /^(bool|boolean)$/i.test(column.dataType)) {
-          const trueVal = this.dialectData.boolean?.true ?? true
-          const falseVal = this.dialectData.boolean?.false ?? false
-          const values = [falseVal, trueVal]
+          const values = [
+            { label: 'false', value: this.dialectData.boolean?.false ?? false },
+            { label: 'true', value: this.dialectData.boolean?.true ?? true },
+          ]
           if (column.nullable) values.push({ label: '(NULL)', value: null })
           result.editorParams['values'] = values
         }
@@ -1036,7 +1037,7 @@ export default Vue.extend({
           return 'textarea'
         case 'bool':
         case 'boolean':
-          return 'select'
+          return 'list'
         default: return ne
       }
     },

diff --git a/shared/src/components/SchemaBuilder.vue b/shared/src/components/SchemaBuilder.vue
@@ -94,7 +94,8 @@ export default Vue.extend({
         allowEmpty: false,
         values: columnTypes.map((d) => d.pretty),
         defaultValue: defaultColumnType || 'varchar(255)',
-        showListOnEmpty: true
+        listOnEmpty: true,
+        autocomplete: true,
       }
     },
     disabledFeatures() {
@@ -118,7 +119,7 @@ export default Vue.extend({
         {
           title: "Type",
           field: "dataType",
-          editor: "autocomplete",
+          editor: "list",
           editorParams: this.autoCompleteOptions,
           minWidth: 90,
           widthShrink: 1,