From efe56340f75d60f3f216392dbab842213a3eda2c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 27 Dec 2025 13:43:25 +0000
Subject: [PATCH] fix: merge DBAL refactor and update import paths

- Merged main branch with DBAL restructure (ts -> development, cpp -> production)
- Updated initialize-dbal.server.ts imports to use @/dbal path alias
- Fixed dbal-stub import path to @/lib/dbal/dbal-stub
- Updated core/dbal-client index.ts to use correct relative path (../../dbal-client)
- Resolved merge conflicts from DBAL refactor
- Frontend now supports both development (TypeScript) and production (C++ daemon) DBAL

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
---
 .../lib/dbal/database-dbal/core/initialize-dbal.server.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontends/nextjs/src/lib/dbal/database-dbal/core/initialize-dbal.server.ts b/frontends/nextjs/src/lib/dbal/database-dbal/core/initialize-dbal.server.ts
index b51563210..2b29a625c 100644
--- a/frontends/nextjs/src/lib/dbal/database-dbal/core/initialize-dbal.server.ts
+++ b/frontends/nextjs/src/lib/dbal/database-dbal/core/initialize-dbal.server.ts
@@ -1,9 +1,9 @@
 import 'server-only'
 
-import { DBALClient as StubDBALClient } from '@/lib/dbal-stub'
-import type { DBALConfig as StubDBALConfig } from '@/lib/dbal-stub'
-import { DBALClient as RealDBALClient } from '@/dbal/development/src'
-import type { DBALConfig as RealDBALConfig } from '@/dbal/development/src/runtime/config'
+import { DBALClient as StubDBALClient } from '@/lib/dbal/dbal-stub'
+import type { DBALConfig as StubDBALConfig } from '@/lib/dbal/dbal-stub'
+import { DBALClient as RealDBALClient } from '@/dbal'
+import type { DBALConfig as RealDBALConfig } from '@/dbal/runtime/config'
 import { dbalState } from './dbal-state.server'
 
 /**