actiontech · sjjian · Oct 26, 2022 · Oct 25, 2022 · Oct 25, 2022 · Oct 25, 2022
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"
         ]

diff --git 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/actiontech/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

diff --git 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
@@ -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
 
diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
@@ -2,6 +2,8 @@
 <plugin>
     <!-- Resource mappings -->
     <extension point="org.jkiss.dbeaver.resources">
+        <resource name="drivers/oceanbase"/>
+        <resource name="drivers/tidb"/>
         <resource name="drivers/db2"/>
         <resource name="drivers/db2-jt400"/>
         <resource name="drivers/mysql/mysql8"/>
@@ -20,6 +22,8 @@
 
     <!-- Bundles  -->
     <extension point="org.jkiss.dbeaver.product.bundles">
+        <bundle id="drivers.oceanbase" label="OceanBase drivers"/>
+        <bundle id="drivers.tidb" label="TiDB drivers"/>
         <bundle id="drivers.db2" label="DB2 drivers"/>
         <bundle id="drivers.jt400" label="DB2 iSeries drivers"/>
         <bundle id="drivers.mysql" label="MySQL drivers"/>
@@ -38,6 +42,8 @@
 
     <!-- Enabled drivers -->
     <extension point="io.cloudbeaver.driver">
+        <driver id="oceanbase:alipay_oceanbase"/>
+        <driver id="mysql:tidb"/>
         <driver id="db2:db2"/>
         <driver id="db2_i:db2_iseries"/>
         <driver id="mysql:mysql8"/>

diff --git a/server/drivers/oceanbase/pom.xml b/server/drivers/oceanbase/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.oceanbase</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>oceanbase</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.44</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.cloudbeaver</groupId>
     <artifactId>drivers</artifactId>
@@ -25,6 +25,8 @@
         <module>sqlite</module>
         <module>sqlserver</module>
         <module>trino</module>
+        <module>oceanbase</module>
+        <module>tidb</module>
     </modules>
 
     <build>

diff --git a/server/drivers/tidb/pom.xml b/server/drivers/tidb/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.tidb</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>tidb</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.29</version>
+        </dependency>
+    </dependencies>
+
+</project>