diff --git a/server/storage.ts b/server/storage.ts
index c54390d..7e306cc 100644
--- a/server/storage.ts
+++ b/server/storage.ts
@@ -54,29 +54,77 @@ export interface IStorage {
 export class DatabaseStorage implements IStorage {
   // Video operations
   async getVideos(limit = 20, offset = 0, search?: string): Promise<Video[]> {
-    let query = db.select().from(videos);
-    
-    if (search) {
-      const searchTerm = `%${search}%`;
-      query = query.where(
-        or(
-          like(videos.title, searchTerm),
-          like(videos.description, searchTerm)
-        )
-      ) as any;
+    try {
+      let sqlQuery = sql`
+        SELECT * FROM video_metadata 
+      `;
+      
+      if (search && search.length >= 2) {
+        const searchTerm = `%${search.toLowerCase()}%`;
+        sqlQuery = sql`
+          SELECT * FROM video_metadata 
+          WHERE LOWER(title) LIKE ${searchTerm} 
+             OR LOWER(description) LIKE ${searchTerm}
+        `;
+      }
+      
+      sqlQuery = sql`${sqlQuery} ORDER BY created_at DESC LIMIT ${limit} OFFSET ${offset}`;
+      
+      const result = await db.execute(sqlQuery);
+      console.log(`📊 DatabaseStorage: Found ${result.rows.length} videos (search: "${search || 'none'}")`);
+      
+      // Transform database rows to Video objects
+      return result.rows.map((row: any) => ({
+        id: row.id,
+        title: row.title,
+        description: row.description,
+        thumbnailUrl: row.thumbnail_url,
+        videoUrl: row.video_url,
+        duration: row.duration,
+        views: row.views,
+        category: row.category,
+        tags: [],
+        isPublic: true,
+        uploadStatus: "completed",
+        originalFileName: row.title,
+        createdAt: row.created_at,
+        updatedAt: row.updated_at,
+      }));
+    } catch (error) {
+      console.error("❌ Database query failed:", error);
+      return [];
     }
-    
-    const result = await query
-      .orderBy(desc(videos.createdAt))
-      .limit(limit)
-      .offset(offset);
-    
-    return result;
   }
 
   async getVideo(id: string): Promise<Video | undefined> {
-    const result = await db.select().from(videos).where(eq(videos.id, id));
-    return result[0];
+    try {
+      const result = await db.execute(sql`
+        SELECT * FROM video_metadata WHERE id = ${id} LIMIT 1
+      `);
+      
+      if (result.rows.length === 0) return undefined;
+      
+      const row = result.rows[0] as any;
+      return {
+        id: row.id,
+        title: row.title,
+        description: row.description,
+        thumbnailUrl: row.thumbnail_url,
+        videoUrl: row.video_url,
+        duration: row.duration,
+        views: row.views,
+        category: row.category,
+        tags: [],
+        isPublic: true,
+        uploadStatus: "completed",
+        originalFileName: row.title,
+        createdAt: row.created_at,
+        updatedAt: row.updated_at,
+      };
+    } catch (error) {
+      console.error("❌ Database get video failed:", error);
+      return undefined;
+    }
   }
 
   async createVideo(video: InsertVideo): Promise<Video> {
@@ -96,9 +144,13 @@ export class DatabaseStorage implements IStorage {
   }
 
   async updateVideoViews(id: string): Promise<void> {
-    await db.update(videos)
-      .set({ views: sql`${videos.views} + 1` })
-      .where(eq(videos.id, id));
+    try {
+      await db.execute(sql`
+        UPDATE video_metadata SET views = views + 1 WHERE id = ${id}
+      `);
+    } catch (error) {
+      console.error("❌ Database update views failed:", error);
+    }
   }
 
   async getVideoCount(search?: string): Promise<number> {