From e86049c06f13fa387c927f378cb09a35e1c7a3cd Mon Sep 17 00:00:00 2001
From: Rizky <rizky@avolut.com>
Date: Wed, 17 Jul 2024 11:58:16 +0700
Subject: [PATCH] fix

---
 bun.lockb           | Bin 117484 -> 117484 bytes
 pkgs/api/_deploy.ts |  12 +++++++++---
 pkgs/prod.ts        |   2 +-
 pkgs/utils/query.ts |   3 +--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index a57698711d7311e238556107acd5e380cdd878d5..5ac24eeaaf22aec276577147d88ce29480e6b296 100755
GIT binary patch
delta 154
zcmV;L0A>H|l?UvV2aqlx2s9CXPX{W(moGz7&(t$vGi2aVzXCps0Ok%pZlTbbu}(%{
z0TGkI6ECyGVA*^@H*06erm{~)U+!V!z)XblA-fj@=3FtwXHlm%6e-e@R5`mYdR`f4
zRq%e`7?Q4LM2Ld?sx8t>bhKcfES~fy0+YcL7LpVMv-sVhVg&#H|Npm~KmoCd12--(
Imr%+9oH&<7S^xk5

delta 154
zcmV;L0A>H|l?UvV2aqlx;^$IOc)(HR-p{G&FZw8MMZdr$wAw7ymAlmN5nUTeu}(%{
z0T7ds6)&^IVA*^@`&nj^6n%hooJ=lgf*H1Cs#cafmUlPW%q3+kr50UTupKA)+7C5p
zpDJ&nrsNwm+nj-mx^6C=>PWFKlG+rv0+YcL7LpVMv-sVhVgvyI006g~KmoCd12!%)
Imr%+9oR76d>Hq)$

diff --git a/pkgs/api/_deploy.ts b/pkgs/api/_deploy.ts
index 0caa466..0d959a3 100644
--- a/pkgs/api/_deploy.ts
+++ b/pkgs/api/_deploy.ts
@@ -1,6 +1,11 @@
 import { $ } from "execa";
 import * as fs from "fs";
-import { dirAsync, readAsync, removeAsync, writeAsync } from "fs-jetpack";
+import {
+  dirAsync,
+  readAsync,
+  removeAsync,
+  writeAsync
+} from "fs-jetpack";
 import { apiContext } from "service-srv";
 import { deploy } from "utils/deploy";
 import { dir } from "utils/dir";
@@ -74,6 +79,7 @@ export const _ = {
             DATABASE_URL: action.url,
           });
           await Bun.write(dir(".env"), env);
+          await Bun.write(dir("app/db/.env"), env);
         }
         return "ok";
       case "db-gen":
@@ -88,7 +94,7 @@ export const _ = {
         break;
       case "db-pull":
         {
-          const env = await readAsync(dir("app/db/.env"));
+          let env = await readAsync(dir("app/db/.env"));
           if (env) {
             const ENV = parseEnv(env);
             if (typeof ENV.DATABASE_URL === "string") {
@@ -110,7 +116,7 @@ export const _ = {
                 try {
                   await Bun.write(
                     dir("app/db/.env"),
-                    `DATABASE_URL=${process.env.DATABASE_URL}`
+                    `DATABASE_URL=${ENV.DATABASE_URL}`
                   );
                   await $({ cwd: dir("app/db") })`bun install`;
                   await $({ cwd: dir("app/db") })`bun prisma db pull --force`;
diff --git a/pkgs/prod.ts b/pkgs/prod.ts
index 32aeaff..e17e876 100644
--- a/pkgs/prod.ts
+++ b/pkgs/prod.ts
@@ -36,7 +36,7 @@ const main = {
 console.log("Process Manager running at port:", port);
 
 if (process.env.DATABASE_URL) {
-  if (!(await existsAsync(dir("node_modules/.prisma")))) {
+  if (!(await existsAsync(dir("node_modules/.prisma"))) && process.env.DATABASE_URL) {
     try {
       await Bun.write(
         dir("app/db/.env"),
diff --git a/pkgs/utils/query.ts b/pkgs/utils/query.ts
index 2391081..91eee7b 100644
--- a/pkgs/utils/query.ts
+++ b/pkgs/utils/query.ts
@@ -1,7 +1,5 @@
 import { Property, createPrismaSchemaBuilder } from "@mrleebo/prisma-ast";
 import { readAsync } from "fs-jetpack";
-//@ts-ignore
-import { Prisma } from "../../app/db/db";
 import { dir } from "./dir";
 import { gunzipAsync } from "./gzip";
 
@@ -319,6 +317,7 @@ export const execQuery = async (args: DBArg, prisma: any) => {
 
       if (Array.isArray(json)) {
         const q = json.shift();
+        const Prisma = (await import("../../app/db/db")).Prisma;
         return await tableInstance.bind(prisma)(Prisma.sql(q, ...json));
       }