From 4be309d330a48cf89f9e666678fdaa186bdbce5f Mon Sep 17 00:00:00 2001 From: HuangWeiCen <1724659546@qq.com> Date: Tue, 25 Oct 2022 15:47:45 +0800 Subject: [PATCH 1/5] support oceanbase and tidb --- .../plugin.xml | 6 +++++ server/drivers/oceanbase/pom.xml | 25 +++++++++++++++++++ server/drivers/pom.xml | 4 ++- server/drivers/tidb/pom.xml | 25 +++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 server/drivers/oceanbase/pom.xml create mode 100644 server/drivers/tidb/pom.xml diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml index 284e055fec0..57d93e52d42 100644 --- a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml +++ b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml @@ -2,6 +2,8 @@ + + @@ -20,6 +22,8 @@ + + @@ -38,6 +42,8 @@ + + diff --git a/server/drivers/oceanbase/pom.xml b/server/drivers/oceanbase/pom.xml new file mode 100644 index 00000000000..3825d4bf3c2 --- /dev/null +++ b/server/drivers/oceanbase/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + drivers.oceanbase + 1.0.0 + + io.cloudbeaver + drivers + 1.0.0 + ../ + + + + oceanbase + + + + + mysql + mysql-connector-java + 5.1.44 + + + + diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml index 9562a0dcdcf..7628426c752 100644 --- a/server/drivers/pom.xml +++ b/server/drivers/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 io.cloudbeaver drivers @@ -25,6 +25,8 @@ sqlite sqlserver trino + oceanbase + tidb diff --git a/server/drivers/tidb/pom.xml b/server/drivers/tidb/pom.xml new file mode 100644 index 00000000000..f8679032a01 --- /dev/null +++ b/server/drivers/tidb/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + drivers.tidb + 1.0.0 + + io.cloudbeaver + drivers + 1.0.0 + ../ + + + + tidb + + + + + mysql + mysql-connector-java + 8.0.29 + + + + From d41955c7b679a7e5ed6e1c234b3b844ec1d61dac Mon Sep 17 00:00:00 2001 From: HuangWeiCen <1724659546@qq.com> Date: Tue, 25 Oct 2022 15:51:16 +0800 Subject: [PATCH 2/5] update docker name --- deploy/docker/make-docker-container.sh | 2 +- deploy/docker/run-docker-container.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/docker/make-docker-container.sh b/deploy/docker/make-docker-container.sh index 17f869b3e43..808f7177a6b 100755 --- a/deploy/docker/make-docker-container.sh +++ b/deploy/docker/make-docker-container.sh @@ -1,3 +1,3 @@ cd .. -docker build -t dbeaver/cloudbeaver:dev . --file ./docker/Dockerfile +docker build -t actiontech/sqle-cloudbeaver:22_2_0 . --file ./docker/Dockerfile diff --git a/deploy/docker/run-docker-container.sh b/deploy/docker/run-docker-container.sh index a9cd9f42f52..ef7612db021 100755 --- a/deploy/docker/run-docker-container.sh +++ b/deploy/docker/run-docker-container.sh @@ -1,5 +1,5 @@ # Detect host machine IP Address (we need this when run in docker container) export CB_LOCAL_HOST_ADDR=$(ifconfig | grep -E "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -v 127.0.0.1 | awk '{ print $2 }' | cut -f2 -d: | head -n1) -docker run --name cloudbeaver --rm -ti -p 8978:8978 --add-host=host.docker.internal:${CB_LOCAL_HOST_ADDR} -v /var/cloudbeaver/workspace:/opt/cloudbeaver/workspace dbeaver/cloudbeaver:dev +docker run --name cloudbeaver --rm -ti -p 8978:8978 --add-host=host.docker.internal:${CB_LOCAL_HOST_ADDR} -v /var/cloudbeaver/workspace:/opt/cloudbeaver/workspace actiontech/sqle-cloudbeaver:22_2_0 From 6955d0c1362102320ab81bd5725f4dfe1c55d41e Mon Sep 17 00:00:00 2001 From: HuangWeiCen <1724659546@qq.com> Date: Tue, 25 Oct 2022 15:53:25 +0800 Subject: [PATCH 3/5] Accelerate compilation --- deploy/build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deploy/build.sh b/deploy/build.sh index 9e14523585a..ad6def0cf24 100755 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -21,14 +21,18 @@ cd ../.. #[ ! -d react-data-grid ] && git clone https://github.com/dbeaver/react-data-grid.git echo "Pull dbeaver platform" -[ ! -d dbeaver ] && git clone https://github.com/dbeaver/dbeaver.git +[ ! -d dbeaver ] && git clone --depth 1 https://github.com/ActionTechHuang/dbeaver.git -b sqle_22_2_0 cd cloudbeaver/deploy echo "Build CloudBeaver server" cd ../server/product/aggregate -mvn clean verify -Dheadless-platform +#mvn clean verify -Dheadless-platform + +# 加速编译 +mvn -T 1C -U -e verify -Dheadless-platform -Dmaven.compile.fork=true -Dmaven.test.skip=true + if [[ "$?" -ne 0 ]] ; then echo 'Could not perform package'; exit $rc fi From aaeb4ffadaed1c438fd8cb9d16c1b52339948e79 Mon Sep 17 00:00:00 2001 From: HuangWeiCen <1724659546@qq.com> Date: Tue, 25 Oct 2022 15:55:20 +0800 Subject: [PATCH 4/5] update config --- config/core/product.conf | 2 +- .../.dbeaver/data-sources.json | 22 +---------- .../DefaultConfiguration/cloudbeaver.conf | 4 +- .../.dbeaver/data-sources.json | 37 +------------------ .../SQLiteConfiguration/cloudbeaver.conf | 5 ++- 5 files changed, 8 insertions(+), 62 deletions(-) diff --git a/config/core/product.conf b/config/core/product.conf index ebdd856ea3e..d83a6d3f6f0 100644 --- a/config/core/product.conf +++ b/config/core/product.conf @@ -5,7 +5,7 @@ core: { // User defaults user: { - defaultTheme: "light", + defaultTheme: "dark", defaultLanguage: "en" }, app: { diff --git a/config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json b/config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json index c954ec82d92..edc5802a0a7 100644 --- a/config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json +++ b/config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json @@ -1,24 +1,4 @@ { "folders": {}, - "connections": { - "postgresql-template-1": { - "provider": "postgresql", - "driver": "postgres-jdbc", - "name": "PostgreSQL (Template)", - "save-password": false, - "show-system-objects": false, - "read-only": true, - "template": true, - "configuration": { - "host": "localhost", - "port": "5432", - "database": "postgres", - "url": "jdbc:postgresql://localhost:5432/postgres", - "type": "dev", - "provider-properties": { - "@dbeaver-show-non-default-db@": "false" - } - } - } - } + "connections": {} } diff --git a/config/sample-databases/DefaultConfiguration/cloudbeaver.conf b/config/sample-databases/DefaultConfiguration/cloudbeaver.conf index 168e296f931..a37c288aaef 100644 --- a/config/sample-databases/DefaultConfiguration/cloudbeaver.conf +++ b/config/sample-databases/DefaultConfiguration/cloudbeaver.conf @@ -6,12 +6,12 @@ contentRoot: "web", driversLocation: "drivers", - rootURI: "/", + rootURI: "/sql_query", serviceURI: "/api/", productConfiguration: "conf/product.conf", - expireSessionAfterPeriod: 1800000, + expireSessionAfterPeriod: 43200000, develMode: false, diff --git a/config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json b/config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json index 27dbbe907a4..edc5802a0a7 100644 --- a/config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json +++ b/config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json @@ -1,39 +1,4 @@ { "folders": {}, - "connections": { - "sqlite_xerial-sample-database": { - "provider": "generic", - "driver": "sqlite_jdbc", - "name": "SQLite - Chinook (Sample)", - "save-password": true, - "navigator-show-only-entities": false, - "navigator-hide-folders": false, - "read-only": false, - "template": false, - "configuration": { - "database": "${application.path}/../samples/db/Chinook.sqlitedb", - "type": "dev", - "auth-model": "native" - } - }, - "postgresql-template-1": { - "provider": "postgresql", - "driver": "postgres-jdbc", - "name": "PostgreSQL (Template)", - "save-password": false, - "show-system-objects": false, - "read-only": true, - "template": true, - "configuration": { - "host": "localhost", - "port": "5432", - "database": "postgres", - "url": "jdbc:postgresql://localhost:5432/postgres", - "type": "dev", - "provider-properties": { - "@dbeaver-show-non-default-db@": "false" - } - } - } - } + "connections": {} } diff --git a/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf b/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf index a1f14be291a..a37c288aaef 100644 --- a/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf +++ b/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf @@ -6,12 +6,12 @@ contentRoot: "web", driversLocation: "drivers", - rootURI: "/", + rootURI: "/sql_query", serviceURI: "/api/", productConfiguration: "conf/product.conf", - expireSessionAfterPeriod: 1800000, + expireSessionAfterPeriod: 43200000, develMode: false, @@ -60,6 +60,7 @@ ], disabledDrivers: [ + "sqlite:sqlite_jdbc", "h2:h2_embedded", "clickhouse:yandex_clickhouse" ] From a776c6ac7f086cfe4198d8474bb305c793356654 Mon Sep 17 00:00:00 2001 From: HuangWeiCen <1724659546@qq.com> Date: Wed, 26 Oct 2022 15:00:11 +0800 Subject: [PATCH 5/5] update git store --- deploy/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/build.sh b/deploy/build.sh index ad6def0cf24..f53d64513ad 100755 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -21,7 +21,7 @@ cd ../.. #[ ! -d react-data-grid ] && git clone https://github.com/dbeaver/react-data-grid.git echo "Pull dbeaver platform" -[ ! -d dbeaver ] && git clone --depth 1 https://github.com/ActionTechHuang/dbeaver.git -b sqle_22_2_0 +[ ! -d dbeaver ] && git clone --depth 1 https://github.com/actiontech/dbeaver.git -b sqle_22_2_0 cd cloudbeaver/deploy