From 8120222817edab86617306838dd208e761d02f02 Mon Sep 17 00:00:00 2001
From: Aman Varshney <amanvarshney.work@gmail.com>
Date: Thu, 10 Apr 2025 11:39:55 +0530
Subject: [PATCH] Replace postgres package with pg for PostgreSQL support with
 drizzle

---
 .changeset/loose-beers-wink.md                              | 5 +++++
 apps/cli/src/constants.ts                                   | 3 ++-
 apps/cli/src/helpers/db-setup.ts                            | 4 ++--
 .../with-drizzle-postgres/apps/server/src/db/index.ts       | 6 ++----
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/loose-beers-wink.md

diff --git a/.changeset/loose-beers-wink.md b/.changeset/loose-beers-wink.md
new file mode 100644
index 0000000..b62c116
--- /dev/null
+++ b/.changeset/loose-beers-wink.md
@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": patch
+---
+
+Replace postgres package with pg for PostgreSQL support with drizzle
diff --git a/apps/cli/src/constants.ts b/apps/cli/src/constants.ts
index 5ad167a..12d8835 100644
--- a/apps/cli/src/constants.ts
+++ b/apps/cli/src/constants.ts
@@ -31,7 +31,8 @@ export const dependencyVersionMap = {
 	"drizzle-kit": "^0.30.5",
 
 	"@libsql/client": "^0.14.0",
-	postgres: "^3.4.5",
+	pg: "^8.14.1",
+	"@types/pg": "^8.11.11",
 
 	mysql2: "^3.14.0",
 
diff --git a/apps/cli/src/helpers/db-setup.ts b/apps/cli/src/helpers/db-setup.ts
index 381e934..8d520cc 100644
--- a/apps/cli/src/helpers/db-setup.ts
+++ b/apps/cli/src/helpers/db-setup.ts
@@ -45,8 +45,8 @@ export async function setupDatabase(
 				});
 			} else if (databaseType === "postgres") {
 				addPackageDependency({
-					dependencies: ["drizzle-orm", "postgres"],
-					devDependencies: ["drizzle-kit"],
+					dependencies: ["drizzle-orm", "pg"],
+					devDependencies: ["drizzle-kit", "@types/pg"],
 					projectDir: serverDir,
 				});
 			} else if (databaseType === "mysql") {
diff --git a/apps/cli/template/with-drizzle-postgres/apps/server/src/db/index.ts b/apps/cli/template/with-drizzle-postgres/apps/server/src/db/index.ts
index e50cfa4..745361c 100644
--- a/apps/cli/template/with-drizzle-postgres/apps/server/src/db/index.ts
+++ b/apps/cli/template/with-drizzle-postgres/apps/server/src/db/index.ts
@@ -1,5 +1,3 @@
-import { drizzle } from "drizzle-orm/postgres-js";
-import postgres from "postgres";
+import { drizzle } from "drizzle-orm/node-postgres";
 
-const queryClient = postgres(process.env.DATABASE_URL || "");
-export const db = drizzle({ client: queryClient });
+export const db = drizzle(process.env.DATABASE_URL || "");