From fb7ae37aec3b9ee3710301309dfb2746e990e5ab Mon Sep 17 00:00:00 2001 From: Mini256 Date: Mon, 20 Nov 2023 14:28:11 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #15187 Signed-off-by: ti-chi-bot --- develop/dev-guide-third-party-support.md | 31 +++++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/develop/dev-guide-third-party-support.md b/develop/dev-guide-third-party-support.md index 6f1d2e1d36dbd..36e9757bef5db 100644 --- a/develop/dev-guide-third-party-support.md +++ b/develop/dev-guide-third-party-support.md @@ -140,30 +140,41 @@ If you encounter problems when connecting to TiDB using the tools listed in this v7.0 Full N/A - N/A + Connect to TiDB with Rails Framework and ActiveRecord ORM - JavaScript / TypeScript - sequelize + JavaScript / TypeScript + Sequelize v6.20.1 Full N/A - N/A + Connect to TiDB with Sequelize - Prisma Client + Prisma 4.16.2 Full N/A + Connect to TiDB with Prisma + + + TypeORM + v0.3.17 + Full N/A + Connect to TiDB with TypeORM Python Django - v4.1 + v4.2 Full django-tidb +<<<<<<< HEAD Connect to TiDB with Django +======= + Connect to TiDB with Django +>>>>>>> ab6d71034f (develop: update the third party support table (#15187)) SQLAlchemy @@ -177,6 +188,8 @@ If you encounter problems when connecting to TiDB using the tools listed in this ## GUI -| GUI | Latest tested version | Support level | Tutorial | -| - | - | - | - | -| [DBeaver](https://dbeaver.io/) | 23.0.3 | Full | [Connect to TiDB with DBeaver](/develop/dev-guide-gui-dbeaver.md) | +| GUI | Latest tested version | Support level | Tutorial | +|-----------------------------------------------------------|-----------------------|---------------|-------------------------------------------------------------------------------| +| [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) | 2023.2.1 | Full | [Connect to TiDB with JetBrains DataGrip](/develop/dev-guide-gui-datagrip.md) | +| [DBeaver](https://dbeaver.io/) | 23.0.3 | Full | [Connect to TiDB with DBeaver](/develop/dev-guide-gui-dbeaver.md) | +| [Visual Studio Code](https://code.visualstudio.com/) | 1.72.0 | Full | [Connect to TiDB with Visual Studio Code](/develop/dev-guide-gui-vscode-sqltools.md) | From c9dfbf69bac49a458aa7a2de9f48f31beaa0079f Mon Sep 17 00:00:00 2001 From: Aolin Date: Mon, 20 Nov 2023 17:55:59 +0800 Subject: [PATCH 2/2] resolve conflicts --- develop/dev-guide-third-party-support.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/develop/dev-guide-third-party-support.md b/develop/dev-guide-third-party-support.md index 36e9757bef5db..cc6157893ce61 100644 --- a/develop/dev-guide-third-party-support.md +++ b/develop/dev-guide-third-party-support.md @@ -170,11 +170,7 @@ If you encounter problems when connecting to TiDB using the tools listed in this v4.2 Full django-tidb -<<<<<<< HEAD - Connect to TiDB with Django -======= Connect to TiDB with Django ->>>>>>> ab6d71034f (develop: update the third party support table (#15187)) SQLAlchemy