浏览代码

rm old db connect part

2du 3 年之前
父节点
当前提交
a43b01337b
共有 3 个文件被更改,包括 4 次插入38 次删除
  1. 3 2
      emergency_tool.py
  2. 0 35
      route/tool/func.py
  3. 1 1
      version.json

+ 3 - 2
emergency_tool.py

@@ -12,9 +12,10 @@ if data_db_load == 'Y':
 
     db_data_get(data_db_set['type'])
     do_db_set(data_db_set)
-    load_db = get_db_connect_old(data_db_set)
 
-    conn = load_db.db_load()
+    load_db = get_db_connect()
+
+    conn = load_db.__enter__()
     curs = conn.cursor()
 else:
     print('----')

+ 0 - 35
route/tool/func.py

@@ -136,41 +136,6 @@ def get_init_set_list(need = 'all'):
     
     return init_set_list
 
-class get_db_connect_old:
-    def __init__(self, db_set):
-        self.db_set = db_set
-        self.conn = ''
-        
-    def db_load(self):
-        if self.db_set['type'] == 'sqlite':
-            self.conn = sqlite3.connect(
-                self.db_set['name'] + '.db',
-                check_same_thread = False,
-                isolation_level = None
-            )
-            self.conn.execute('pragma journal_mode = wal')
-        else:
-            self.conn = pymysql.connect(
-                host = self.db_set['mysql_host'],
-                user = self.db_set['mysql_user'],
-                password = self.db_set['mysql_pw'],
-                charset = 'utf8mb4',
-                port = int(self.db_set['mysql_port']),
-            )
-            curs = self.conn.cursor()
-
-            self.conn.select_db(self.db_set['name'])
-
-        load_conn(self.conn)
-
-        return self.conn
-
-    def db_get(self):
-        # if self.db_set['type'] != 'sqlite':
-        #     self.conn.ping(reconnect = True)
-            
-        return self.conn
-    
 class get_db_connect:
     # 임시 DB 커넥션 동작 구조
     # Init 파트

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev37)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev38)",
         "c_ver" : "3500113",
         "s_ver" : "3500110"
     }