procbay-schema 1.0.165 → 1.0.169

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "procbay-schema",
-  "version": "1.0.165",
+  "version": "1.0.169",
   "description": "A set of utilities for managing Prisma database schemas, seeding, and maintenance operations for the Procure-to-Pay system",
   "main": "src/prisma/index.js",
   "type": "module",

package/prisma/migrations/20260515094455_created_approval_management_table_for_approval_flow/migration.sql

@@ -0,0 +1,55 @@
+/*
+  Warnings:
+
+  - You are about to drop the `user_approval_management` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- CreateEnum
+CREATE TYPE "ApprovalManagementStatusEnum" AS ENUM ('PENDING', 'APPROVED', 'REJECTED');
+
+-- DropForeignKey
+ALTER TABLE "user_approval_management" DROP CONSTRAINT "user_approval_management_user_id_fkey";
+
+-- DropTable
+DROP TABLE "user_approval_management";
+
+-- DropEnum
+DROP TYPE "UserApprovalManagementStatusEnum";
+
+-- CreateTable
+CREATE TABLE "approval_management" (
+    "id" SERIAL NOT NULL,
+    "uuid" TEXT NOT NULL,
+    "journy_type" TEXT,
+    "journey_task" TEXT,
+    "parent_id" TEXT,
+    "user_id" INTEGER,
+    "proposed_payload" JSONB,
+    "previous_snapshot" JSONB,
+    "estimated_budget" DECIMAL(18,2),
+    "batch_id" TEXT,
+    "request_status" "ApprovalManagementStatusEnum" NOT NULL DEFAULT 'PENDING',
+    "reject_reason" TEXT,
+    "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "created_by" INTEGER,
+
+    CONSTRAINT "approval_management_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "approval_management_uuid_key" ON "approval_management"("uuid");
+
+-- CreateIndex
+CREATE INDEX "approval_management_parent_id_idx" ON "approval_management"("parent_id");
+
+-- CreateIndex
+CREATE INDEX "approval_management_journy_type_journey_task_idx" ON "approval_management"("journy_type", "journey_task");
+
+-- CreateIndex
+CREATE INDEX "approval_management_batch_id_idx" ON "approval_management"("batch_id");
+
+-- CreateIndex
+CREATE INDEX "approval_management_request_status_idx" ON "approval_management"("request_status");
+
+-- AddForeignKey
+ALTER TABLE "approval_management" ADD CONSTRAINT "approval_management_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/migrations/20260515130204_updated_user_approval_management_schema/migration.sql

@@ -0,0 +1,55 @@
+/*
+  Warnings:
+
+  - You are about to drop the `user_approval_management` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- CreateEnum
+CREATE TYPE "ApprovalManagementStatusEnum" AS ENUM ('PENDING', 'APPROVED', 'REJECTED');
+
+-- DropForeignKey
+ALTER TABLE "user_approval_management" DROP CONSTRAINT "user_approval_management_user_id_fkey";
+
+-- DropTable
+DROP TABLE "user_approval_management";
+
+-- DropEnum
+DROP TYPE "UserApprovalManagementStatusEnum";
+
+-- CreateTable
+CREATE TABLE "approval_management" (
+    "id" SERIAL NOT NULL,
+    "uuid" TEXT NOT NULL,
+    "journy_type" TEXT,
+    "journey_task" TEXT,
+    "parent_id" TEXT,
+    "user_id" INTEGER,
+    "proposed_payload" JSONB,
+    "previous_snapshot" JSONB,
+    "estimated_budget" DECIMAL(18,2),
+    "batch_id" TEXT,
+    "request_status" "ApprovalManagementStatusEnum" NOT NULL DEFAULT 'PENDING',
+    "reject_reason" TEXT,
+    "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "created_by" INTEGER,
+
+    CONSTRAINT "approval_management_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "approval_management_uuid_key" ON "approval_management"("uuid");
+
+-- CreateIndex
+CREATE INDEX "approval_management_parent_id_idx" ON "approval_management"("parent_id");
+
+-- CreateIndex
+CREATE INDEX "approval_management_journy_type_journey_task_idx" ON "approval_management"("journy_type", "journey_task");
+
+-- CreateIndex
+CREATE INDEX "approval_management_batch_id_idx" ON "approval_management"("batch_id");
+
+-- CreateIndex
+CREATE INDEX "approval_management_request_status_idx" ON "approval_management"("request_status");
+
+-- AddForeignKey
+ALTER TABLE "approval_management" ADD CONSTRAINT "approval_management_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/prisma/schema.prisma

@@ -123,7 +123,7 @@ model User {
   message_recipients               MessageRecipient[]            @relation("MessageRecipientUser")
   blanket_po                       BlanketPurchaseOrder[]
   purchase_intake_initiated_by     PurchaseIntake[]              @relation("purchase_intake_initiated_by")
-  user_approval_managements        UserApprovalManagement[]
+  approval_management              ApprovalManagement[]
 
   @@map("users")
 }
@@ -319,30 +319,30 @@ model Industry {
 
 //---------------------------------- CATEGORY MODEL START ----------------------------------
 model Category {
-  id                Int              @id @default(autoincrement())
-  uuid              String?          @unique @default(uuid())
-  industry_id       Int?
-  industry          Industry?        @relation(fields: [industry_id], references: [id])
-  name              String?          @unique
-  slug              String?
-  is_active         Boolean          @default(true)
-  parent_id         Int              @default(0)
-  description       String?
-  image_url         String?
-  created_by        Int?
-  created_at        DateTime         @default(now()) @db.Timestamptz(6)
-  updated_by        Int?
-  updated_at        DateTime         @updatedAt @db.Timestamptz(6)
-  is_deleted        Boolean          @default(false)
-  deleted_by        Int?
-  deleted_at        DateTime?        @db.Timestamptz(6)
-  attributes        Attribute[]
-  category_uom      UomCategory[]
-  category_budget   CategoryBudget[]
-  item_category     Item[]           @relation("ItemCategory")
-  item_sub_category Item[]           @relation("ItemSubCategory")
-  boq_event_items_as_category    BoqEventItem[] @relation("CategoryBoqEventItemAsCategory")
-  boq_event_items_as_sub_category BoqEventItem[] @relation("SubCategoryBoqEventItemAsSubCategory")
+  id                              Int              @id @default(autoincrement())
+  uuid                            String?          @unique @default(uuid())
+  industry_id                     Int?
+  industry                        Industry?        @relation(fields: [industry_id], references: [id])
+  name                            String?          @unique
+  slug                            String?
+  is_active                       Boolean          @default(true)
+  parent_id                       Int              @default(0)
+  description                     String?
+  image_url                       String?
+  created_by                      Int?
+  created_at                      DateTime         @default(now()) @db.Timestamptz(6)
+  updated_by                      Int?
+  updated_at                      DateTime         @updatedAt @db.Timestamptz(6)
+  is_deleted                      Boolean          @default(false)
+  deleted_by                      Int?
+  deleted_at                      DateTime?        @db.Timestamptz(6)
+  attributes                      Attribute[]
+  category_uom                    UomCategory[]
+  category_budget                 CategoryBudget[]
+  item_category                   Item[]           @relation("ItemCategory")
+  item_sub_category               Item[]           @relation("ItemSubCategory")
+  boq_event_items_as_category     BoqEventItem[]   @relation("CategoryBoqEventItemAsCategory")
+  boq_event_items_as_sub_category BoqEventItem[]   @relation("SubCategoryBoqEventItemAsSubCategory")
 
   @@map("categories")
 }
@@ -670,7 +670,7 @@ model EmailTemplate {
   subject       String?
   html_content  String?
   macro         String?
-  module_name   String?   
+  module_name   String?
   is_active     Boolean?  @default(true)
   is_deleted    Boolean?  @default(false)
   created_at    DateTime? @default(now()) @db.Timestamptz(6)
@@ -1366,46 +1366,45 @@ model EventItems {
 //---------------------------------- BOQ EVENT ITEMS MODEL START ------------------------------------------------
 /// BOQ lines for events without item-master linkage (free-text / JSON fields), parallel to Sourcebay-style event items.
 model BoqEventItem {
-  id             Int       @id @default(autoincrement())
-  uuid           String?   @unique @default(uuid())
-  category_id    Int?
-  category       Category? @relation("CategoryBoqEventItemAsCategory",fields: [category_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
-  sub_category_id Int?
-  sub_category    Category? @relation("SubCategoryBoqEventItemAsSubCategory",fields: [sub_category_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
-  event_id       Int?
-  event          Event?    @relation(fields: [event_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
-  part_name      String?
-  description    String?   @db.Text
-  part_no        String?
-  quantity       Decimal?  @db.Decimal(18, 4)
-  uom            String?
-  dynamic_fields Json?
-  version        Int       @default(1)
+  id                Int           @id @default(autoincrement())
+  uuid              String?       @unique @default(uuid())
+  category_id       Int?
+  category          Category?     @relation("CategoryBoqEventItemAsCategory", fields: [category_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  sub_category_id   Int?
+  sub_category      Category?     @relation("SubCategoryBoqEventItemAsSubCategory", fields: [sub_category_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  event_id          Int?
+  event             Event?        @relation(fields: [event_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  part_name         String?
+  description       String?       @db.Text
+  part_no           String?
+  quantity          Decimal?      @db.Decimal(18, 4)
+  uom               String?
+  dynamic_fields    Json?
+  version           Int           @default(1)
   parent_version_id Int?
-  parent_version BoqEventItem? @relation("BoqEventItemVersionRelation",fields: [parent_version_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
-  sort_order     Int       @default(0)
-  is_active      Boolean?  @default(true)
-  created_at     DateTime? @default(now()) @db.Timestamptz(6)
-  created_by     Int?
-  updated_at     DateTime? @updatedAt @db.Timestamptz(6)
-  updated_by     Int?
-  is_deleted     Boolean?  @default(false)
-  deleted_at     DateTime? @db.Timestamptz(6)
-  deleted_by     Int?
-
-  bids           Bid[]
-  bid_logs       BidLog[]
-  quotations     Quotation[]
-  quotation_logs QuotationLog[]
+  parent_version    BoqEventItem? @relation("BoqEventItemVersionRelation", fields: [parent_version_id], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  sort_order        Int           @default(0)
+  is_active         Boolean?      @default(true)
+  created_at        DateTime?     @default(now()) @db.Timestamptz(6)
+  created_by        Int?
+  updated_at        DateTime?     @updatedAt @db.Timestamptz(6)
+  updated_by        Int?
+  is_deleted        Boolean?      @default(false)
+  deleted_at        DateTime?     @db.Timestamptz(6)
+  deleted_by        Int?
+
+  bids                 Bid[]
+  bid_logs             BidLog[]
+  quotations           Quotation[]
+  quotation_logs       QuotationLog[]
   purchase_order_items PurchaseOrderItem[]
-  boq_event_items BoqEventItem[] @relation("BoqEventItemVersionRelation")
+  boq_event_items      BoqEventItem[]      @relation("BoqEventItemVersionRelation")
 
   @@index([event_id])
   @@map("boq_event_items")
 }
 
 //---------------------------------- BOQ EVENT ITEMS MODEL END ------------------------------------------------
- 
 
 //---------------------------------- VENDOR EVENTS MODEL START ------------------------------------------------
 
@@ -1802,28 +1801,28 @@ enum BidStatus {
 }
 
 model Bid {
-  id              Int           @id @default(autoincrement())
-  uuid            String?       @unique @default(uuid())
-  event_id        Int?
-  event           Event?        @relation(fields: [event_id], references: [id], onDelete: Cascade)
-  event_item_id   Int?
-  event_item      EventItems?   @relation(fields: [event_item_id], references: [id], onDelete: Cascade)
+  id                Int           @id @default(autoincrement())
+  uuid              String?       @unique @default(uuid())
+  event_id          Int?
+  event             Event?        @relation(fields: [event_id], references: [id], onDelete: Cascade)
+  event_item_id     Int?
+  event_item        EventItems?   @relation(fields: [event_item_id], references: [id], onDelete: Cascade)
   boq_event_item_id Int?
-  boq_event_item   BoqEventItem? @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
-  event_type      EventType?
-  event_vendor_id Int?
-  event_vendor    EventVendors? @relation(fields: [event_vendor_id], references: [id], onDelete: Cascade)
-  bid_log_id      Int? // Reference to BidLog for detailed bid history
-  bid_log         BidLog?       @relation(fields: [bid_log_id], references: [id], onDelete: Cascade)
-  bid_amount      Float?
-  version         Int           @default(0) // For optimistic locking
-  created_at      DateTime      @default(now()) @db.Timestamptz(6)
-  created_by      Int?
-  updated_at      DateTime      @updatedAt @db.Timestamptz(6)
-  updated_by      Int?
-  is_deleted      Boolean       @default(false)
-  deleted_at      DateTime?     @db.Timestamptz(6)
-  deleted_by      Int?
+  boq_event_item    BoqEventItem? @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
+  event_type        EventType?
+  event_vendor_id   Int?
+  event_vendor      EventVendors? @relation(fields: [event_vendor_id], references: [id], onDelete: Cascade)
+  bid_log_id        Int? // Reference to BidLog for detailed bid history
+  bid_log           BidLog?       @relation(fields: [bid_log_id], references: [id], onDelete: Cascade)
+  bid_amount        Float?
+  version           Int           @default(0) // For optimistic locking
+  created_at        DateTime      @default(now()) @db.Timestamptz(6)
+  created_by        Int?
+  updated_at        DateTime      @updatedAt @db.Timestamptz(6)
+  updated_by        Int?
+  is_deleted        Boolean       @default(false)
+  deleted_at        DateTime?     @db.Timestamptz(6)
+  deleted_by        Int?
 
   @@index([event_id, event_item_id])
   @@index([event_id, boq_event_item_id])
@@ -1841,7 +1840,7 @@ model BidLog {
   event              Event?         @relation(fields: [event_id], references: [id], onDelete: Cascade)
   event_item_id      Int?
   event_item         EventItems?    @relation(fields: [event_item_id], references: [id], onDelete: Cascade)
-  boq_event_item_id Int?
+  boq_event_item_id  Int?
   boq_event_item     BoqEventItem?  @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
   event_type         EventType?
   event_vendor_id    Int?
@@ -1897,7 +1896,7 @@ model Quotation {
   event_item_id     Int?
   event_item        EventItems?     @relation(fields: [event_item_id], references: [id], onDelete: Cascade)
   boq_event_item_id Int?
-  boq_event_item    BoqEventItem?  @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
+  boq_event_item    BoqEventItem?   @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
   event_type        EventType? // Should be RFQ, RFI, or RFP
   event_vendor_id   Int?
   event_vendor      EventVendors?   @relation(fields: [event_vendor_id], references: [id], onDelete: Cascade)
@@ -1935,8 +1934,8 @@ model QuotationLog {
   event              Event?          @relation(fields: [event_id], references: [id], onDelete: Cascade)
   event_item_id      Int?
   event_item         EventItems?     @relation(fields: [event_item_id], references: [id], onDelete: Cascade)
-  boq_event_item_id Int?
-  boq_event_item    BoqEventItem?  @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
+  boq_event_item_id  Int?
+  boq_event_item     BoqEventItem?   @relation(fields: [boq_event_item_id], references: [id], onDelete: Cascade)
   event_type         EventType?
   event_vendor_id    Int?
   event_vendor       EventVendors?   @relation(fields: [event_vendor_id], references: [id], onDelete: Cascade)
@@ -2969,6 +2968,10 @@ model Catalogue {
 enum CatalogueVendorStatusEnum {
   ACTIVE
   INACTIVE
+  BLOCKED
+  SUSPENDED
+  PENDING_FOR_APPROVAL
+  REJECTED_FOR_APPROVAL
 }
 
 model CatalogueVendor {
@@ -3419,7 +3422,7 @@ model BlanketPurchaseOrder {
   terms_conditions          String?
   notes                     String?
   business_entity_id        Int?
-  business_entity           BusinessEntity?               @relation(fields: [business_entity_id], references: [id], onDelete: Cascade)  
+  business_entity           BusinessEntity?               @relation(fields: [business_entity_id], references: [id], onDelete: Cascade)
   created_at                DateTime                      @default(now()) @db.Timestamptz(6)
   created_by                Int?
   user                      User?                         @relation(fields: [created_by], references: [id], onDelete: Cascade)
@@ -3544,12 +3547,12 @@ model GRN {
   uuid String @unique @default(uuid())
 
   // GRN details
-  grn_number                            String?               @unique
+  grn_number                            String?        @unique
   purchase_order_id                     Int?
-  purchase_order                        PurchaseOrder?        @relation(fields: [purchase_order_id], references: [id], onDelete: Cascade)
-  dispatch_date_time                    DateTime?             @db.Timestamptz(6)
-  expected_arrival_date                 DateTime?             @db.Timestamptz(6)
-  received_date_time                    DateTime?             @db.Timestamptz(6)
+  purchase_order                        PurchaseOrder? @relation(fields: [purchase_order_id], references: [id], onDelete: Cascade)
+  dispatch_date_time                    DateTime?      @db.Timestamptz(6)
+  expected_arrival_date                 DateTime?      @db.Timestamptz(6)
+  received_date_time                    DateTime?      @db.Timestamptz(6)
   received_by                           String?
   remarks                               String?
   start_point                           String?
@@ -3563,8 +3566,8 @@ model GRN {
   driver_contact_number                 String?
   e_way_bill_number                     String?
   tracking_link                         String?
-  delivery_challan_documents            Json?                 @db.JsonB
-  grn_status                            GRNStatus             @default(PENDING)
+  delivery_challan_documents            Json?          @db.JsonB
+  grn_status                            GRNStatus      @default(PENDING)
   delivery_challan_number               String?
 
   // inspection details
@@ -3747,24 +3750,24 @@ model Invoice {
 // ------------------------------------ INVOICE ITEM MODEL START  ------------------------------------
 
 model InvoiceItem {
-  id                     Int                       @id @default(autoincrement())
-  uuid                   String                    @unique @default(uuid())
+  id                     Int                   @id @default(autoincrement())
+  uuid                   String                @unique @default(uuid())
   invoice_id             Int?
-  invoice                Invoice?                  @relation(fields: [invoice_id], references: [id], onDelete: Cascade)
+  invoice                Invoice?              @relation(fields: [invoice_id], references: [id], onDelete: Cascade)
   purchase_order_item_id Int?
-  purchase_order_item    PurchaseOrderItem?        @relation(fields: [purchase_order_item_id], references: [id])
-  ordered_quantity       Int?                      @default(0)
-  invoice_quantity       Int?                      @default(0)
+  purchase_order_item    PurchaseOrderItem?    @relation(fields: [purchase_order_item_id], references: [id])
+  ordered_quantity       Int?                  @default(0)
+  invoice_quantity       Int?                  @default(0)
   uom                    String?
-  unit_amount            Decimal                   @default(0) @db.Decimal(15, 2)
-  total_amount           Decimal                   @default(0) @db.Decimal(15, 2)
-  po_quantity            Int?                      @default(0)
-  grn_quantity           Int?                      @default(0)
-  quality_quantity       Int?                      @default(0)
-  matching_status        InvoiceMatchingStatus     @default(MISMATCHED)
+  unit_amount            Decimal               @default(0) @db.Decimal(15, 2)
+  total_amount           Decimal               @default(0) @db.Decimal(15, 2)
+  po_quantity            Int?                  @default(0)
+  grn_quantity           Int?                  @default(0)
+  quality_quantity       Int?                  @default(0)
+  matching_status        InvoiceMatchingStatus @default(MISMATCHED)
   resolution_action      String?
   resolution_remarks     String?
-  resolved_at            DateTime?                 @db.Timestamptz(6)
+  resolved_at            DateTime?             @db.Timestamptz(6)
   resolved_by            Int?
 
   created_at DateTime  @default(now()) @db.Timestamptz(6)
@@ -3783,29 +3786,36 @@ model InvoiceItem {
 
 // ------------------------------------ INVOICE ITEM MODEL END  ------------------------------------
 
-// ------------------------------------ USER APPROVAL MANAGEMENT MODEL START  ---------------------------
+// ------------------------------------ APPROVAL MANAGEMENT MODEL START  --------------------------------
 
-enum UserApprovalManagementStatusEnum {
+enum ApprovalManagementStatusEnum {
   PENDING
   APPROVED
   REJECTED
 }
-model UserApprovalManagement {
-  id                  Int                           @id @default(autoincrement())
-  uuid                String                        @unique @default(uuid())
-  user_id             Int?
-  user                User?                          @relation(fields: [user_id], references: [id], onDelete: Cascade)
-  batch_id            String?
-  task_type           String?
-  proposed_payload    Json?
-  previous_snapshot   Json?
-  request_status      UserApprovalManagementStatusEnum @default(PENDING)
-  reject_reason       String?
-  created_at          DateTime                      @default(now()) @db.Timestamptz(6)
-  created_by          Int?
 
-  @@map("user_approval_management")
-}
+model ApprovalManagement {
+  id                Int                          @id @default(autoincrement())
+  uuid              String                       @unique @default(uuid())
+  journy_type       String? // module e.g. user-management, event-management
+  journey_task      String? // task e.g. user-updation-approval, event-bid-award-approval
+  parent_id         String? // parent entity uuid (user, event, PI, etc.)
+  user_id           Int? // optional when subject is a user
+  user              User?                        @relation(fields: [user_id], references: [id], onDelete: Cascade)
+  proposed_payload  Json?
+  previous_snapshot Json?
+  estimated_budget  Decimal?                     @db.Decimal(18, 2)
+  batch_id          String?
+  request_status    ApprovalManagementStatusEnum @default(PENDING)
+  reject_reason     String?
+  created_at        DateTime                     @default(now()) @db.Timestamptz(6)
+  created_by        Int?
 
-// ------------------------------------ USER APPROVAL MANAGEMENT MODEL END  ---------------------------
+  @@index([parent_id])
+  @@index([journy_type, journey_task])
+  @@index([batch_id])
+  @@index([request_status])
+  @@map("approval_management")
+}
 
+// ------------------------------------ APPROVAL MANAGEMENT MODEL END  ----------------------------------

package/src/create-prisma-client.js

@@ -1,12 +1,42 @@
 import { PrismaPg } from "@prisma/adapter-pg";
-import { PrismaClient } from "./generated/prisma/client.bundle.mjs";
+import { PrismaClient as BasePrismaClient } from "./generated/prisma/client.bundle.mjs";
 
 /**
- * Create a PrismaClient for PostgreSQL (Prisma ORM v7 driver adapter).
- * @param {string} [connectionString] - Defaults to DEFAULT_DATABASE_URL
- * @param {object} [options] - PrismaClient options (log, etc.). Legacy v6 `datasources` / `datasourceUrl` are supported.
+ * Prisma 7 `@prisma/adapter-pg` does not read `?schema=` from the connection URL.
+ * Tenant URLs from microservices include `schema=procbay_schema`; pass it explicitly.
  */
-export function createPrismaClient(connectionString, options = {}) {
+function getPgSchemaFromUrl(urlString) {
+  try {
+    return new URL(urlString).searchParams.get("schema") || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function createPgAdapter(connectionString) {
+  const schema = getPgSchemaFromUrl(connectionString);
+  const pgOptions = schema ? { schema } : undefined;
+
+  /** @type {import('pg').PoolConfig} */
+  const poolConfig = { connectionString };
+  if (schema) {
+    // Adapter `schema` fixes prisma.user.findMany() etc.; $queryRaw uses plain SQL
+    // and still resolves unqualified names via connection search_path (not ?schema= URL).
+    poolConfig.options = `-c search_path=${schema}`;
+  }
+
+  return new PrismaPg(poolConfig, pgOptions);
+}
+
+/**
+ * Normalize PrismaClient constructor args for Prisma ORM v7 (driver adapter).
+ * Strips legacy v6 `datasources` / `datasourceUrl` and builds a `PrismaPg` adapter.
+ *
+ * @param {string|object} [connectionString]
+ * @param {object} [options]
+ * @returns {object} Options accepted by the generated PrismaClient
+ */
+function buildPrismaClientOptions(connectionString, options = {}) {
   if (
     connectionString &&
     typeof connectionString === "object" &&
@@ -17,21 +47,45 @@ export function createPrismaClient(connectionString, options = {}) {
   }
 
   const legacyUrl =
-    options.datasourceUrl ??
-    options.datasources?.db?.url;
-  const { datasources, datasourceUrl, ...prismaOptions } = options;
+    options.datasourceUrl ?? options.datasources?.db?.url;
+  const { datasources, datasourceUrl, adapter, ...prismaOptions } = options;
+
+  if (adapter) {
+    return { adapter, ...prismaOptions };
+  }
 
   const url =
     connectionString ?? legacyUrl ?? process.env.DEFAULT_DATABASE_URL;
 
   if (!url) {
     throw new Error(
-      "Database URL is required. Set DEFAULT_DATABASE_URL or pass a connection string.",
+      "Database URL is required. Set DEFAULT_DATABASE_URL or pass a connection string / datasources.db.url.",
     );
   }
 
-  const adapter = new PrismaPg({ connectionString: url });
-  return new PrismaClient({ adapter, ...prismaOptions });
+  return {
+    adapter: createPgAdapter(url),
+    ...prismaOptions,
+  };
+}
+
+/**
+ * Create a PrismaClient for PostgreSQL (Prisma ORM v7 driver adapter).
+ * @param {string} [connectionString] - Defaults to DEFAULT_DATABASE_URL
+ * @param {object} [options] - PrismaClient options (log, etc.). Legacy v6 `datasources` / `datasourceUrl` are supported.
+ */
+export function createPrismaClient(connectionString, options = {}) {
+  return new BasePrismaClient(
+    buildPrismaClientOptions(connectionString, options),
+  );
 }
 
-export { PrismaClient };
+/**
+ * PrismaClient with backward-compatible v6 constructor options (`datasources`, `datasourceUrl`).
+ * Microservices can keep using `new PrismaClient({ datasources: { db: { url } } })`.
+ */
+export class PrismaClient extends BasePrismaClient {
+  constructor(connectionString, options = {}) {
+    super(buildPrismaClientOptions(connectionString, options));
+  }
+}

package/src/generated/prisma/browser.ts

@@ -568,7 +568,7 @@ export type Invoice = Prisma.InvoiceModel
  */
 export type InvoiceItem = Prisma.InvoiceItemModel
 /**
- * Model UserApprovalManagement
+ * Model ApprovalManagement
  * 
  */
-export type UserApprovalManagement = Prisma.UserApprovalManagementModel
+export type ApprovalManagement = Prisma.ApprovalManagementModel