This is an automated cherry-pick of #16135

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · Jan 25, 2024 · 5711f7d · 5711f7d
1 parent 13d5090
commit 5711f7d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/develop/dev-guide-sample-application-nodejs-prisma.md b/develop/dev-guide-sample-application-nodejs-prisma.md
@@ -90,7 +90,11 @@ npm install prisma typescript ts-node @types/node --save-dev
 6. 编辑 `.env` 文件，按照如下格式设置环境变量 `DATABASE_URL`，将占位符 `{}` 替换为从连接对话框中复制的参数值：
 
     ```dotenv
+<<<<<<< HEAD
     DATABASE_URL=mysql://{user}:{password}@{host}:4000/test?sslaccept=strict
+=======
+    DATABASE_URL='{connection_string}'
+>>>>>>> e21a5a285b (Update dev-guide-sample-application-nodejs-prisma.md (#16135))
     ```
 
     > **Note**
@@ -126,7 +130,7 @@ npm install prisma typescript ts-node @types/node --save-dev
 5. 编辑 `.env` 文件，按照如下格式设置环境变量 `DATABASE_URL`，将占位符 `{}` 替换为从连接对话框中复制的参数值：
 
     ```dotenv
-    DATABASE_URL=mysql://{host}:{password}@{host}:4000/test?sslaccept=strict&sslcert={downloaded_ssl_ca_path}
+    DATABASE_URL='mysql://{user}:{password}@{host}:4000/test?sslaccept=strict&sslcert={downloaded_ssl_ca_path}'
     ```
 
    > **Note**
@@ -158,7 +162,7 @@ npm install prisma typescript ts-node @types/node --save-dev
 2. 编辑 `.env` 文件，按照如下格式设置连接信息，将占位符 `{}` 替换为你的 TiDB 集群的连接参数值：
 
     ```dotenv
-    DATABASE_URL=mysql://{user}:{password}@{host}:4000/test
+    DATABASE_URL='mysql://{user}:{password}@{host}:4000/test'
     ```
 
    如果你在本地运行 TiDB 集群，默认的 Host 是 `127.0.0.1`, 默认用户名为 `root`, 密码为空。