Merge remote-tracking branch 'upstream/main'

backend-node/src/services/tableManagementService.ts

@@ -2266,6 +2266,9 @@ export class TableManagementService {
           ? `WHERE ${whereConditions.join(" AND ")}`
           : "";
 
+      // 안전한 테이블명 검증
+      const safeTableName = tableName.replace(/[^a-zA-Z0-9_]/g, "");
+
       // ORDER BY 조건 구성
       let orderClause = "";
       if (sortBy) {
@@ -2274,13 +2277,16 @@ export class TableManagementService {
           sortOrder.toLowerCase() === "desc" ? "DESC" : "ASC";
         orderClause = `ORDER BY ${safeSortBy} ${safeSortOrder}`;
       } else {
-        // sortBy가 없으면 created_date DESC를 기본 정렬로 사용 (신규 데이터가 최상단에 표시)
-        orderClause = `ORDER BY main.created_date DESC`;
+        // sortBy가 없으면 created_date 컬럼이 있는 경우에만 기본 정렬 적용
+        const hasCreatedDate = await query<any>(
+          `SELECT 1 FROM information_schema.columns WHERE table_name = $1 AND column_name = 'created_date' LIMIT 1`,
+          [safeTableName]
+        );
+        if (hasCreatedDate.length > 0) {
+          orderClause = `ORDER BY main.created_date DESC`;
+        }
       }
 
-      // 안전한 테이블명 검증
-      const safeTableName = tableName.replace(/[^a-zA-Z0-9_]/g, "");
-
       // 전체 개수 조회 (main 별칭 추가 - buildWhereClause가 main. 접두사를 사용하므로 필요)
       const countQuery = `SELECT COUNT(*) as count FROM ${safeTableName} main ${whereClause}`;
       const countResult = await query<any>(countQuery, searchValues);
@@ -3188,10 +3194,13 @@ export class TableManagementService {
       }
 
       // ORDER BY 절 구성
-      // sortBy가 없으면 created_date DESC를 기본 정렬로 사용 (신규 데이터가 최상단에 표시)
+      // sortBy가 없으면 created_date 컬럼이 있는 경우에만 기본 정렬 적용
+      const hasCreatedDateColumn = selectColumns.includes("created_date");
       const orderBy = options.sortBy
         ? `main."${options.sortBy}" ${options.sortOrder === "desc" ? "DESC" : "ASC"}`
-        : `main."created_date" DESC`;
+        : hasCreatedDateColumn
+          ? `main."created_date" DESC`
+          : "";
 
       // 페이징 계산
       const offset = (options.page - 1) * options.size;
@@ -3401,6 +3410,7 @@ export class TableManagementService {
           const entitySearchColumns: string[] = [];
 
           // Entity 조인 쿼리 생성하여 별칭 매핑 얻기
+          const hasCreatedDateForSearch = selectColumns.includes("created_date");
           const joinQueryResult = entityJoinService.buildJoinQuery(
             tableName,
             joinConfigs,
@@ -3408,7 +3418,9 @@ export class TableManagementService {
             "", // WHERE 절은 나중에 추가
             options.sortBy
               ? `main."${options.sortBy}" ${options.sortOrder || "ASC"}`
-              : `main."created_date" DESC`,
+              : hasCreatedDateForSearch
+                ? `main."created_date" DESC`
+                : undefined,
             options.size,
             (options.page - 1) * options.size
           );
@@ -3594,9 +3606,12 @@ export class TableManagementService {
           }
 
           const whereClause = whereConditions.join(" AND ");
+          const hasCreatedDateForOrder = selectColumns.includes("created_date");
           const orderBy = options.sortBy
             ? `main."${options.sortBy}" ${options.sortOrder === "desc" ? "DESC" : "ASC"}`
-            : `main."created_date" DESC`;
+            : hasCreatedDateForOrder
+              ? `main."created_date" DESC`
+              : "";
 
           // 페이징 계산
           const offset = (options.page - 1) * options.size;