2
0
Эх сурвалжийг харах

MySQL 예약어 문제 해결

잉여개발기 (SPDV) 2 жил өмнө
parent
commit
e08e0af775
4 өөрчлөгдсөн 21 нэмэгдсэн , 20 устгасан
  1. 12 12
      app.py
  2. 6 5
      route/tool/func.py
  3. 2 2
      route/user_alarm.py
  4. 1 1
      version.json

+ 12 - 12
app.py

@@ -75,48 +75,48 @@ with get_db_connect() as conn:
                         curs.execute(db_change('create table ' + create_table + '(test longtext default (""))'))
 
                         db_pass = 1
-                    except:
-                        pass
+                    except Exception as e:
+                        print(e)
 
                 if db_pass == 0:
                     try:
                         curs.execute(db_change('create table ' + create_table + '(test longtext default "")'))
 
                         db_pass = 1
-                    except:
-                        pass
+                    except Exception as e:
+                        print(e)
 
                 if db_pass == 0:
                     try:
                         curs.execute(db_change('create table ' + create_table + '(test longtext)'))
 
                         db_pass = 1
-                    except:
-                        pass
+                    except Exception as e:
+                        print(e)
 
                 if db_pass == 0:
                     try:
                         curs.execute(db_change("alter table " + create_table + " add column " + create + " longtext default ('')"))
 
                         db_pass = 1
-                    except:
-                        pass
+                    except Exception as e:
+                        print(e)
 
                 if db_pass == 0:
                     try:
                         curs.execute(db_change("alter table " + create_table + " add column " + create + " longtext default ''"))
 
                         db_pass = 1
-                    except:
-                        pass
+                    except Exception as e:
+                        print(e)
 
                 if db_pass == 0:
                     try:
                         curs.execute(db_change("alter table " + create_table + " add column " + create + " longtext"))
 
                         db_pass = 1
-                    except:
-                        pass
+                    except Exception as e:
+                        print(e)
 
                 if db_pass == 0:
                     raise

+ 6 - 5
route/tool/func.py

@@ -336,7 +336,7 @@ def get_db_table_list():
     create_data['ua_d'] = ['name', 'ip', 'ua', 'today', 'sub']
 
     create_data['user_set'] = ['name', 'id', 'data']
-    create_data['user_notice'] = ['id', 'name', 'data', 'date', 'read']
+    create_data['user_notice'] = ['id', 'name', 'data', 'date', 'readme']
 
     create_data['bbs_set'] = ['set_name', 'set_code', 'set_id', 'set_data']
     create_data['bbs_data'] = ['set_name', 'set_code', 'set_id', 'set_data']
@@ -655,10 +655,11 @@ def update(ver_num, set_data):
         if ver_num < 3500365:
             curs.execute(db_change("update back set data = '' where data is null"))
 
-        if ver_num < 3500370:
+        if ver_num < 3500371:
+            curs.execute(db_change("delete from user_notice"))
             user_alarm_count = {}
 
-            curs.execute(db_change("select name, data, date, read from alarm"))
+            curs.execute(db_change("select name, data, date from alarm"))
             for db_data in curs.fetchall():
                 if db_data[0] in user_alarm_count:
                     user_alarm_count[db_data[0]] += 1
@@ -666,7 +667,7 @@ def update(ver_num, set_data):
                     user_alarm_count[db_data[0]] = 1
 
                 curs.execute(db_change(
-                    'insert into user_notice (id, name, data, date, read) values (?, ?, ?, ?, ?)'
+                    'insert into user_notice (id, name, data, date, readme) values (?, ?, ?, ?, ?)'
                 ), [str(user_alarm_count[db_data[0]]), db_data[0], db_data[1], db_data[2], db_data[3]])
 
         conn.commit()
@@ -2418,7 +2419,7 @@ def add_alarm(to_user, from_user, context):
                 count = str(int(db_data[0][0]) + 1)
 
             curs.execute(db_change(
-                'insert into user_notice (id, name, data, date, read) values (?, ?, ?, ?, "")'
+                'insert into user_notice (id, name, data, date, readme) values (?, ?, ?, ?, "")'
             ), [count, to_user, context, get_time()])
     
 def add_user(user_name, user_pw, user_email = '', user_encode = ''):

+ 2 - 2
route/user_alarm.py

@@ -11,7 +11,7 @@ def user_alarm():
 
         ip = ip_check()
     
-        curs.execute(db_change("select data, date, read, id from user_notice where name = ? order by date desc limit ?, 50"), [ip, sql_num])
+        curs.execute(db_change("select data, date, readme, id from user_notice where name = ? order by date desc limit ?, 50"), [ip, sql_num])
         data_list = curs.fetchall()
         if data_list:
             data = '' + \
@@ -34,7 +34,7 @@ def user_alarm():
                     '</li>' + \
                 ''
 
-        curs.execute(db_change("update user_notice set read = '1' where name = ?"), [ip])
+        curs.execute(db_change("update user_notice set readme = '1' where name = ?"), [ip])
         conn.commit()
     
         data += '' + \

+ 1 - 1
version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
         "r_ver" : "v3.4.6-RC5-dev1",
-        "c_ver" : "3500370",
+        "c_ver" : "3500371",
         "s_ver" : "3500111"
     }
 }