Skip to content

Commit d269eb2

Browse files
sjjiansjjian
authored
Merge pull request #1 from actiontech/issue_971
Issue 971
2 parents 85b8c7a + a776c6a commit d269eb2

12 files changed

Lines changed: 75 additions & 67 deletions

File tree

‎config/core/product.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
core: {
66
// User defaults
77
user: {
8-
defaultTheme: "light",
8+
defaultTheme: "dark",
99
defaultLanguage: "en"
1010
},
1111
app: {

‎config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
11
{
22
"folders": {},
3-
"connections": {
4-
"postgresql-template-1": {
5-
"provider": "postgresql",
6-
"driver": "postgres-jdbc",
7-
"name": "PostgreSQL (Template)",
8-
"save-password": false,
9-
"show-system-objects": false,
10-
"read-only": true,
11-
"template": true,
12-
"configuration": {
13-
"host": "localhost",
14-
"port": "5432",
15-
"database": "postgres",
16-
"url": "jdbc:postgresql://localhost:5432/postgres",
17-
"type": "dev",
18-
"provider-properties": {
19-
"@dbeaver-show-non-default-db@": "false"
20-
}
21-
}
22-
}
23-
}
3+
"connections": {}
244
}

‎config/sample-databases/DefaultConfiguration/cloudbeaver.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
contentRoot: "web",
77
driversLocation: "drivers",
88

9-
rootURI: "/",
9+
rootURI: "/sql_query",
1010
serviceURI: "/api/",
1111

1212
productConfiguration: "conf/product.conf",
1313

14-
expireSessionAfterPeriod: 1800000,
14+
expireSessionAfterPeriod: 43200000,
1515

1616
develMode: false,
1717

‎config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,4 @@
11
{
22
"folders": {},
3-
"connections": {
4-
"sqlite_xerial-sample-database": {
5-
"provider": "generic",
6-
"driver": "sqlite_jdbc",
7-
"name": "SQLite - Chinook (Sample)",
8-
"save-password": true,
9-
"navigator-show-only-entities": false,
10-
"navigator-hide-folders": false,
11-
"read-only": false,
12-
"template": false,
13-
"configuration": {
14-
"database": "${application.path}/../samples/db/Chinook.sqlitedb",
15-
"type": "dev",
16-
"auth-model": "native"
17-
}
18-
},
19-
"postgresql-template-1": {
20-
"provider": "postgresql",
21-
"driver": "postgres-jdbc",
22-
"name": "PostgreSQL (Template)",
23-
"save-password": false,
24-
"show-system-objects": false,
25-
"read-only": true,
26-
"template": true,
27-
"configuration": {
28-
"host": "localhost",
29-
"port": "5432",
30-
"database": "postgres",
31-
"url": "jdbc:postgresql://localhost:5432/postgres",
32-
"type": "dev",
33-
"provider-properties": {
34-
"@dbeaver-show-non-default-db@": "false"
35-
}
36-
}
37-
}
38-
}
3+
"connections": {}
394
}

‎config/sample-databases/SQLiteConfiguration/cloudbeaver.conf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
contentRoot: "web",
77
driversLocation: "drivers",
88

9-
rootURI: "/",
9+
rootURI: "/sql_query",
1010
serviceURI: "/api/",
1111

1212
productConfiguration: "conf/product.conf",
1313

14-
expireSessionAfterPeriod: 1800000,
14+
expireSessionAfterPeriod: 43200000,
1515

1616
develMode: false,
1717

@@ -60,6 +60,7 @@
6060
],
6161

6262
disabledDrivers: [
63+
"sqlite:sqlite_jdbc",
6364
"h2:h2_embedded",
6465
"clickhouse:yandex_clickhouse"
6566
]

‎deploy/build.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@ cd ../..
2121
#[ ! -d react-data-grid ] && git clone https://github.com/dbeaver/react-data-grid.git
2222

2323
echo "Pull dbeaver platform"
24-
[ ! -d dbeaver ] && git clone https://github.com/dbeaver/dbeaver.git
24+
[ ! -d dbeaver ] && git clone --depth 1 https://github.com/actiontech/dbeaver.git -b sqle_22_2_0
2525

2626
cd cloudbeaver/deploy
2727

2828
echo "Build CloudBeaver server"
2929

3030
cd ../server/product/aggregate
31-
mvn clean verify -Dheadless-platform
31+
#mvn clean verify -Dheadless-platform
32+
33+
# 加速编译
34+
mvn -T 1C -U -e verify -Dheadless-platform -Dmaven.compile.fork=true -Dmaven.test.skip=true
35+
3236
if [[ "$?" -ne 0 ]] ; then
3337
echo 'Could not perform package'; exit $rc
3438
fi

‎deploy/docker/make-docker-container.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cd ..
2-
docker build -t dbeaver/cloudbeaver:dev . --file ./docker/Dockerfile
2+
docker build -t actiontech/sqle-cloudbeaver:22_2_0 . --file ./docker/Dockerfile
33

‎deploy/docker/run-docker-container.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Detect host machine IP Address (we need this when run in docker container)
22
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)
33

4-
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
4+
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
55

‎server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<plugin>
33
<!-- Resource mappings -->
44
<extension point="org.jkiss.dbeaver.resources">
5+
<resource name="drivers/oceanbase"/>
6+
<resource name="drivers/tidb"/>
57
<resource name="drivers/db2"/>
68
<resource name="drivers/db2-jt400"/>
79
<resource name="drivers/mysql/mysql8"/>
@@ -20,6 +22,8 @@
2022

2123
<!-- Bundles -->
2224
<extension point="org.jkiss.dbeaver.product.bundles">
25+
<bundle id="drivers.oceanbase" label="OceanBase drivers"/>
26+
<bundle id="drivers.tidb" label="TiDB drivers"/>
2327
<bundle id="drivers.db2" label="DB2 drivers"/>
2428
<bundle id="drivers.jt400" label="DB2 iSeries drivers"/>
2529
<bundle id="drivers.mysql" label="MySQL drivers"/>
@@ -38,6 +42,8 @@
3842

3943
<!-- Enabled drivers -->
4044
<extension point="io.cloudbeaver.driver">
45+
<driver id="oceanbase:alipay_oceanbase"/>
46+
<driver id="mysql:tidb"/>
4147
<driver id="db2:db2"/>
4248
<driver id="db2_i:db2_iseries"/>
4349
<driver id="mysql:mysql8"/>

‎server/drivers/oceanbase/pom.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>drivers.oceanbase</artifactId>
5+
<version>1.0.0</version>
6+
<parent>
7+
<groupId>io.cloudbeaver</groupId>
8+
<artifactId>drivers</artifactId>
9+
<version>1.0.0</version>
10+
<relativePath>../</relativePath>
11+
</parent>
12+
13+
<properties>
14+
<deps.output.dir>oceanbase</deps.output.dir>
15+
</properties>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>mysql</groupId>
20+
<artifactId>mysql-connector-java</artifactId>
21+
<version>5.1.44</version>
22+
</dependency>
23+
</dependencies>
24+
25+
</project>

0 commit comments

Comments
 (0)