feat: structure 2

backend/app/database.py

@@ -3,7 +3,7 @@ Database configuration and session management
 """
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
 from sqlalchemy.orm import declarative_base
-from sqlalchemy import event
+from sqlalchemy import event, text
 import logging
 import os
 from pathlib import Path
@@ -17,16 +17,23 @@ db_path = Path(settings.database_url.replace("sqlite+aiosqlite:///", ""))
 db_path.parent.mkdir(parents=True, exist_ok=True)
 
 # Create async engine
-engine = create_async_engine(
-    settings.database_url,
-    echo=False,  # Set to True for SQL debugging
-    pool_size=settings.performance.db_pool_size,
-    pool_recycle=settings.performance.db_pool_recycle,
-    connect_args={
-        "check_same_thread": False,  # SQLite specific
-        "timeout": 30
-    } if "sqlite" in settings.database_url else {}
-)
+# SQLite doesn't support pool configuration
+if "sqlite" in settings.database_url:
+    engine = create_async_engine(
+        settings.database_url,
+        echo=False,  # Set to True for SQL debugging
+        connect_args={
+            "check_same_thread": False,  # SQLite specific
+            "timeout": 30
+        }
+    )
+else:
+    engine = create_async_engine(
+        settings.database_url,
+        echo=False,  # Set to True for SQL debugging
+        pool_size=settings.performance.db_pool_size,
+        pool_recycle=settings.performance.db_pool_recycle
+    )
 
 # Create async session factory
 AsyncSessionLocal = async_sessionmaker(
@@ -57,10 +64,10 @@ async def init_db():
         
         # Enable WAL mode for SQLite (better concurrency)
         if "sqlite" in settings.database_url:
-            await conn.execute("PRAGMA journal_mode=WAL")
-            await conn.execute("PRAGMA synchronous=NORMAL")
-            await conn.execute("PRAGMA cache_size=10000")
-            await conn.execute("PRAGMA temp_store=MEMORY")
+            await conn.execute(text("PRAGMA journal_mode=WAL"))
+            await conn.execute(text("PRAGMA synchronous=NORMAL"))
+            await conn.execute(text("PRAGMA cache_size=10000"))
+            await conn.execute(text("PRAGMA temp_store=MEMORY"))
         
         logger.info("Database initialized successfully")
 
@@ -69,7 +76,7 @@ async def create_fts_table():
     if "sqlite" in settings.database_url:
         async with engine.begin() as conn:
             # Create FTS5 virtual table for full-text search
-            await conn.execute("""
+            await conn.execute(text("""
                 CREATE VIRTUAL TABLE IF NOT EXISTS photos_fts USING fts5(
                     photo_id UNINDEXED,
                     filename,
@@ -78,5 +85,5 @@ async def create_fts_table():
                     exif_text,
                     tokenize='unicode61'
                 )
-            """)
+            """))
             logger.info("FTS5 table created successfully")