Update app.py
Browse files
app.py
CHANGED
|
@@ -221,34 +221,17 @@ def display_data(standard, version, selection):
|
|
| 221 |
elif lc == "category":
|
| 222 |
real_cat = c
|
| 223 |
|
| 224 |
-
# ==========================================
|
| 225 |
-
# 💡 [수정된 부분] ALL 선택 시 Table 카테고리 제외
|
| 226 |
-
# ==========================================
|
| 227 |
if selection == "ALL":
|
| 228 |
-
|
| 229 |
-
|
| 230 |
-
|
| 231 |
-
|
| 232 |
-
|
| 233 |
-
|
| 234 |
-
|
| 235 |
-
|
| 236 |
-
|
| 237 |
-
|
| 238 |
-
|
| 239 |
-
elif "." in selection and real_ch and real_cat:
|
| 240 |
-
ch, ca = selection.split(".", 1)
|
| 241 |
-
df = pd.read_sql(
|
| 242 |
-
f"""
|
| 243 |
-
SELECT * FROM [{main_t}]
|
| 244 |
-
WHERE REPLACE(TRIM(CAST([{real_ch}] AS TEXT)), ' ', '') = ?
|
| 245 |
-
AND REPLACE(TRIM(CAST([{real_cat}] AS TEXT)), ' ', '') = ?
|
| 246 |
-
""",
|
| 247 |
-
conn,
|
| 248 |
-
params=[ch.replace(" ", ""), ca.replace(" ", "")]
|
| 249 |
-
)
|
| 250 |
-
else:
|
| 251 |
-
df = pd.read_sql(f"SELECT * FROM [{main_t}]", conn)
|
| 252 |
|
| 253 |
df.columns = [c.lower().strip() for c in df.columns]
|
| 254 |
|
|
|
|
| 221 |
elif lc == "category":
|
| 222 |
real_cat = c
|
| 223 |
|
|
|
|
|
|
|
|
|
|
| 224 |
if selection == "ALL":
|
| 225 |
+
# 🚀 무조건 메인 테이블만 사용 (TableA/B 완전 차단)
|
| 226 |
+
query = f"SELECT * FROM [{main_t}]"
|
| 227 |
+
|
| 228 |
+
# category 컬럼 있으면 'Table' 제외
|
| 229 |
+
if real_cat:
|
| 230 |
+
query += f"""
|
| 231 |
+
WHERE IFNULL(UPPER(TRIM(CAST([{real_cat}] AS TEXT))), '') != 'TABLE'
|
| 232 |
+
"""
|
| 233 |
+
|
| 234 |
+
df = pd.read_sql(query, conn)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 235 |
|
| 236 |
df.columns = [c.lower().strip() for c in df.columns]
|
| 237 |
|