Spaces:
Runtime error
Runtime error
Update db.py
Browse files
db.py
CHANGED
|
@@ -39,7 +39,6 @@ def ensure_db_login(supabase: Client) -> bool:
|
|
| 39 |
st.error(f"🚨 DB 자동 로그인 실패: {e}")
|
| 40 |
return False
|
| 41 |
|
| 42 |
-
|
| 43 |
def execute_query(query, fail_message="DB 작업 실패"):
|
| 44 |
try:
|
| 45 |
return query.execute()
|
|
@@ -48,6 +47,13 @@ def execute_query(query, fail_message="DB 작업 실패"):
|
|
| 48 |
logger.exception("%s: %s", fail_message, e)
|
| 49 |
return None
|
| 50 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 51 |
|
| 52 |
@st.cache_data(ttl=300)
|
| 53 |
def debate_ip_column_available() -> bool:
|
|
@@ -70,25 +76,41 @@ def fetch_room_names(supabase: Client):
|
|
| 70 |
|
| 71 |
|
| 72 |
def upsert_topic_room(supabase: Client, room_name, title, mode, entry_code):
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 76 |
"room_name": room_name,
|
| 77 |
"title": title,
|
| 78 |
"mode": mode,
|
| 79 |
-
"entry_code": entry_code,
|
| 80 |
}
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
| 84 |
-
|
|
|
|
|
|
|
|
|
|
| 85 |
|
| 86 |
def fetch_room_entry_code(supabase: Client, room_name):
|
| 87 |
-
|
| 88 |
-
supabase.table("topic").select("entry_code").eq("room_name", room_name)
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
|
| 93 |
|
| 94 |
def fetch_topic_data(supabase: Client, room_name):
|
|
|
|
| 39 |
st.error(f"🚨 DB 자동 로그인 실패: {e}")
|
| 40 |
return False
|
| 41 |
|
|
|
|
| 42 |
def execute_query(query, fail_message="DB 작업 실패"):
|
| 43 |
try:
|
| 44 |
return query.execute()
|
|
|
|
| 47 |
logger.exception("%s: %s", fail_message, e)
|
| 48 |
return None
|
| 49 |
|
| 50 |
+
def _is_undefined_column_error(error: Exception, column_name: str) -> bool:
|
| 51 |
+
msg = str(error).lower()
|
| 52 |
+
return (
|
| 53 |
+
"42703" in msg
|
| 54 |
+
and "does not exist" in msg
|
| 55 |
+
and column_name.lower() in msg
|
| 56 |
+
)
|
| 57 |
|
| 58 |
@st.cache_data(ttl=300)
|
| 59 |
def debate_ip_column_available() -> bool:
|
|
|
|
| 76 |
|
| 77 |
|
| 78 |
def upsert_topic_room(supabase: Client, room_name, title, mode, entry_code):
|
| 79 |
+
payload = {
|
| 80 |
+
"room_name": room_name,
|
| 81 |
+
"title": title,
|
| 82 |
+
"mode": mode,
|
| 83 |
+
"entry_code": entry_code,
|
| 84 |
+
}
|
| 85 |
+
try:
|
| 86 |
+
return supabase.table("topic").upsert(payload).execute()
|
| 87 |
+
except Exception as e:
|
| 88 |
+
if _is_undefined_column_error(e, "entry_code"):
|
| 89 |
+
logger.warning("topic.entry_code 컬럼이 없어 공개방으로 저장합니다.")
|
| 90 |
+
legacy_payload = {
|
| 91 |
"room_name": room_name,
|
| 92 |
"title": title,
|
| 93 |
"mode": mode,
|
|
|
|
| 94 |
}
|
| 95 |
+
return execute_query(
|
| 96 |
+
supabase.table("topic").upsert(legacy_payload),
|
| 97 |
+
fail_message="방 개설 실패",
|
| 98 |
+
)
|
| 99 |
+
st.error(f"방 개설 실패: {e}")
|
| 100 |
+
logger.exception("방 개설 실패: %s", e)
|
| 101 |
+
return None
|
| 102 |
|
| 103 |
def fetch_room_entry_code(supabase: Client, room_name):
|
| 104 |
+
try:
|
| 105 |
+
res = supabase.table("topic").select("entry_code").eq("room_name", room_name).execute()
|
| 106 |
+
return res.data[0]["entry_code"] if res and res.data else ""
|
| 107 |
+
except Exception as e:
|
| 108 |
+
if _is_undefined_column_error(e, "entry_code"):
|
| 109 |
+
logger.warning("topic.entry_code 컬럼이 없어 공개방으로 처리합니다.")
|
| 110 |
+
return ""
|
| 111 |
+
st.error(f"방 입장 암호 조회 실패: {e}")
|
| 112 |
+
logger.exception("방 입장 암호 조회 실패: %s", e)
|
| 113 |
+
return ""
|
| 114 |
|
| 115 |
|
| 116 |
def fetch_topic_data(supabase: Client, room_name):
|