From d905d7123e496bee83be1353c4827021a1970a6f Mon Sep 17 00:00:00 2001 From: cyberslack_lee Date: Wed, 24 Jan 2024 13:04:50 +0800 Subject: [PATCH 1/4] This is an automated cherry-pick of #16074 Signed-off-by: ti-chi-bot --- develop/dev-guide-third-party-support.md | 31 +++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/develop/dev-guide-third-party-support.md b/develop/dev-guide-third-party-support.md index 4e0b13d804d9..4628b26865bc 100644 --- a/develop/dev-guide-third-party-support.md +++ b/develop/dev-guide-third-party-support.md @@ -139,30 +139,41 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： v7.0 Full N/A - N/A + 使用 Rails 框架和 ActiveRecord ORM 连接到 TiDB - JavaScript / TypeScript - sequelize + JavaScript / TypeScript + Sequelize v6.20.1 Full N/A N/A - Prisma Client + Prisma 4.16.2 Full N/A + 使用 Prisma 连接到 TiDB + + + TypeORM + v0.3.17 + Full N/A + 使用 TypeORM 连接到 TiDB Python Django - v4.1 + v4.2 Full django-tidb +<<<<<<< HEAD 使用 Django 连接到 TiDB +======= + 使用 Django 连接到 TiDB +>>>>>>> a2500d18a0 (develop: update the third party support table (#16074)) SQLAlchemy @@ -176,6 +187,14 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： ## GUI +<<<<<<< HEAD | GUI | 最新已测试版本 | 支持等级 | 教程 | | - | - | - | - | -| [DBeaver](https://dbeaver.io/) | 23.0.1 | Full | N/A | \ No newline at end of file +| [DBeaver](https://dbeaver.io/) | 23.0.1 | Full | N/A | +======= +| GUI | 最新已测试版本 | 支持等级 | 教程 | +|-----------------------------------------------------------|-----------------------|---------------|-----| +| [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) | 2023.2.1 | Full | N/A | +| [DBeaver](https://dbeaver.io/) | 23.0.3 | Full | N/A | +| [Visual Studio Code](https://code.visualstudio.com/) | 1.72.0 | Full | N/A | +>>>>>>> a2500d18a0 (develop: update the third party support table (#16074)) From 8324008efd3f544bfd22f888a069f45919040517 Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 24 Jan 2024 13:24:01 +0800 Subject: [PATCH 2/4] resolve conflicts --- develop/dev-guide-third-party-support.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/develop/dev-guide-third-party-support.md b/develop/dev-guide-third-party-support.md index 4628b26865bc..caf4372b08d0 100644 --- a/develop/dev-guide-third-party-support.md +++ b/develop/dev-guide-third-party-support.md @@ -169,11 +169,7 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： v4.2 Full django-tidb -<<<<<<< HEAD - 使用 Django 连接到 TiDB -======= - 使用 Django 连接到 TiDB ->>>>>>> a2500d18a0 (develop: update the third party support table (#16074)) + 使用 Django 连接到 TiDB SQLAlchemy @@ -187,14 +183,9 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： ## GUI -<<<<<<< HEAD -| GUI | 最新已测试版本 | 支持等级 | 教程 | -| - | - | - | - | -| [DBeaver](https://dbeaver.io/) | 23.0.1 | Full | N/A | -======= + | GUI | 最新已测试版本 | 支持等级 | 教程 | |-----------------------------------------------------------|-----------------------|---------------|-----| | [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) | 2023.2.1 | Full | N/A | | [DBeaver](https://dbeaver.io/) | 23.0.3 | Full | N/A | | [Visual Studio Code](https://code.visualstudio.com/) | 1.72.0 | Full | N/A | ->>>>>>> a2500d18a0 (develop: update the third party support table (#16074)) From 4a6d3e4b2d3471586c7e41b6f7d154f96158327d Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 24 Jan 2024 13:25:17 +0800 Subject: [PATCH 3/4] bump version --- develop/dev-guide-third-party-support.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/develop/dev-guide-third-party-support.md b/develop/dev-guide-third-party-support.md index caf4372b08d0..264b96ab0b6a 100644 --- a/develop/dev-guide-third-party-support.md +++ b/develop/dev-guide-third-party-support.md @@ -139,7 +139,7 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： v7.0 Full N/A - 使用 Rails 框架和 ActiveRecord ORM 连接到 TiDB + 使用 Rails 框架和 ActiveRecord ORM 连接到 TiDB JavaScript / TypeScript @@ -154,14 +154,14 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： 4.16.2 Full N/A - 使用 Prisma 连接到 TiDB + 使用 Prisma 连接到 TiDB TypeORM v0.3.17 Full N/A - 使用 TypeORM 连接到 TiDB + 使用 TypeORM 连接到 TiDB Python From aabdef14ad838325724b4dc58c585fd9d3c8c235 Mon Sep 17 00:00:00 2001 From: Aolin Date: Wed, 24 Jan 2024 13:26:32 +0800 Subject: [PATCH 4/4] Apply suggestions from code review --- develop/dev-guide-third-party-support.md | 1 - 1 file changed, 1 deletion(-) diff --git a/develop/dev-guide-third-party-support.md b/develop/dev-guide-third-party-support.md index 264b96ab0b6a..58143bdfae7e 100644 --- a/develop/dev-guide-third-party-support.md +++ b/develop/dev-guide-third-party-support.md @@ -183,7 +183,6 @@ PingCAP 与开源社区合作，通过三方工具提供以下支持： ## GUI - | GUI | 最新已测试版本 | 支持等级 | 教程 | |-----------------------------------------------------------|-----------------------|---------------|-----| | [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) | 2023.2.1 | Full | N/A |