2du 3 年 前
コミット
fffcd98d34
3 ファイル変更36 行追加18 行削除
  1. 35 1
      app.py
  2. 0 16
      route/tool/func.py
  3. 1 1
      version.json

+ 35 - 1
app.py

@@ -55,6 +55,21 @@ if setup_tool != 'init':
             setup_tool = 'normal'
     else:
         setup_tool = 'init'
+        
+if data_db_set['type'] == 'mysql':
+    try:
+        curs.execute(db_change(
+            'create database ' + data_db_set['name'] + ' ' + \
+            'default character set utf8mb4'
+        ))
+    except:
+        try:
+            curs.execute(db_change(
+                'alter database ' + data_db_set['name'] + ' ' + \
+                'character set utf8mb4'
+            ))
+        except:
+            pass
 
 if setup_tool != 'normal':
     create_data = get_db_table_list()
@@ -84,6 +99,14 @@ if setup_tool != 'normal':
                     db_pass = 1
                 except:
                     pass
+                
+            if db_pass == 0:
+                try:
+                    curs.execute(db_change('create table ' + create_table + '(test longtext)'))
+                    
+                    db_pass = 1
+                except:
+                    pass
                     
             if db_pass == 0:
                 try:
@@ -100,7 +123,18 @@ if setup_tool != 'normal':
                     db_pass = 1
                 except:
                     pass
-
+                
+            if db_pass == 0:
+                try:
+                    curs.execute(db_change("alter table " + create_table + " add column " + create + " longtext"))
+                    
+                    db_pass = 1
+                except:
+                    pass
+                
+            if db_pass == 0:
+                raise
+                    
     if setup_tool == 'update':
         update(int(ver_set_data[0][0]), set_data)
     else:

+ 0 - 16
route/tool/func.py

@@ -159,14 +159,6 @@ class get_db_connect_old:
             )
             curs = self.conn.cursor()
 
-            try:
-                curs.execute(db_change(
-                    'create database ' + self.db_set['name'] + ' ' + \
-                    'default character set utf8mb4;'
-                ))
-            except:
-                pass
-
             self.conn.select_db(self.db_set['name'])
 
         load_conn(self.conn)
@@ -212,14 +204,6 @@ class get_db_connect:
             )
             curs = self.conn.cursor()
 
-            try:
-                curs.execute(db_change(
-                    'create database ' + self.db_set['name'] + ' ' + \
-                    'default character set utf8mb4;'
-                ))
-            except:
-                pass
-
             self.conn.select_db(self.db_set['name'])
 
         load_conn(self.conn)

+ 1 - 1
version.json

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