From ceb51a259733be99aded2cb727aa86dae08808aa Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Tue, 10 Sep 2024 14:38:33 +0200 Subject: [PATCH] basic driver works --- plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js | 4 ++-- plugins/dbgate-plugin-clickhouse/src/frontend/driver.js | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js b/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js index 1cdf75a0a..2807ff9a1 100644 --- a/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js @@ -24,8 +24,8 @@ class Analyser extends DatabaseAnalyser { primaryKeyColumns: undefined, sortingKeyColumns: undefined, columns: columns.rows.filter((col) => col.pureName == table.pureName), - primaryKey: (table.primaryKeyColumns || '').split(',').map((columnName) => ({ columnName })), - sortingKey: (table.sortingKeyColumns || '').split(',').map((columnName) => ({ columnName })), + primaryKey: { columns: (table.primaryKeyColumns || '').split(',').map((columnName) => ({ columnName })) }, + sortingKey: { columns: (table.sortingKeyColumns || '').split(',').map((columnName) => ({ columnName })) }, foreignKeys: [], })), }; diff --git a/plugins/dbgate-plugin-clickhouse/src/frontend/driver.js b/plugins/dbgate-plugin-clickhouse/src/frontend/driver.js index 6c0ef39ea..36ed6a5eb 100644 --- a/plugins/dbgate-plugin-clickhouse/src/frontend/driver.js +++ b/plugins/dbgate-plugin-clickhouse/src/frontend/driver.js @@ -6,11 +6,10 @@ const { mysqlSplitterOptions } = require('dbgate-query-splitter/lib/options'); const dialect = { limitSelect: true, rangeSelect: true, - offsetFetchRangeSyntax: true, stringEscapeChar: "'", - fallbackDataType: 'nvarchar(max)', + fallbackDataType: 'String', quoteIdentifier(s) { - return `[${s}]`; + return `"${s}"`; }, };