github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-14 22:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflict markers in non-sql connection filter lists

Browse Source
This commit is contained in:
t8y2 committed 2026-06-25 01:02:25 +08:00
1 parent 7ff4363dae
commit cc2fa698d2
4 files changed
+5 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/desktop/src/components/sql-file/SqlFileExecutionDialog.vue
+1 -5
View File
@@ -49,11 +49,7 @@ const terminalStatus = ref<SqlFileStatus | "idle">("idle");
const terminalError = ref("");
const refreshedTarget = ref(false);
<<<<<<< HEAD
const sqlConnections = computed(() => store.connections.filter((c) => !["redis", "mongodb", "elasticsearch", "qdrant", "milvus", "etcd", "zookeeper", "mq", "nacos"].includes(c.db_type)));
=======
const sqlConnections = computed(() => store.connections.filter((c) => !["redis", "mongodb", "elasticsearch", "qdrant", "milvus", "weaviate", "etcd", "mq", "nacos"].includes(c.db_type)));
>>>>>>> origin/main
const sqlConnections = computed(() => store.connections.filter((c) => !["redis", "mongodb", "elasticsearch", "qdrant", "milvus", "weaviate", "etcd", "zookeeper", "mq", "nacos"].includes(c.db_type)));
const selectedConnection = computed(() => sqlConnections.value.find((c) => c.id === connectionId.value));